MDL-65770 tool_policy: Update guest policy popup

diff --git a/admin/tool/policy/amd/build/jquery-eu-cookie-law-popup.min.js b/admin/tool/policy/amd/build/jquery-eu-cookie-law-popup.min.js
index 8ea0109..041f9cc 100644 (file)
Binary files a/admin/tool/policy/amd/build/jquery-eu-cookie-law-popup.min.js and b/admin/tool/policy/amd/build/jquery-eu-cookie-law-popup.min.js differ

diff --git a/admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.js b/admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.js
index 22688c5..682fb7e 100644 (file)
--- a/admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.js
+++ b/admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.js
@@ -1,22 +1,20 @@
 /**\r
- *     \r
+ *\r
  * JQUERY EU COOKIE LAW POPUPS\r
- * version 1.0.1\r
- * \r
+ * version 1.1.1\r
+ *\r
  * Code on Github:\r
  * https://github.com/wimagguc/jquery-eu-cookie-law-popup\r
- * \r
+ *\r
  * To see a live demo, go to:\r
- * http://www.wimagguc.com/2015/03/jquery-eu-cookie-law-popup/\r
- * \r
+ * http://www.wimagguc.com/2018/05/gdpr-compliance-with-the-jquery-eu-cookie-law-plugin/\r
+ *\r
  * by Richard Dancsi\r
  * http://www.wimagguc.com/\r
- * \r
+ *\r
  */\r
 \r
-define(\r
-['jquery'],\r
-function($) {\r
+(function($) {\r
 \r
 // for ie9 doesn't support debug console >>>\r
 if (!window.console) window.console = {};\r
@@ -30,7 +28,7 @@ $.fn.euCookieLawPopup = (function() {
        ///////////////////////////////////////////////////////////////////////////////////////////////\r
        // PARAMETERS (MODIFY THIS PART) //////////////////////////////////////////////////////////////\r
        _self.params = {\r
-               cookiePolicyUrl : 'http://www.wimagguc.com/?cookie-policy',\r
+               cookiePolicyUrl : '/?cookie-policy',\r
                popupPosition : 'top',\r
                colorStyle : 'default',\r
                compactStyle : false,\r
@@ -137,10 +135,10 @@ $.fn.euCookieLawPopup = (function() {
                        return _self.params.htmlMarkup;\r
                }\r
 \r
-               var html = \r
-                       '<div class="eupopup-container' + \r
-                           ' eupopup-container-' + _self.params.popupPosition + \r
-                           (_self.params.compactStyle ? ' eupopup-style-compact' : '') + \r
+               var html =\r
+                       '<div class="eupopup-container' +\r
+                           ' eupopup-container-' + _self.params.popupPosition +\r
+                           (_self.params.compactStyle ? ' eupopup-style-compact' : '') +\r
                                ' eupopup-color-' + _self.params.colorStyle + '">' +\r
                                '<div class="eupopup-head">' + _self.params.popupTitle + '</div>' +\r
                                '<div class="eupopup-body">' + _self.params.popupText + '</div>' +\r
@@ -181,7 +179,7 @@ $.fn.euCookieLawPopup = (function() {
 \r
                return userAcceptedCookies;\r
        };\r
-       \r
+\r
        var hideContainer = function() {\r
                // $('.eupopup-container').slideUp(200);\r
                $('.eupopup-container').animate({\r
@@ -206,6 +204,7 @@ $.fn.euCookieLawPopup = (function() {
 \r
                        // No need to display this if user already accepted the policy\r
                        if (userAlreadyAcceptedCookies()) {\r
+        $(document).trigger("user_cookie_already_accepted", {'consent': true});\r
                                return;\r
                        }\r
 \r
@@ -239,7 +238,7 @@ $.fn.euCookieLawPopup = (function() {
                        // Ready to start!\r
                        $('.eupopup-container').show();\r
 \r
-                       // In case it's alright to just display the message once \r
+                       // In case it's alright to just display the message once\r
                        if (_self.params.autoAcceptCookiePolicy) {\r
                                setUserAcceptsCookies(true);\r
                        }\r
@@ -251,4 +250,18 @@ $.fn.euCookieLawPopup = (function() {
        return publicfunc;\r
 });\r
 \r
+$(document).ready( function() {\r
+       if ($(".eupopup").length > 0) {\r
+               $(document).euCookieLawPopup().init({\r
+                       'info' : 'YOU_CAN_ADD_MORE_SETTINGS_HERE',\r
+                       'popupTitle' : 'This website is using cookies. ',\r
+                       'popupText' : 'We use them to give you the best experience. If you continue using our website, we\'ll assume that you are happy to receive all cookies on this website.'\r
+               });\r
+       }\r
 });\r
+\r
+$(document).bind("user_cookie_consent_changed", function(event, object) {\r
+       console.log("User cookie consent changed: " + $(object).attr('consent') );\r
+});\r
+\r
+}(jQuery));\r

diff --git a/admin/tool/policy/thirdpartylibs.xml b/admin/tool/policy/thirdpartylibs.xml
index 151961b..9d7a636 100644 (file)
--- a/admin/tool/policy/thirdpartylibs.xml
+++ b/admin/tool/policy/thirdpartylibs.xml
@@ -4,7 +4,7 @@
     <location>amd/src/jquery-eu-cookie-law-popup.js</location>
     <name>jQuery EU Cookie Law popups</name>
     <license>MIT</license>
-    <version>1.0.1</version>
+    <version>1.1.2</version>
     <licenseversion></licenseversion>
   </library>
 </libraries>