Added untoggle api method to forcefully untoggle a button.

jacobstr · Mar 4, 2013 · 3ac86f6 · 3ac86f6
1 parent eb24718
commit 3ac86f6
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 1 deletion.
diff --git a/docs/assets/js/bootstrap-button.js b/docs/assets/js/bootstrap-button.js
@@ -60,6 +60,16 @@
     this.$element.toggleClass('active')
   }
 
+  Button.prototype.untoggle = function() {
+    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
+
+    $parent && $parent
+      .find('.active')
+      .removeClass('active')
+
+    this.$element.removeClass('active')
+  }
+
 
  /* BUTTON PLUGIN DEFINITION
   * ======================== */
@@ -73,6 +83,7 @@
         , options = typeof option == 'object' && option
       if (!data) $this.data('button', (data = new Button(this, options)))
       if (option == 'toggle') data.toggle()
+      else if (option == 'untoggle') data.untoggle()
       else if (option) data.setState(option)
     })
   }

diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js
@@ -217,6 +217,16 @@
     this.$element.toggleClass('active')
   }
 
+  Button.prototype.untoggle = function() {
+    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
+
+    $parent && $parent
+      .find('.active')
+      .removeClass('active')
+
+    this.$element.removeClass('active')
+  }
+
 
  /* BUTTON PLUGIN DEFINITION
   * ======================== */
@@ -230,6 +240,7 @@
         , options = typeof option == 'object' && option
       if (!data) $this.data('button', (data = new Button(this, options)))
       if (option == 'toggle') data.toggle()
+      else if (option == 'untoggle') data.untoggle()
       else if (option) data.setState(option)
     })
   }

diff --git a/docs/assets/js/bootstrap.min.js b/docs/assets/js/bootstrap.min.js
diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js
@@ -60,6 +60,16 @@
     this.$element.toggleClass('active')
   }
 
+  Button.prototype.untoggle = function() {
+    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
+
+    $parent && $parent
+      .find('.active')
+      .removeClass('active')
+
+    this.$element.removeClass('active')
+  }
+
 
  /* BUTTON PLUGIN DEFINITION
   * ======================== */
@@ -73,6 +83,7 @@
         , options = typeof option == 'object' && option
       if (!data) $this.data('button', (data = new Button(this, options)))
       if (option == 'toggle') data.toggle()
+      if (option == 'untoggle') data.untoggle()
       else if (option) data.setState(option)
     })
   }

diff --git a/js/tests/unit/bootstrap-button.js b/js/tests/unit/bootstrap-button.js
@@ -57,6 +57,13 @@ $(function () {
         ok(btn.hasClass('active'), 'btn has class active')
       })
 
+      test("should untoggle", function() {
+        var btn = $('<button class="btn active">mdo</button>')
+        ok(btn.hasClass('active'), 'btn should have active class initially')
+        btn.button('untoggle')
+        ok(!btn.hasClass('active'), 'btn does not have active class')
+      })
+
       test("should toggle active when btn children are clicked", function () {
         var btn = $('<button class="btn" data-toggle="button">mdo</button>')
           , inner = $('<i></i>')