Skip to content

Test 60 rc #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alvinjohnsonso wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Test 60 rc #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45cc6c0
updated tawk-url-util lib to 2.0.1; version bumped to 0.7.1
alvinjohnsonso Jan 28, 2022
6d159b1
Merge pull request #32 from alvinjohnsonso/fix/php-56-compatibility-i…
alvinjohnsonso Jan 28, 2022
2120fcf
test wp 6.0 rc3
alvinjohnsonso May 20, 2022
4137594
added function to make tooltip to show up on top
alvinjohnsonso May 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
30 changes: 22 additions & 8 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tawk-wordpress",
"version": "0.7.0",
"version": "0.7.1",
"description": "tawk.to wordpress plugin",
"main": "index.js",
"directories": {
Expand Down
12 changes: 12 additions & 0 deletions tawkto/assets/css/tawk.admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,11 @@ a.tawk-link:hover {
top: 5px;
}

.tooltip.reverse .tooltiptext {
top: unset;
bottom: 5px;
}

.tooltip .tooltiptext::before {
content: "";
display: block;
Expand All @@ -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;
}
Expand Down
10 changes: 10 additions & 0 deletions tawkto/assets/js/tawk.admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
});
}
);

Expand Down
5 changes: 4 additions & 1 deletion tawkto/readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tawkto/tawkto.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
**/
Expand Down
4 changes: 2 additions & 2 deletions tawkto/templates/widget.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

?>

<!--Start of Tawk.to Script (0.7.0)-->
<!--Start of Tawk.to Script (0.7.1)-->
<script id="tawk-script" type="text/javascript">
var Tawk_API = Tawk_API || {};
<?php if ( isset( $customer_details ) && $enable_visitor_recognition ) : ?>
Expand All @@ -24,4 +24,4 @@
s0.parentNode.insertBefore( s1, s0 );
})();
</script>
<!--End of Tawk.to Script (0.7.0)-->
<!--End of Tawk.to Script (0.7.1)-->
2 changes: 1 addition & 1 deletion tests/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down