Merge pull request #120 from frapontillo/master

Added `setTextLabel` and `setIconLabel` methods

README.md

@@ -211,6 +211,8 @@ $('#mySwitch').bootstrapSwitch('setState', true);
 $('#mySwitch').bootstrapSwitch('setState', true || false, true); // sets the state without getting the switch-change event
 $('#mySwitch').bootstrapSwitch('setOnLabel', onValue); // sets the text of the "on" label
 $('#mySwitch').bootstrapSwitch('setOffLabel', offValue); // sets the text of the "off" label
+$('#mySwitch').bootstrapSwitch('setTextLabel', labelValue); // sets the text of the middle label
+$('#mySwitch').bootstrapSwitch('setIconLabel', iconValue); // sets the icon of the middle label
 $('#mySwitch').bootstrapSwitch('setOnClass', onClass); // sets the left color class
 $('#mySwitch').bootstrapSwitch('setOffClass', offClass); // sets the right color class
 $('#mySwitch').bootstrapSwitch('setAnimated', animated); // sets true or false for animation

examples/index.html

@@ -344,6 +344,9 @@ $('#label-switch').bootstrapSwitch('setOffLabel', 'O');</pre>
 &lt;div class="make-switch" data-text-label="TV">
     &lt;input type="checkbox" checked>
 &lt;/div></pre>
+            <pre class="prettyprint linenums">
+$('#label-text-switch').bootstrapSwitch('setTextLabel', 'Radio');</pre>
+        </div>
         </div>
     </div>
 
@@ -405,6 +408,8 @@ $('#label-switch').bootstrapSwitch('setOffLabel', 'O');</pre>
 &lt;div class="make-switch" data-label-icon="fui-video" data-on-label="&lt;i class='fui-check icon-white'>&lt;/i>" data-off-label="&lt;i class='fui-cross'>&lt;/i>">
     &lt;input type="checkbox" checked>
 &lt;/div></pre>
+            <pre class="prettyprint linenums">
+$('#label-icon-switch').bootstrapSwitch('setIconLabel', 'icon-remove');</pre>
         </div>
     </div>
 

static/js/bootstrap-switch.js

@@ -42,7 +42,7 @@
 
             $element.addClass('has-switch');
 
-            if ($element.data('on') !== undefined)
+            if ($element.data('on'))
               color = "switch-" + $element.data('on');
 
             if ($element.data('on-label') !== undefined)
@@ -64,7 +64,7 @@
               .html(onLabel);
 
             color = '';
-            if ($element.data('off') !== undefined)
+            if ($element.data('off'))
               color = "switch-" + $element.data('off');
 
             $switchRight = $('<span>')
@@ -292,11 +292,13 @@
       setOnClass: function (value) {
         var $switchLeft = $(this).find(".switch-left");
         var color = '';
-        if (value !== undefined) {
+        if (value) {
+          // Delete the old color
           if ($(this).attr('data-on') !== undefined) {
-            color = "switch-" + $(this).attr('data-on')
+            color = "switch-" + $(this).attr('data-on');
           }
           $switchLeft.removeClass(color);
+          // Add the new color
           color = "switch-" + value;
           $switchLeft.addClass(color);
         }
@@ -304,11 +306,13 @@
       setOffClass: function (value) {
         var $switchRight = $(this).find(".switch-right");
         var color = '';
-        if (value !== undefined) {
+        if (value) {
+          // Delete the old color
           if ($(this).attr('data-off') !== undefined) {
-            color = "switch-" + $(this).attr('data-off')
+            color = "switch-" + $(this).attr('data-off');
           }
           $switchRight.removeClass(color);
+          // Add the new color
           color = "switch-" + value;
           $switchRight.addClass(color);
         }
@@ -342,6 +346,14 @@
           }
         });
       },
+      setTextLabel: function(value) {
+        var $label = $(this).find("label");
+        $label.html('' + value || '&nbsp' + '');
+      },
+      setTextIcon: function(value) {
+        var $label = $(this).find("label");''
+        $label.html(value ? '<i class="icon ' + value + '"></i>' : '&nbsp;');
+      },
       status: function () {
         return $(this).find(inputSelector).is(':checked');
       },