rebuild

clineamb · Mar 25, 2016 · 67aa28a · 67aa28a
2 parents 60aabd1 + 7543e32
commit 67aa28a
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 34 deletions.
diff --git a/dist/css/bootstrap-drawer.css b/dist/css/bootstrap-drawer.css
@@ -45,7 +45,7 @@ body.has-drawer {
   box-shadow: 0 -1px 1px rgba(0, 0, 0, 0.05);
 }
 .drawer-inverse {
-  background-color: #333333;
+  background-color: #333;
   color: #eeeeee;
   border-right: 1px solid #1a1a1a;
 }
@@ -106,7 +106,7 @@ body.has-drawer {
 }
 .drawer-nav li a,
 .drawer-fullnav li a {
-  color: #777777;
+  color: #777;
   border-radius: 4px;
   position: relative;
   display: block;
@@ -123,7 +123,7 @@ body.has-drawer {
   background-color: #ffffff;
 }
 .drawer-fullnav {
-  color: #ffffff;
+  color: #fff;
   padding: 0;
 }
 .drawer-fullnav li {
@@ -133,11 +133,11 @@ body.has-drawer {
   border-radius: 0;
 }
 .drawer-inverse .drawer-contents {
-  background-color: #333333;
+  background-color: #333;
 }
 .drawer-inverse .drawer-fullnav li a,
 .drawer-inverse .drawer-nav li a {
-  color: #ffffff;
+  color: #fff;
   padding: 10px 15px;
 }
 .drawer-inverse .drawer-fullnav li.active a,

diff --git a/dist/js/drawer.js b/dist/js/drawer.js
@@ -6,7 +6,7 @@
 */
 
 
-+function ($) {
+(function ($) {
   'use strict';
 
   // OFF CANVAS PUBLIC CLASS DEFINITION
@@ -210,4 +210,4 @@
     Plugin.call($target, option)
   })
 
-}(jQuery);
+})(window.jQuery || {});
diff --git a/dist/js/drawer.min.js b/dist/js/drawer.min.js
diff --git a/example/bootstrap-drawer.css b/example/bootstrap-drawer.css
@@ -45,7 +45,7 @@ body.has-drawer {
   box-shadow: 0 -1px 1px rgba(0, 0, 0, 0.05);
 }
 .drawer-inverse {
-  background-color: #333333;
+  background-color: #333;
   color: #eeeeee;
   border-right: 1px solid #1a1a1a;
 }
@@ -106,7 +106,7 @@ body.has-drawer {
 }
 .drawer-nav li a,
 .drawer-fullnav li a {
-  color: #777777;
+  color: #777;
   border-radius: 4px;
   position: relative;
   display: block;
@@ -123,7 +123,7 @@ body.has-drawer {
   background-color: #ffffff;
 }
 .drawer-fullnav {
-  color: #ffffff;
+  color: #fff;
   padding: 0;
 }
 .drawer-fullnav li {
@@ -133,11 +133,11 @@ body.has-drawer {
   border-radius: 0;
 }
 .drawer-inverse .drawer-contents {
-  background-color: #333333;
+  background-color: #333;
 }
 .drawer-inverse .drawer-fullnav li a,
 .drawer-inverse .drawer-nav li a {
-  color: #ffffff;
+  color: #fff;
   padding: 10px 15px;
 }
 .drawer-inverse .drawer-fullnav li.active a,

diff --git a/example/bootstrap.min.css b/example/bootstrap.min.css
diff --git a/example/bootstrap.min.js b/example/bootstrap.min.js
diff --git a/example/drawer.js b/example/drawer.js
@@ -1,12 +1,12 @@
 /* ========================================================================
- * Bootstrap: drawer.js v1.0
+ * Bootstrap: drawer.js v1.0.3
  # Heavily based on collapse, but had to change the name to "fold" to 
  # avoid transition conflicts.
  * ========================================================================
 */
 
 
-+function ($) {
+(function ($) {
   'use strict';
 
   // OFF CANVAS PUBLIC CLASS DEFINITION
@@ -82,10 +82,14 @@
         .trigger('shown.bs.drawer')
     }
 
-    if (!$.support.transition) return complete.call(this)
+    if (!$.support.transition) {
+        return complete.call(this)
+    } else {
+        this.transEventName = $.support.transition.end;
+    }
 
     this.$element
-      .one('bsTransitionEnd', $.proxy(complete, this))
+      .one(this.transEventName, $.proxy(complete, this))
       .emulateTransitionEnd(Drawer.TRANSITION_DURATION).css(dimension, 0)
   }
 
@@ -117,11 +121,15 @@
         .trigger('hidden.bs.drawer')
     }
 
-    if (!$.support.transition) return complete.call(this)
+    if (!$.support.transition) {
+        return complete.call(this)
+    } else {
+        this.transEventName = $.support.transition.end;
+    }
 
     this.$element
       .css(dimension, '')
-      .one('bsTransitionEnd', $.proxy(complete, this))
+      .one(this.transEventName, $.proxy(complete, this))
       .emulateTransitionEnd(Drawer.TRANSITION_DURATION)
   }
 
@@ -202,10 +210,4 @@
     Plugin.call($target, option)
   })
 
-}(jQuery);    var data    = $target.data('bs.drawer')
-    var option  = data ? 'toggle' : $.extend({}, $this.data(), { trigger: this })
-
-    Plugin.call($target, option)
-  })
-
-}(jQuery);
+})(window.jQuery || {});
diff --git a/js/drawer.js b/js/drawer.js
@@ -6,7 +6,7 @@
 */
 
 
-+function ($) {
+(function ($) {
   'use strict';
 
   // OFF CANVAS PUBLIC CLASS DEFINITION
@@ -210,4 +210,4 @@
     Plugin.call($target, option)
   })
 
-}(jQuery);
+})(window.jQuery || {});