浏览代码

hotfix: error in case of missing bootstrap transition.js

Emanuele Marchi 10 年之前
父节点
当前提交
dcc720e19a
共有 4 个文件被更改,包括 16 次插入5 次删除
  1. 5 1
      dist/js/bootstrap-switch.js
  2. 0 0
      dist/js/bootstrap-switch.min.js
  3. 6 3
      src/coffee/bootstrap-switch.coffee
  4. 5 1
      test/bootstrap-switch.js

+ 5 - 1
dist/js/bootstrap-switch.js

@@ -467,7 +467,11 @@
         if (!callback) {
           return;
         }
-        return this.$container.one($.support.transition.end, callback).emulateTransitionEnd(500);
+        if ($.support.transition) {
+          return this.$container.one("bsTransitionEnd", callback).emulateTransitionEnd(500);
+        } else {
+          return callback();
+        }
       };
 
       BootstrapSwitch.prototype._elementHandlers = function() {

文件差异内容过多而无法显示
+ 0 - 0
dist/js/bootstrap-switch.min.js


+ 6 - 3
src/coffee/bootstrap-switch.coffee

@@ -355,9 +355,12 @@ do ($ = window.jQuery, window) ->
 
       return  unless callback
 
-      @$container
-      .one($.support.transition.end, callback)
-      .emulateTransitionEnd 500
+      if $.support.transition
+        @$container
+        .one("bsTransitionEnd", callback)
+        .emulateTransitionEnd 500
+      else
+        callback()
 
     _elementHandlers: ->
       @$element.on

+ 5 - 1
test/bootstrap-switch.js

@@ -467,7 +467,11 @@
         if (!callback) {
           return;
         }
-        return this.$container.one($.support.transition.end, callback).emulateTransitionEnd(500);
+        if ($.support.transition) {
+          return this.$container.one("bsTransitionEnd", callback).emulateTransitionEnd(500);
+        } else {
+          return callback();
+        }
       };
 
       BootstrapSwitch.prototype._elementHandlers = function() {

部分文件因为文件数量过多而无法显示