Merge pull request #25 from BdMdesigN/Test

Update to v1.7 and fixed switch class bug

README.md

@@ -1,24 +1,26 @@
-Bootstrap-switch
+Bootstrap-switch v.1.7
 ========================
 
 You can now also use radio buttons and checkboxes as switches.
 
 
-Demo
+Demo:
 ----
 http://www.larentis.eu/switch/
 
+http://bdmdesign.github.io/bootstrap-switch-BdMdesigN (uptodate)
+
 Usage
 -----
 Just include Twitter Bootstrap, jQuery, Bootstrap Switch CSS and Javascript
 ``` html
 <meta http-equiv="X-UA-Compatible" content="IE=9; IE=8;" />
-<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css">
+<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css">
 <link rel="stylesheet" href="bootstrap-switch.css">
 
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
 <script src="bootstrap-switch.js"></script>  // master
-<script src="http://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/1.6/bootstrap-switch.min.js">  // from cdnjs.com
+<script src="http://cdnjs.cloudflare.com/ajax/libs/bootstrap-switch/1.7/bootstrap-switch.min.js">  // from cdnjs.com
 ```
 
 Less
@@ -37,7 +39,7 @@ Basic Example
 checkboxes:
 
 ``` html
-<div class="switch">
+<div class="make-switch">
     <input type="checkbox">
 </div>
 ```
@@ -45,7 +47,7 @@ checkboxes:
 radioboxes:
 
 ``` html
-<div class="switch">
+<div class="make-switch">
     <input type="radio">
 </div>
 ```
@@ -56,7 +58,7 @@ Large, small or mini
 checkboxes:
 
 ``` html
-<div class="switch switch-large">  <!-- switch-large, switch-small or switch-mini -->
+<div class="make-switch switch-large">  <!-- switch-large, switch-small or switch-mini -->
     <input type="checkbox">
 </div>
 ```
@@ -64,7 +66,7 @@ checkboxes:
 radioboxes:
 
 ``` html
-<div class="switch switch-large">  <!-- switch-large, switch-small or switch-mini -->
+<div class="make-switch switch-large">  <!-- switch-large, switch-small or switch-mini -->
     <input type="radio">
 </div>
 ```
@@ -75,7 +77,7 @@ Colors
 checkboxes:
 
 ``` html
-<div class="switch" data-on="danger" data-off="warning">  <!-- primary, info, success, warning, danger and default -->
+<div class="make-switch" data-on="danger" data-off="warning">  <!-- primary, info, success, warning, danger and default -->
     <input type="checkbox">
 </div>
 ```
@@ -83,7 +85,7 @@ checkboxes:
 radioboxes:
 
 ``` html
-<div class="switch" data-on="danger" data-off="warning">  <!-- primary, info, success, warning, danger and default -->
+<div class="make-switch" data-on="danger" data-off="warning">  <!-- primary, info, success, warning, danger and default -->
     <input type="radio">
 </div>
 ```
@@ -94,7 +96,7 @@ Animation
 checkboxes:
 
 ``` html
-<div class="switch" data-animated="false">
+<div class="make-switch" data-animated="false">
     <input type="checkbox">
 </div>
 ```
@@ -102,7 +104,7 @@ checkboxes:
 radioboxes:
 
 ``` html
-<div class="switch" data-animated="false">
+<div class="make-switch" data-animated="false">
     <input type="radio">
 </div>
 ```
@@ -113,7 +115,7 @@ Text
 checkboxes:
 
 ``` html
-<div class="switch" data-on-label="SI" data-off-label="NO">
+<div class="make-switch" data-on-label="SI" data-off-label="NO">
     <input type="checkbox">
 </div>
 ```
@@ -121,7 +123,7 @@ checkboxes:
 radioboxes:
 
 ``` html
-<div class="switch" data-on-label="SI" data-off-label="NO">
+<div class="make-switch" data-on-label="SI" data-off-label="NO">
     <input type="radio">
 </div>
 ```
