From a9f2b6ce0fb2ac059e30da259f7ae25282803c09 Mon Sep 17 00:00:00 2001
From: Collin Donahue-Oponski <collindo@gmail.com>
Date: Mon, 21 Apr 2014 23:03:33 -0600
Subject: #11464 - Fix JS noConflict mode - Refactor all plugins to use an
 internal reference to the jQuery plugin, because in noConflict mode you can
 never expect to be defined on the jQuery object

---
 js/collapse.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'js/collapse.js')

diff --git a/js/collapse.js b/js/collapse.js
index 266f3580d..4347ca5e5 100644
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -43,7 +43,7 @@
     if (actives && actives.length) {
       var hasData = actives.data('bs.collapse')
       if (hasData && hasData.transitioning) return
-      actives.collapse('hide')
+      Plugin.call(actives, 'hide')
       hasData || actives.data('bs.collapse', null)
     }
 
@@ -124,9 +124,7 @@
   // COLLAPSE PLUGIN DEFINITION
   // ==========================
 
-  var old = $.fn.collapse
-
-  $.fn.collapse = function (option) {
+  function Plugin(option) {
     return this.each(function () {
       var $this   = $(this)
       var data    = $this.data('bs.collapse')
@@ -138,6 +136,9 @@
     })
   }
 
+  var old = $.fn.collapse
+
+  $.fn.collapse             = Plugin
   $.fn.collapse.Constructor = Collapse
 
 
@@ -169,7 +170,7 @@
       $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
     }
 
-    $target.collapse(option)
+    Plugin.call($target, option)
   })
 
 }(jQuery);
-- 
cgit v1.2.3