bootstrap-switch-rails 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b569c7302489d80dee34d472835b53d43fcf085b
-  data.tar.gz: 7cad20420e35d893bd6e15d2ad18c8578e2b2045
+  metadata.gz: 630e828c927a352dd553798bfa04ad8ee1a16f52
+  data.tar.gz: 217b7fb187ea2c3f5192a11087bc854e28f0fc3c
 SHA512:
-  metadata.gz: 4abd6004218bc06371640a221c99b20f44f8a1099ec0e3bd0c692b389aed1996624b9d60135440f5548e32a574024ff610865ca9bfe99d57fbe96756d87409ab
-  data.tar.gz: f69c9a8b9c9420cf059434b054d42c269de0b3f6fcc46172549127123d37d4c134e35a9563aaf32db716521056f675242c624f7006827ff4a4bc41a35f6265b2
+  metadata.gz: c26a07faa3e9231994fcbbb504c9ff5ecc452fa85435f29b0cd895ac0cb10b6cd991ed80d5de9fc9742a3d003a24fd7f173b3e48d4e28d917c4d089df380a7bd
+  data.tar.gz: 94ce08e2215f41e2165c10e9763bc2c9f9f776349d1a42f096f49c656224ca4324a54b9d6194c97d5ae22eb7be5794a30f52da0150b2b1e6cf26ea6a1b2c1cff

data/README.md

