Update JS to 1.04 and ordered after Bootstrap

cinghie · Jul 7, 2015 · 049ff49 · 049ff49
1 parent f3b7ac2
commit 049ff49
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,19 @@ Theme Options
   <li>All the themes you can use are in the assets/css folder</li>
 </ul>
 
+Changelog
+-----------------
+
+<ul>
+  <li>Version 1.2.0 - Update JS to 1.04 and ordered after Bootstrap</li>
+  <li>Version 1.1.2 - Fixing error to extends yii Widget problem</li>
+  <li>Version 1.1.1 - Added link null option</li>
+  <li>Version 1.1.0 - Added Message & Dismiss Value</li>
+  <li>Version 1.0.1 - Updated README</li>
+  <li>Version 1.0.0 - Initial Release</li>
+</ul>
+
 Libraries Included
 -----------------
 
-https://github.com/silktide/cookieconsent2 (Version 1.0.3)
+https://github.com/silktide/cookieconsent2 (Version 1.0.4)
diff --git a/assets/CookieAsset.php b/assets/CookieAsset.php
@@ -7,7 +7,7 @@
 * @github https://github.com/cinghie/yii2-cookie-consent
 * @license GNU GENERAL PUBLIC LICENSE VERSION 3
 * @package yii2-cookie-consent
-* @version 1.0
+* @version 1.2.0
 */
 
 namespace cinghie\cookieconsent\assets;
@@ -16,10 +16,25 @@
 
 class CookieAsset extends AssetBundle
 {
+	/**
+     * @inherit
+     */
 	public $sourcePath = __DIR__;
 
+	/**
+     * @inherit
+     */
 	public $js=[
 		'js/cookieconsent.js',
 	];
+
+	/**
+     * @inherit
+     */
+	public $depends = [
+        'yii\web\YiiAsset',
+        'yii\bootstrap\BootstrapAsset',
+        'yii\bootstrap\BootstrapPluginAsset',
+    ];
 
 }
diff --git a/assets/js/cookieconsent.js b/assets/js/cookieconsent.js
@@ -309,7 +309,8 @@
     },
 
     dismiss: function (evt) {
-      evt.preventDefault();
+      evt.preventDefault && evt.preventDefault();
+      evt.returnValue = false;
       this.setDismissedCookie();
       this.container.removeChild(this.element);
     },
@@ -325,7 +326,7 @@
     if (!initialized && document.readyState == 'complete') {
       cookieconsent.init();
       initialized = true;
-      window[OPTIONS_UPDATER] = cookieconsent.setOptionsOnTheFly.bind(cookieconsent);
+      window[OPTIONS_UPDATER] = Util.bind(cookieconsent.setOptionsOnTheFly, cookieconsent);
     }
   })();
 

diff --git a/widgets/CookieWidget.php b/widgets/CookieWidget.php
@@ -7,7 +7,7 @@
 * @github https://github.com/cinghie/yii2-cookie-consent
 * @license GNU GENERAL PUBLIC LICENSE VERSION 3
 * @package yii2-cookie-consent
-* @version 1.0
+* @version 1.2.0
 */
 
 namespace cinghie\cookieconsent\widgets;

diff --git a/widgets/views/cookieWidget.php b/widgets/views/cookieWidget.php
@@ -7,7 +7,7 @@
 * @github https://github.com/cinghie/yii2-cookie-consent
 * @license GNU GENERAL PUBLIC LICENSE VERSION 3
 * @package yii2-cookie-consent
-* @version 1.0
+* @version 1.2.0
 */
 
 use cinghie\cookieconsent\assets\CookieAsset;