From: Mike Greiling <mike@pixelcog.com>
Date: Thu, 29 May 2014 07:36:53 +0000 (-0500)
Subject: removing this.$element as it is a superfluous copy of this.$scrollElement
X-Git-Tag: v3.2.0~122^2~9^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc8e6ffb7d702895296050d2fd8847fb5eed2381;p=thirdparty%2Fbootstrap.git

removing this.$element as it is a superfluous copy of this.$scrollElement
---

diff --git a/js/scrollspy.js b/js/scrollspy.js
index db493d7ed5..94171bb1ba 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -16,15 +16,15 @@
   function ScrollSpy(element, options) {
     var process  = $.proxy(this.process, this)
 
-    this.$element       = $(element).is('body') ? $(window) : $(element)
     this.$body          = $('body')
-    this.$scrollElement = this.$element.on('scroll.bs.scrollspy', process)
+    this.$scrollElement = $(element).is('body') ? $(window) : $(element)
     this.options        = $.extend({}, ScrollSpy.DEFAULTS, options)
     this.selector       = (this.options.target || '') + ' .nav li > a'
     this.offsets        = []
     this.targets        = []
     this.activeTarget   = null
 
+    this.$scrollElement.on('scroll.bs.scrollspy', process)
     this.refresh()
     this.process()
   }
@@ -36,7 +36,7 @@
   }
 
   ScrollSpy.prototype.refresh = function () {
-    var offsetMethod = this.$element[0] == window ? 'offset' : 'position'
+    var offsetMethod = this.$scrollElement[0] == window ? 'offset' : 'position'
 
     this.offsets = []
     this.targets = []