Emanuele Marchi %!s(int64=10) %!d(string=hai) anos
pai
achega
5e3b5ff0e9

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

@@ -503,8 +503,8 @@
                 if (_this.$element.is(":radio")) {
                   $("[name='" + (_this.$element.attr('name')) + "']").not(_this.$element).prop("checked", false).trigger("change.bootstrapSwitch", true);
                 }
-                return _this.$element.trigger("switchChange.bootstrapSwitch", [state]);
               }
+              return _this.$element.trigger("switchChange.bootstrapSwitch", [state]);
             };
           })(this),
           "focus.bootstrapSwitch": (function(_this) {
@@ -562,6 +562,7 @@
                 return;
               }
               e.preventDefault();
+              e.stopPropagation();
               _this._dragStart = (e.pageX || e.originalEvent.touches[0].pageX) - parseInt(_this.$container.css("margin-left"), 10);
               if (_this.options.animate) {
                 _this.$wrapper.removeClass("" + _this.options.baseClass + "-animate");

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/js/bootstrap-switch.min.js


+ 1 - 1
options-3.html

@@ -84,7 +84,7 @@
             <td>size</td>
             <td>data-size</td>
             <td>String</td>
-            <td>The checkbox state</td>
+            <td>The checkbox size</td>
             <td>null, 'mini', 'small', 'normal', 'large'</td>
             <td>null</td>
           </tr>

+ 2 - 1
test/bootstrap-switch.js

@@ -503,8 +503,8 @@
                 if (_this.$element.is(":radio")) {
                   $("[name='" + (_this.$element.attr('name')) + "']").not(_this.$element).prop("checked", false).trigger("change.bootstrapSwitch", true);
                 }
-                return _this.$element.trigger("switchChange.bootstrapSwitch", [state]);
               }
+              return _this.$element.trigger("switchChange.bootstrapSwitch", [state]);
             };
           })(this),
           "focus.bootstrapSwitch": (function(_this) {
@@ -562,6 +562,7 @@
                 return;
               }
               e.preventDefault();
+              e.stopPropagation();
               _this._dragStart = (e.pageX || e.originalEvent.touches[0].pageX) - parseInt(_this.$container.css("margin-left"), 10);
               if (_this.options.animate) {
                 _this.$wrapper.removeClass("" + _this.options.baseClass + "-animate");

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio