From f140084f2beb17b0a266b42ab9a03d0b935e5f66 Mon Sep 17 00:00:00 2001
From: Josh Dague <daguej@email.uc.edu>
Date: Thu, 22 Aug 2013 14:50:15 -0400
Subject: Don't explicitly reference global jQuery

Removes `window.jQuery` in favor of `jQuery`, fixes #10038
---
 js/scrollspy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/scrollspy.js')

diff --git a/js/scrollspy.js b/js/scrollspy.js
index 10f95f249..1094481cc 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -155,4 +155,4 @@
     })
   })
 
-}(window.jQuery);
+}(jQuery);
-- 
cgit v1.2.3


From 4e0d022de5b0d27b063156533dfcc248fc08257e Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Fri, 1 Nov 2013 17:15:34 -0700
Subject: update version numbers in JS file comment headers to v3.0.1 & regrunt

---
 js/scrollspy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/scrollspy.js')

diff --git a/js/scrollspy.js b/js/scrollspy.js
index c88eaad99..19ed6fcd5 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.0.0
+ * Bootstrap: scrollspy.js v3.0.1
  * http://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
-- 
cgit v1.2.3


From 6a4230556532d3d947a84aa0d07f57e40a68a9ff Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 6 Nov 2013 12:57:28 -0800
Subject: bump versions to v3.0.2

---
 js/scrollspy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/scrollspy.js')

diff --git a/js/scrollspy.js b/js/scrollspy.js
index d9e008bdf..1d2fc7859 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.0.1
+ * Bootstrap: scrollspy.js v3.0.2
  * http://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
-- 
cgit v1.2.3


From 7545da2e3c5488b1bcc9c70fecac759232466756 Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Thu, 14 Nov 2013 23:58:29 -0800
Subject: fixes #11477 and updates slid event in carousel with namespace

---
 js/scrollspy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/scrollspy.js')

diff --git a/js/scrollspy.js b/js/scrollspy.js
index 1d2fc7859..b11ecdf29 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -113,7 +113,7 @@
         .addClass('active')
     }
 
-    active.trigger('activate')
+    active.trigger('activate.bs.scrollspy')
   }
 
 
-- 
cgit v1.2.3