bootstrap-switch-rails 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e706b7076307718425514c0685bde92b25c4fcca
-  data.tar.gz: a756f9d5cdaf7ac9100e9219b104771e83e32405
+  metadata.gz: 50d7f4cc082bc72ecd6ceec23fd7f7e8361c1c11
+  data.tar.gz: 7a0ca84d44cd6c9e5294c582043a268e5bcfe0e7
 SHA512:
-  metadata.gz: 13d09c70dc6e4aed31539f12aedc68ed169b0909562e4711d87400fe4c45af5ebfcbc59399616393b768953e21898641d57126eea43b3327d55460223c88c917
-  data.tar.gz: 199be4799c241ea6e11c2344897228bed42b259474b328b34008386780f1d5f022e13e6d14411e043161dd096c96e4e5fc54f0873b74251a0167fd190d243a97
+  metadata.gz: 822b34195b02110c91b9c3e5802dc99fe9475f241e92fca6407fd4b957ea5ec6a4bb90ea0f2011307f49b8cbc3ce065104e06213ff43852c7af1d8e4c3212314
+  data.tar.gz: 2c9c8d4a3bd1eaa0a292e27de156e77edfbd8a937dd5850925009b8dbc8d7dbbf5d5c721b780651b15b67be6955e73bfd61c7bfffcafd98f06c0cd531b5f4584

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+_source

data/README.md

@@ -35,6 +35,7 @@ See the [demo page of Mattia Larentis](http://www.larentis.eu/switch/) for examp
 
     | Version | Notes                                                                     |
     |---------+---------------------------------------------------------------------------|
+    |   0.1.1 | Update to v1.3 of the bootstrap-switch plugin                             |
     |   0.1.0 | Initial release                                                           |
 
 ## License

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

@@ -1,7 +1,7 @@
 module Bootstrap
   module Switch
     module Rails
-      VERSION = "0.1.0"
+      VERSION = "0.1.1"
     end
   end
 end

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

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrapSwitch v1.2 by Larentis Mattia @spiritualGuru
+ * bootstrapSwitch v1.3 by Larentis Mattia @spiritualGuru
  * http://www.larentis.eu/switch/
  * ============================================================
  * Licensed under the Apache License, Version 2.0
@@ -23,7 +23,8 @@
               , color
               , moving
               , onLabel = "ON"
-              , offLabel = "OFF";
+              , offLabel = "OFF"
+              , icon = false;
 
             $.each(['switch-mini', 'switch-small', 'switch-large'], function (i, el) {
               if (classes.indexOf(el) >= 0)
@@ -41,6 +42,9 @@
             if ($element.data('off-label') !== undefined)
               offLabel = $element.data('off-label');
 
+            if ($element.data('icon') !== undefined)
+              icon = $element.data('icon');
+
             $switchLeft = $('<span>')
               .addClass("switch-left")
               .addClass(myClasses)
@@ -62,6 +66,10 @@
               .addClass(myClasses)
               .attr('for', $element.find('input').attr('id'));
 
+            if (icon) {
+              $label.html('<i class="icon icon-' + icon + '"></i>');
+            }
+
             $div = $element.find(':checkbox').wrap($('<div>')).parent().data('animated', false);
 
             if ($element.data('animated') !== false)
@@ -99,22 +107,30 @@
               changeStatus($(this));
             });
 
-            $element.find('input').on('change', function (e) {
-              var $element = $(this).parent();
+            $element.find('input').on('change', function (e, skipOnChange) {
+              var $this = $(this)
+                , $element = $this.parent()
+                , thisState = $this.is(':checked')
+                , state = $element.is('.switch-off');
 
               e.preventDefault();
-              e.stopImmediatePropagation();
 
               $element.css('left', '');
 
-              if ($(this).is(':checked'))
-                $element.removeClass('switch-off').addClass('switch-on');
-              else $element.removeClass('switch-on').addClass('switch-off');
+              if (state === thisState) {
 
-              if ($element.data('animated') !== false)
-                $element.addClass("switch-animate");
+                if (thisState)
+                  $element.removeClass('switch-off').addClass('switch-on');
+                else $element.removeClass('switch-on').addClass('switch-off');
 
-              $element.parent().trigger('switch-change', {'el': $(this), 'value': $(this).is(':checked')})
+                if ($element.data('animated') !== false)
+                  $element.addClass("switch-animate");
+
+                if (typeof skipOnChange === 'boolean' && skipOnChange)
+                  return;
+
+                $element.parent().trigger('switch-change', {'el': $this, 'value': thisState})
+              }
             });
 
             $element.find('label').on('mousedown touchstart', function (e) {
@@ -126,7 +142,7 @@
 
               $this.closest('div').removeClass('switch-animate');
 
-              if ($this.closest('.switch').is('.deactivate'))
+              if ($this.closest('.has-switch').is('.deactivate'))
                 $this.unbind('click');
               else {
                 $this.on('mousemove touchmove', function (e) {

data/vendor/assets/stylesheets/bootstrap-switch.css

@@ -55,7 +55,7 @@
   transition: left 0.5s;
 }
 .has-switch > div.switch-off {
-  left: -49%;
+  left: -50%;
 }
 .has-switch > div.switch-on {
   left: 0%;
@@ -99,6 +99,7 @@
   line-height: normal;
 }
 .has-switch label {
+  text-align: center;
   margin-top: -1px;
   margin-bottom: -1px;
   z-index: 100;
@@ -136,6 +137,12 @@
 .has-switch label.active {
   background-color: #cccccc \9;
 }
+.has-switch label i {
+  color: #000;
+  text-shadow: 0 1px 0 #fff;
+  line-height: 18px;
+  pointer-events: none;
+}
 .has-switch span {
   text-align: center;
   z-index: 1;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-switch-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Manuel van Rijn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler