Change version, update build.

vodkabears · Feb 23, 2014 · 839bb29 · 839bb29
1 parent 2c0c30e
commit 839bb29
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 51 deletions.
diff --git a/bower.json b/bower.json
@@ -1,9 +1,9 @@
 {
     "name": "remodal",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "homepage": "http://vodkabears.github.io/remodal/",
     "authors": [
-        "Zeno Rocha <hi@zenorocha.com>"
+        "Ilya Makarov <dfrost.00@gmail.com>"
     ],
     "description": "Flat, responsive, lightweight, easy customizable modal window plugin with declarative state notation and hash tracking.",
     "main": [ "dist/jquery.remodal.js", "dist/jquery.remodal.min.js", "dist/jquery.remodal.css"],

diff --git a/dist/jquery.remodal.css b/dist/jquery.remodal.css
@@ -1,6 +1,7 @@
-/*! Remodal - v0.1.0 - 2014-02-15
+/*! Remodal - v0.1.1 - 2014-02-23
  * https://github.com/VodkaBears/remodal
  * Copyright (c) 2014 VodkaBears; */
+
 /* Fonts */
 @import url(http://fonts.googleapis.com/css?family=Exo+2:700,400&subset=latin,cyrillic);
 
@@ -20,11 +21,11 @@ html.remodal_lock, body.remodal_lock {
 }
 
 body.remodal_active .remodal-bg {
-    -webkit-filter: blur(5px);
-    -moz-filter: blur(5px);
-    -o-filter: blur(5px);
-    -ms-filter: blur(5px);
-    filter: blur(5px);
+    -webkit-filter: blur(3px);
+    -moz-filter: blur(3px);
+    -o-filter: blur(3px);
+    -ms-filter: blur(3px);
+    filter: blur(3px);
 }
 
 /* Background for effects(end) */

diff --git a/dist/jquery.remodal.js b/dist/jquery.remodal.js
@@ -1,8 +1,7 @@
-/*! Remodal - v0.1.0 - 2014-02-15
+/*! Remodal - v0.1.1 - 2014-02-23
  * https://github.com/VodkaBears/remodal
  * Copyright (c) 2014 VodkaBears; */
-;
-(function ($) {
+;(function ($) {
     "use strict";
 
     /**
@@ -29,17 +28,17 @@
      * @return {Number}
      */
     var getTransitionDuration = function ($elem) {
-        var duration = $elem.css('transitionDuration') ||
-            $elem.css('webkitTransitionDuration') ||
-            $elem.css('mozTransitionDuration') ||
-            $elem.css('oTransitionDuration') ||
-            $elem.css('msTransitionDuration') ||
+        var duration = $elem.css('transition-duration') ||
+            $elem.css('-webkit-transition-duration') ||
+            $elem.css('-moz-transition-duration') ||
+            $elem.css('-o-transition-duration') ||
+            $elem.css('-ms-transition-duration') ||
             0;
-        var delay = $elem.css('transitionDelay') ||
-            $elem.css('webkitTransitionDelay') ||
-            $elem.css('mozTransitionDelay') ||
-            $elem.css('oTransitionDelay') ||
-            $elem.css('msTransitionDelay') ||
+        var delay = $elem.css('transition-delay') ||
+            $elem.css('-webkit-transition-delay') ||
+            $elem.css('-moz-transition-delay') ||
+            $elem.css('-o-transition-delay') ||
+            $elem.css('-ms-transition-delay') ||
             0;
 
         return (parseFloat(duration) + parseFloat(delay)) * 1000;
@@ -68,6 +67,22 @@
         return widthNoScroll - widthWithScroll;
     };
 
+    /**
+     * Lock screen
+     */
+    var lockScreen = function () {
+        $("html, body").addClass(pluginName + "_lock");
+        $(document.body).css("padding-right", "+=" + getScrollbarWidth());
+    };
+
+    /**
+     * Unlock screen
+     */
+    var unlockScreen = function () {
+        $("html, body").removeClass(pluginName + "_lock");
+        $(document.body).css("padding-right", "-=" + getScrollbarWidth());
+    };
+
     /**
      * Remodal constructor
      */
@@ -144,22 +159,6 @@
         }.bind(this));
     };
 
-    /**
-     * Lock screen
-     */
-    Remodal.prototype.lockScreen = function () {
-        $("html, body").addClass(pluginName + "_lock");
-        this.body.css("padding-right", "+=" + getScrollbarWidth());
-    };
-
-    /**
-     * Unlock screen
-     */
-    Remodal.prototype.unlockScreen = function () {
-        $("html, body").removeClass(pluginName + "_lock");
-        this.body.css("padding-right", "-=" + getScrollbarWidth());
-    };
-
     /**
      * Open modal window
      */
@@ -183,7 +182,7 @@
         }
         current = this;
 
-        this.lockScreen();
+        lockScreen();
         this.overlay.show();
         setTimeout(function () {
             this.body.addClass(pluginName + "_active");
@@ -214,10 +213,11 @@
         }
 
         this.body.removeClass(pluginName + "_active");
+        console.log(this.td);
 
         setTimeout(function () {
             this.overlay.hide();
-            this.unlockScreen();
+            unlockScreen();
 
             this.busy = false;
             this.modal.trigger("closed");
@@ -228,9 +228,9 @@
         $["fn"][pluginName] = function (opts) {
             return this["each"](function (i, e) {
                 var $e = $(e);
-                if (!$e.data(pluginName) || !$e.data(pluginName).open) {
+                if (!$e.data(pluginName)) {
                     var instance = new Remodal($e, opts);
-                    $e.data(pluginName, instance);
+                    $e.data(pluginName, instance.index);
                 }
             });
         };
@@ -246,7 +246,7 @@
             id = elem.getAttribute("data-" + pluginName + "-target"),
             $target = $("[data-" + pluginName + "-id=" + id + "]");
 
-        $target.data(pluginName).open();
+        instances[$target.data(pluginName)].open();
     });
 
     /**
@@ -287,14 +287,14 @@
             var $elem = $("[data-" + pluginName + "-id=" + id + "]");
 
             if ($elem.length) {
-                var data = $elem.data(pluginName);
-                if (data && data.settings.hashTracking) {
-                    data.open();
+                var instance = instances[$elem.data(pluginName)];
+                if (instance && instance.settings.hashTracking) {
+                    instance.open();
                 }
             }
 
         }
     };
     $(window).bind("hashchange." + pluginName, hashHandler);
     hashHandler(null, false);
-})(window["jQuery"]);
+})(window["jQuery"] || window["Zepto"]);
diff --git a/dist/jquery.remodal.min.js b/dist/jquery.remodal.min.js
diff --git a/remodal.jquery.json b/remodal.jquery.json
@@ -13,7 +13,7 @@
         "lightbox",
         "ui"
     ],
-    "version": "0.1.0",
+    "version": "0.1.1",
     "author": {
         "name": "Ilya Makarov",
         "email": "[email protected]",

diff --git a/src/jquery.remodal.css b/src/jquery.remodal.css
@@ -1,6 +1,7 @@
-/*! Remodal - v0.1.0 - 2014-02-15
+/*! Remodal - v0.1.1 - 2014-02-23
  * https://github.com/VodkaBears/remodal
  * Copyright (c) 2014 VodkaBears; */
+
 /* Fonts */
 @import url(http://fonts.googleapis.com/css?family=Exo+2:700,400&subset=latin,cyrillic);
 

diff --git a/src/jquery.remodal.js b/src/jquery.remodal.js
@@ -1,4 +1,4 @@
-/*! Remodal - v0.1.0 - 2014-02-15
+/*! Remodal - v0.1.1 - 2014-02-23
  * https://github.com/VodkaBears/remodal
  * Copyright (c) 2014 VodkaBears; */
 ;(function ($) {