@@ -52,6 +52,7 @@ See the [demo page of Mattia Larentis](http://www.bootstrap-switch.org/) for exa
 
 | Version | Notes                                                                               |
 | -------:| ----------------------------------------------------------------------------------- |
+|   3.0.2 | Update to v3.0.2 of the bootstrap-switch plugin                                     |
 |   3.0.0 | Update to v3.0.0 of the bootstrap-switch plugin                                     |
 |   2.0.2 | Fixed issue where bootstrap 2 sass wasn't compiling (issue #7)                      |
 |   2.0.1 | Update to v2.0.1 of the bootstrap-switch plugin                                     |

data/lib/bootstrap-switch-rails/version.rb

@@ -1,7 +1,7 @@
 module Bootstrap
   module Switch
     module Rails
-      VERSION = "3.0.0"
+      VERSION = "3.0.2"
     end
   end
 end

data/vendor/assets/javascripts/bootstrap-switch.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * bootstrap-switch - v3.0.0
+ * bootstrap-switch - v3.0.2
  * http://www.bootstrap-switch.org
  * ========================================================================
  * Copyright 2012-2013 Mattia Larentis
@@ -26,27 +26,27 @@
     "use strict";
     var BootstrapSwitch;
     BootstrapSwitch = (function() {
-      BootstrapSwitch.prototype.name = "bootstrap-switch";
-
       function BootstrapSwitch(element, options) {
         if (options == null) {
           options = {};
         }
         this.$element = $(element);
-        this.options = $.extend({}, $.fn.bootstrapSwitch.defaults, options, {
+        this.options = $.extend({}, $.fn.bootstrapSwitch.defaults, {
           state: this.$element.is(":checked"),
           size: this.$element.data("size"),
           animate: this.$element.data("animate"),
           disabled: this.$element.is(":disabled"),
           readonly: this.$element.is("[readonly]"),
+          indeterminate: this.$element.data("indeterminate"),
           onColor: this.$element.data("on-color"),
           offColor: this.$element.data("off-color"),
           onText: this.$element.data("on-text"),
           offText: this.$element.data("off-text"),
           labelText: this.$element.data("label-text"),
           baseClass: this.$element.data("base-class"),
-          wrapperClass: this.$element.data("wrapper-class")
-        });
+          wrapperClass: this.$element.data("wrapper-class"),
+          radioAllOff: this.$element.data("radio-all-off")
+        }, options);
         this.$wrapper = $("<div>", {
           "class": (function(_this) {
             return function() {
@@ -65,6 +65,9 @@
               if (_this.options.readonly) {
                 classes.push("" + _this.options.baseClass + "-readonly");
               }
+              if (_this.options.indeterminate) {
+                classes.push("" + _this.options.baseClass + "-indeterminate");
+              }
               if (_this.$element.attr("id")) {
                 classes.push("" + _this.options.baseClass + "-id-" + (_this.$element.attr("id")));
               }
@@ -84,10 +87,12 @@
           "class": "" + this.options.baseClass + "-handle-off " + this.options.baseClass + "-" + this.options.offColor
         });
         this.$label = $("<label>", {
-          "for": this.$element.attr("id"),
           html: this.options.labelText,
           "class": "" + this.options.baseClass + "-label"
         });
+        if (this.options.indeterminate) {
+          this.$element.prop("indeterminate", true);
+        }
         this.$element.on("init.bootstrapSwitch", (function(_this) {
           return function() {
             return _this.options.onInit.apply(element, arguments);
@@ -113,7 +118,10 @@
         if (typeof value === "undefined") {
           return this.options.state;
         }
-        if (this.options.disabled || this.options.readonly) {
+        if (this.options.disabled || this.options.readonly || this.options.indeterminate) {
+          return this.$element;
+        }
+        if (this.options.state && !this.options.radioAllOff && this.$element.is(':radio')) {
           return this.$element;
         }
         value = !!value;
@@ -122,7 +130,7 @@
       };
 
       BootstrapSwitch.prototype.toggleState = function(skip) {
-        if (this.options.disabled || this.options.readonly) {
+        if (this.options.disabled || this.options.readonly || this.options.indeterminate) {
           return this.$element;
         }
         return this.$element.prop("checked", !this.options.state).trigger("change.bootstrapSwitch", skip);
@@ -188,6 +196,24 @@
         return this.$element;
       };
 
+      BootstrapSwitch.prototype.indeterminate = function(value) {
+        if (typeof value === "undefined") {
+          return this.options.indeterminate;
+        }
+        value = !!value;
+        this.$wrapper[value ? "addClass" : "removeClass"]("" + this.options.baseClass + "-indeterminate");
+        this.$element.prop("indeterminate", value);
+        this.options.indeterminate = value;
+        return this.$element;
+      };
+
+      BootstrapSwitch.prototype.toggleIndeterminate = function() {
+        this.$element.prop("indeterminate", !this.options.indeterminate);
+        this.$wrapper.toggleClass("" + this.options.baseClass + "-indeterminate");
+        this.options.indeterminate = !this.options.indeterminate;
+        return this.$element;
+      };
+
       BootstrapSwitch.prototype.onColor = function(value) {
         var color;
         color = this.options.onColor;
@@ -260,6 +286,36 @@
         return this.$element;
       };
 
+      BootstrapSwitch.prototype.radioAllOff = function(value) {
+        if (typeof value === "undefined") {
+          return this.options.radioAllOff;
+        }
+        this.options.radioAllOff = value;
+        return this.$element;
+      };
+
+      BootstrapSwitch.prototype.onInit = function(value) {
+        if (typeof value === "undefined") {
+          return this.options.onInit;
+        }
+        if (!value) {
+          value = $.fn.bootstrapSwitch.defaults.onInit;
+        }
+        this.options.onInit = value;
+        return this.$element;
+      };
+
+      BootstrapSwitch.prototype.onSwitchChange = function(value) {
+        if (typeof value === "undefined") {
+          return this.options.onSwitchChange;
+        }
+        if (!value) {
+          value = $.fn.bootstrapSwitch.defaults.onSwitchChange;
+        }
+        this.options.onSwitchChange = value;
+        return this.$element;
+      };
+
       BootstrapSwitch.prototype.destroy = function() {
         var $form;
         $form = this.$element.closest("form");
@@ -277,7 +333,6 @@
             return function(e, skip) {
               var checked;
               e.preventDefault();
-              e.stopPropagation();
               e.stopImmediatePropagation();
               checked = _this.$element.is(":checked");
               if (checked === _this.options.state) {
@@ -296,38 +351,27 @@
           "focus.bootstrapSwitch": (function(_this) {
             return function(e) {
               e.preventDefault();
-              e.stopPropagation();
-              e.stopImmediatePropagation();
               return _this.$wrapper.addClass("" + _this.options.baseClass + "-focused");
             };
           })(this),
           "blur.bootstrapSwitch": (function(_this) {
             return function(e) {
               e.preventDefault();
-              e.stopPropagation();
-              e.stopImmediatePropagation();
               return _this.$wrapper.removeClass("" + _this.options.baseClass + "-focused");
             };
           })(this),
           "keydown.bootstrapSwitch": (function(_this) {
             return function(e) {
-              if (!e.which || _this.options.disabled || _this.options.readonly) {
+              if (!e.which || _this.options.disabled || _this.options.readonly || _this.options.indeterminate) {
                 return;
               }
               switch (e.which) {
-                case 32:
-                  e.preventDefault();
-                  e.stopPropagation();
-                  e.stopImmediatePropagation();
-                  return _this.toggleState();
                 case 37:
                   e.preventDefault();
-                  e.stopPropagation();
                   e.stopImmediatePropagation();
                   return _this.state(false);
                 case 39:
                   e.preventDefault();
-                  e.stopPropagation();
                   e.stopImmediatePropagation();
                   return _this.state(true);
               }
@@ -355,14 +399,19 @@
         return this.$label.on({
           "mousemove.bootstrapSwitch touchmove.bootstrapSwitch": (function(_this) {
             return function(e) {
-              var left, percent, right;
-              if (!_this.drag) {
+              var left, pageX, percent, right;
+              if (!_this.isLabelDragging) {
                 return;
               }
               e.preventDefault();
-              percent = (((e.pageX || e.originalEvent.touches[0].pageX) - _this.$wrapper.offset().left) / _this.$wrapper.width()) * 100;
+              _this.isLabelDragged = true;
+              pageX = e.pageX || e.originalEvent.touches[0].pageX;
+              percent = ((pageX - _this.$wrapper.offset().left) / _this.$wrapper.width()) * 100;
               left = 25;
               right = 75;
+              if (_this.options.animate) {
+                _this.$wrapper.removeClass("" + _this.options.baseClass + "-animate");
+              }
               if (percent < left) {
                 percent = left;
               } else if (percent > right) {
@@ -374,29 +423,31 @@
           })(this),
           "mousedown.bootstrapSwitch touchstart.bootstrapSwitch": (function(_this) {
             return function(e) {
-              if (_this.drag || _this.options.disabled || _this.options.readonly) {
+              if (_this.isLabelDragging || _this.options.disabled || _this.options.readonly || _this.options.indeterminate) {
                 return;
               }
               e.preventDefault();
-              _this.drag = true;
-              if (_this.options.animate) {
-                _this.$wrapper.removeClass("" + _this.options.baseClass + "-animate");
-              }
+              _this.isLabelDragging = true;
               return _this.$element.trigger("focus.bootstrapSwitch");
             };
           })(this),
           "mouseup.bootstrapSwitch touchend.bootstrapSwitch": (function(_this) {
             return function(e) {
-              if (!_this.drag) {
+              if (!_this.isLabelDragging) {
                 return;
               }
               e.preventDefault();
-              _this.drag = false;
-              _this.$element.prop("checked", parseInt(_this.$container.css("margin-left"), 10) > -(_this.$container.width() / 6)).trigger("change.bootstrapSwitch");
-              _this.$container.css("margin-left", "");
-              if (_this.options.animate) {
-                return _this.$wrapper.addClass("" + _this.options.baseClass + "-animate");
+              if (_this.isLabelDragged) {
+                _this.isLabelDragged = false;
+                _this.state(parseInt(_this.$container.css("margin-left"), 10) > -(_this.$container.width() / 6));
+                if (_this.options.animate) {
+                  _this.$wrapper.addClass("" + _this.options.baseClass + "-animate");
+                }
+                _this.$container.css("margin-left", "");
+              } else {
+                _this.state(!_this.options.state);
               }
+              return _this.isLabelDragging = false;
             };
           })(this),
           "mouseleave.bootstrapSwitch": (function(_this) {
@@ -418,7 +469,7 @@
             return $form.find("input").filter(function() {
               return $(this).data("bootstrap-switch");
             }).each(function() {
-              return $(this).bootstrapSwitch("state", false);
+              return $(this).bootstrapSwitch("state", this.checked);
             });
           }, 1);
         }).data("bootstrap-switch", true);
@@ -464,6 +515,7 @@
       animate: true,
       disabled: false,
       readonly: false,
+      indeterminate: false,
       onColor: "primary",
       offColor: "default",
       onText: "ON",
@@ -471,6 +523,7 @@
       labelText: "&nbsp;",
       baseClass: "bootstrap-switch",
       wrapperClass: "wrapper",
+      radioAllOff: false,
       onInit: function() {},
       onSwitchChange: function() {}
     };

data/vendor/assets/stylesheets/bootstrap2-switch.css.scss

@@ -1,5 +1,5 @@
 /* ========================================================================
- * bootstrap-switch - v3.0.0
+ * bootstrap-switch - v3.0.2
  * http://www.bootstrap-switch.org
  * ========================================================================
  * Copyright 2012-2013 Mattia Larentis
@@ -131,18 +131,25 @@
   -moz-border-radius-bottomleft: 4px;
   border-bottom-left-radius: 4px;
 }
+.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-container {
+  margin-left: -25%;
+}
 .bootstrap-switch.bootstrap-switch-disabled,
-.bootstrap-switch.bootstrap-switch-readonly {
+.bootstrap-switch.bootstrap-switch-readonly,
+.bootstrap-switch.bootstrap-switch-indeterminate {
   opacity: 0.5;
   filter: alpha(opacity=50);
   cursor: default !important;
 }
 .bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-on,
 .bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-on,
+.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-on,
 .bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-off,
 .bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-off,
+.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-off,
 .bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-label,
-.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-label {
+.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-label,
+.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-label {
   cursor: default !important;
 }
 .bootstrap-switch.bootstrap-switch-focused {
@@ -488,3 +495,7 @@
   filter: alpha(opacity=0);
   z-index: -1;
 }
+.bootstrap-switch input[type='radio'].form-control,
+.bootstrap-switch input[type='checkbox'].form-control {
+  height: auto;
+}

data/vendor/assets/stylesheets/bootstrap3-switch.css.scss

@@ -1,5 +1,5 @@
 /* ========================================================================
- * bootstrap-switch - v3.0.0
+ * bootstrap-switch - v3.0.2
  * http://www.bootstrap-switch.org
  * ========================================================================
  * Copyright 2012-2013 Mattia Larentis
@@ -89,18 +89,25 @@
   border-bottom-left-radius: 3px;
   border-top-left-radius: 3px;
 }
+.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-container {
+  margin-left: -25%;
+}
 .bootstrap-switch.bootstrap-switch-disabled,
-.bootstrap-switch.bootstrap-switch-readonly {
+.bootstrap-switch.bootstrap-switch-readonly,
+.bootstrap-switch.bootstrap-switch-indeterminate {
   opacity: 0.5;
   filter: alpha(opacity=50);
   cursor: default !important;
 }
 .bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-on,
 .bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-on,
+.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-on,
 .bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-off,
 .bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-off,
+.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-off,
 .bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-label,
-.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-label {
+.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-label,
+.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-label {
   cursor: default !important;
 }
 .bootstrap-switch.bootstrap-switch-focused {
@@ -193,3 +200,7 @@
   filter: alpha(opacity=0);
   z-index: -1;
 }
+.bootstrap-switch input[type='radio'].form-control,
+.bootstrap-switch input[type='checkbox'].form-control {
+  height: auto;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-switch-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Manuel van Rijn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler