diff --git a/composer.json b/composer.json index 60e1413..8e16393 100644 --- a/composer.json +++ b/composer.json @@ -3,9 +3,9 @@ "description": "Wordpress plugin for tawk.to", "type": "project", "license": "GPL-3.0", - "version": "0.7.0", + "version": "0.7.1", "require": { - "tawk/url-utils": "^2.0" + "tawk/url-utils": "2.0.1" }, "require-dev": { "php-webdriver/webdriver": "^1.12", diff --git a/composer.lock b/composer.lock index 39c6733..6f5c5fb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,24 +4,26 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4a0962f807e7cfc3336e62b727d97fc7", + "content-hash": "22610b2e71bf1b4c888c7f3f52166d92", "packages": [ { "name": "tawk/url-utils", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/tawk/tawk-url-utils.git", - "reference": "ec70275363ff0dac9d70c9a93399161e5e561a88" + "reference": "73c166333707d893b0160fa9b5eae7aa8fbfa03c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tawk/tawk-url-utils/zipball/ec70275363ff0dac9d70c9a93399161e5e561a88", - "reference": "ec70275363ff0dac9d70c9a93399161e5e561a88", + "url": "https://api.github.com/repos/tawk/tawk-url-utils/zipball/73c166333707d893b0160fa9b5eae7aa8fbfa03c", + "reference": "73c166333707d893b0160fa9b5eae7aa8fbfa03c", "shasum": "" }, "require-dev": { - "phpunit/phpunit": "^9.5" + "phpcompatibility/php-compatibility": "^9.3", + "phpunit/phpunit": "^9.5", + "squizlabs/php_codesniffer": "^3.6" }, "type": "library", "autoload": { @@ -31,15 +33,27 @@ } }, "scripts": { + "post-install-cmd": [ + "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths vendor/phpcompatibility/php-compatibility)" + ], + "post-update-cmd": [ + "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths vendor/phpcompatibility/php-compatibility)" + ], "test": [ "phpunit" + ], + "lint": [ + "phpcs -p -s -v --runtime-set ignore_warnings_on_exit true ." + ], + "lint:fix": [ + "phpcbf -p -s -v .; err=$?; if [ $err -eq 1 ]; then exit 0; else exit $err; fi;" ] }, "support": { - "source": "https://github.com/tawk/tawk-url-utils/tree/2.0.0", + "source": "https://github.com/tawk/tawk-url-utils/tree/2.0.1", "issues": "https://github.com/tawk/tawk-url-utils/issues" }, - "time": "2021-12-29T08:42:47+00:00" + "time": "2022-01-28T11:14:45+00:00" } ], "packages-dev": [ diff --git a/package.json b/package.json index 1dd5121..4d70f03 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tawk-wordpress", - "version": "0.7.0", + "version": "0.7.1", "description": "tawk.to wordpress plugin", "main": "index.js", "directories": { diff --git a/tawkto/assets/css/tawk.admin.css b/tawkto/assets/css/tawk.admin.css index 4d98470..2c4b1eb 100644 --- a/tawkto/assets/css/tawk.admin.css +++ b/tawkto/assets/css/tawk.admin.css @@ -264,6 +264,11 @@ a.tawk-link:hover { top: 5px; } +.tooltip.reverse .tooltiptext { + top: unset; + bottom: 5px; +} + .tooltip .tooltiptext::before { content: ""; display: block; @@ -278,6 +283,13 @@ a.tawk-link:hover { left: 5px; } +.tooltip.reverse .tooltiptext::before { + top: unset; + border-bottom: unset; + bottom: -5px; + border-top: 5px solid #545454; +} + .tooltip:hover .tooltiptext { visibility: visible; } diff --git a/tawkto/assets/js/tawk.admin.js b/tawkto/assets/js/tawk.admin.js index 4d8572d..22e4f03 100644 --- a/tawkto/assets/js/tawk.admin.js +++ b/tawkto/assets/js/tawk.admin.js @@ -62,6 +62,16 @@ jQuery( if ( jQuery( '#exclude-url' ).prop( 'checked' ) ) { jQuery( '#exlucded-urls-container' ).fadeIn(); } + + jQuery( '.tooltip' ).on( 'mouseenter', function() { + var tooltipTextHeight = jQuery( this ).find( '.tooltiptext' ).height(); + if ( jQuery( '#url-exclusion' ).height() > tooltipTextHeight ) { + jQuery( this ).removeClass( 'reverse' ); + return; + } + + jQuery( this ).addClass( 'reverse' ); + }); } ); diff --git a/tawkto/readme.txt b/tawkto/readme.txt index fca5a14..2fc2304 100644 --- a/tawkto/readme.txt +++ b/tawkto/readme.txt @@ -4,7 +4,7 @@ Tags: tawk,tawk.to,tawkto,chat,free chat,livechat,chat widget,plugin,chat for we Requires at least: 2.7 Requires PHP: 5.6 Tested up to: 5.9 -Stable tag: 0.7.0 +Stable tag: 0.7.1 (OFFICIAL tawk.to plugin) Instantly chat with visitors on your website with the free tawk.to chat widget. Website: [http://tawk.to](http://tawk.to) @@ -69,6 +69,9 @@ Note: You will need a free tawk.to account: [Create one for free here!](https:// == Changelog == += 0.7.1 = +* Fixed compatibility issue on PHP versions >= 5.6. + = 0.7.0 = * Enhanced URL pattern matching. * Supported version bump 5.9. diff --git a/tawkto/tawkto.php b/tawkto/tawkto.php index 09b3c23..7124c79 100644 --- a/tawkto/tawkto.php +++ b/tawkto/tawkto.php @@ -6,7 +6,7 @@ * Plugin Name: Tawk.to Live Chat * Plugin URI: https://www.tawk.to * Description: Embeds Tawk.to live chat widget to your site - * Version: 0.7.0 + * Version: 0.7.1 * Author: Tawkto * Text Domain: tawk-to-live-chat **/ diff --git a/tawkto/templates/widget.php b/tawkto/templates/widget.php index 8b70f75..dcf8270 100644 --- a/tawkto/templates/widget.php +++ b/tawkto/templates/widget.php @@ -8,7 +8,7 @@ ?> - + - + diff --git a/tests/docker/docker-compose.yml b/tests/docker/docker-compose.yml index a780e9a..0431983 100644 --- a/tests/docker/docker-compose.yml +++ b/tests/docker/docker-compose.yml @@ -18,7 +18,7 @@ services: depends_on: - db container_name: wordpress - image: wordpress:latest + image: wordpress:beta-6.0-RC3-apache environment: WORDPRESS_DB_HOST: ${WORDPRESS_DB_HOST} WORDPRESS_DB_NAME: ${WORDPRESS_DB_NAME}