Merge branch 'master' of github.com:nostalgiaz/bootstrap-switch

Bttstrp · Aug 10, 2013 · b85606b · b85606b
2 parents bb70c70 + 2f35622
commit b85606b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/examples/index.html b/examples/index.html
@@ -579,15 +579,15 @@ <h2 class="span8 offset2">
             <div class="bs-docs-example">
                 <div class="control-group">
                      <div class="controls">
-                        <label class="control-label" for="option1">Option 1</label>
+                        <h5>Option 1</h5>
                         <div id="option1" class="make-switch radio1 radio-no-uncheck">
                             <input type="radio" name="radio1" value="option1">
                         </div>
-                        <label class="control-label" for="option2">Option 2</label>
+                        <h5>Option 2</h5>
                         <div id="option2" class="make-switch radio1 radio-no-uncheck">
                             <input type="radio" name="radio1" value="option2">
                         </div>
-                        <label class="control-label" for="option3">Option 3</label>
+                        <h5>Option 3</h5>
                         <div id="option3" class="make-switch radio1 radio-no-uncheck">
                             <input type="radio" name="radio1" value="option3">
                         </div>
@@ -597,15 +597,15 @@ <h2 class="span8 offset2">
             <pre class="prettyprint linenums">
 &lt;div class="control-group">
     &lt;div class="controls">
-        &lt;label class="control-label" for="option1">Option 1&lt;/label>
+        &lt;h5>Option 1&lt;/h5>
         &lt;div id="option1" class="make-switch radio1 radio-no-uncheck">
             &lt;input type="radio" name="radio1" value="option1">
         &lt;/div>
-        &lt;label class="control-label" for="option2">Option 2&lt;/label>
+        &lt;h5>Option 2&lt;/h5>
         &lt;div id="option2" class="make-switch radio1 radio-no-uncheck">
             &lt;input type="radio" name="radio1" value="option2">
         &lt;/div>
-        &lt;label class="control-label" for="option3">Option 3&lt;/label>
+        &lt;h5>Option 3&lt;/h5>
         &lt;div id="option3" class="make-switch radio1 radio-no-uncheck">
             &lt;input type="radio" name="radio1" value="option3">
         &lt;/div>
@@ -638,15 +638,15 @@ <h2 class="span8 offset2">
             <div class="bs-docs-example">
                 <div class="control-group">
                      <div class="controls">
-                        <label class="control-label" for="option1">Option 1</label>
+                        <h5>Option 1</h5>
                             <div id="option11" class="make-switch radio2">
                                 <input type="radio" name="radio2" value="option11">
                             </div>
-                        <label class="control-label" for="option12">Option 2</label>
+                        <h5>Option 2</h5>
                             <div id="option12" class="make-switch radio2">
                                 <input type="radio" name="radio2" value="option12" checked="checked">
                             </div>
-                        <label class="control-label" for="option13">Option 3</label>
+                        <h5>Option 3</h5>
                             <div id="option13" class="make-switch radio2">
                                 <input type="radio" name="radio2" value="option13">
                             </div>
@@ -656,15 +656,15 @@ <h2 class="span8 offset2">
             <pre class="prettyprint linenums">
 &lt;div class="control-group">
     &lt;div class="controls">
-        &lt;label class="control-label" for="option11">Option 1&lt;/label>
+        &lt;h5>Option 1&lt;/h5>
             &lt;div id="option11" class="make-switch radio2">
                 &lt;input type="radio" name="radio2" value="option1">
             &lt;/div>
-        &lt;label class="control-label" for="option12">Option 2&lt;/label>
+        &lt;h5>Option 2&lt;/h5>
             &lt;div id="option12" class="make-switch radio2">
                 &lt;input type="radio" name="radio2" value="option2" checked="checked">
             &lt;/div>
-        &lt;label class="control-label" for="option13">Option 3&lt;/label>
+        &lt;h5>Option 3&lt;/h5>
             &lt;div id="option13" class="make-switch radio2">
                 &lt;input type="radio" name="radio2" value="option3">
             &lt;/div>
@@ -923,4 +923,4 @@ <h3>Modal</h3>
       ga('send', 'pageview');
     </script>
 </body>
-</html>
+</html>
diff --git a/static/js/bootstrap-switch.js b/static/js/bootstrap-switch.js
@@ -81,10 +81,6 @@
             if (icon) {
               $label.html('<i class="icon ' + icon + '"></i>');
             }
-
-            if (textLabel) {
-              $label.html('' + textLabel + '');
-            }
 
             if (textLabel) {
               $label.html('' + textLabel + '');

diff --git a/static/js/bootstrap-switch.min.js b/static/js/bootstrap-switch.min.js