vendor/assets/javascripts/twitter/bootstrap-button.js in sass-twitter-bootstrap-2.2.1 vs vendor/assets/javascripts/twitter/bootstrap-button.js in sass-twitter-bootstrap-2.2.2
- old
+ new
@@ -1,7 +1,7 @@
/* ============================================================
- * bootstrap-button.js v2.2.1
+ * bootstrap-button.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -62,10 +62,12 @@
/* BUTTON PLUGIN DEFINITION
* ======================== */
+ var old = $.fn.button
+
$.fn.button = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('button')
, options = typeof option == 'object' && option
@@ -78,9 +80,18 @@
$.fn.button.defaults = {
loadingText: 'loading...'
}
$.fn.button.Constructor = Button
+
+
+ /* BUTTON NO CONFLICT
+ * ================== */
+
+ $.fn.button.noConflict = function () {
+ $.fn.button = old
+ return this
+ }
/* BUTTON DATA-API
* =============== */
\ No newline at end of file