@@ -132,7 +134,7 @@ HTML Text
 checkboxes:
 
 ``` html
-<div class="switch" data-on-label="<i class='icon-ok icon-white'></i>" data-off-label="<i class='icon-remove'></i>">
+<div class="make-switch" data-on-label="<i class='icon-ok icon-white'></i>" data-off-label="<i class='icon-remove'></i>">
     <input type="checkbox">
 </div>
 ```
@@ -140,7 +142,7 @@ checkboxes:
 radioboxes:
 
 ``` html
-<div class="switch" data-on-label="<i class='icon-ok icon-white'></i>" data-off-label="<i class='icon-remove'></i>">
+<div class="make-switch" data-on-label="<i class='icon-ok icon-white'></i>" data-off-label="<i class='icon-remove'></i>">
     <input type="radio">
 </div>
 ```
@@ -151,7 +153,7 @@ Initial values
 checkboxes:
 
 ``` html
-<div class="switch">
+<div class="make-switch">
     <input type="checkbox" checked="checked" disabled="disabled">
 </div>
 ```
@@ -159,7 +161,7 @@ radioboxes:
 
 
 ``` html
-<div class="switch">
+<div class="make-switch">
     <input type="radio" checked="checked" disabled="disabled">
 </div>
 ```

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "bootstrap-switch",
   "description" : "Unofficial bootstrap switch",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "main": "static/js/bootstrap-switch.js",
   "ignore": [ 
     "examples"

component.json

@@ -1,7 +1,7 @@
 {
   "name"        : "bootstrap-switch",
   "description" : "Unofficial bootstrap switch",
-  "version"     : "1.6.0",
+  "version"     : "1.7.0",
   "main"        : "static/js/bootstrap-switch.js",
   "ignore": [ 
     "examples"

static/js/bootstrap-switch.js

@@ -1,5 +1,5 @@
 /*! ============================================================
- * bootstrapSwitch v1.6 by Larentis Mattia @SpiritualGuru
+ * bootstrapSwitch v1.7 by Larentis Mattia @SpiritualGuru
  * http://www.larentis.eu/
  * 
  * Enhanced for radiobuttons by Stein, Peter @BdMdesigN
@@ -156,7 +156,7 @@
                 $this.unbind('click');
               } else {
                 $this.on('mousemove touchmove', function (e) {
-                  var $element = $(this).closest('.switch')
+                  var $element = $(this).closest('.make-switch')
                     , relativeX = (e.pageX || e.originalEvent.targetTouches[0].pageX) - $element.offset().left
                     , percent = (relativeX / $element.width()) * 100
                     , left = 25
@@ -216,7 +216,7 @@
             if ($form.data('bootstrapSwitch') !== 'injected') {
               $form.bind('reset', function () {
                 setTimeout(function () {
-                  $form.find('.switch').each(function () {
+                  $form.find('.make-switch').each(function () {
                     var $input = $(this).find(inputSelector);
 
                     $input.prop('checked', $input.is(':checked')).trigger('change');
@@ -305,6 +305,6 @@
 
 (function($) {  // creates scope for $ sign assigned to jQuery
     $(function () { // on dom ready
-        $('.switch')['bootstrapSwitch'](); // attach bootstrapswitch
+        $('.make-switch')['bootstrapSwitch'](); // attach bootstrapswitch
     });
 })(jQuery);

static/less/bootstrap-switch.less

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrapSwitch v1.6 by Larentis Mattia @SpiritualGuru
+ * bootstrapSwitch v1.7 by Larentis Mattia @SpiritualGuru
  * http://www.larentis.eu/
  *
  * Enhanced for radiobuttons by Stein, Peter @BdMdesigN

static/stylesheets/bootstrap-switch.css

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrapSwitch v1.6 by Larentis Mattia @SpiritualGuru
+ * bootstrapSwitch v1.7 by Larentis Mattia @SpiritualGuru
  * http://www.larentis.eu/
  *
  * Enhanced for radiobuttons by Stein, Peter @BdMdesigN