diff --git a/docs/assets/js/_src/application.js b/docs/assets/js/_src/application.js index 678c6eace4..9ebba13fe5 100644 --- a/docs/assets/js/_src/application.js +++ b/docs/assets/js/_src/application.js @@ -31,11 +31,8 @@ var $window = $(window) var $body = $(document.body) - var navHeight = $('.navbar').outerHeight(true) + 10 - $body.scrollspy({ - target: '.bs-docs-sidebar', - // offset: navHeight + target: '.bs-docs-sidebar' }) $window.on('load', function () { diff --git a/docs/assets/js/_src/customizer.js b/docs/assets/js/_src/customizer.js index c2dcba73f4..ac314dc733 100644 --- a/docs/assets/js/_src/customizer.js +++ b/docs/assets/js/_src/customizer.js @@ -231,7 +231,9 @@ window.onload = function () { // wait for load in a dumb way because B-0 paths: ['variables.less', 'mixins.less'], optimization: 0, filename: baseFilename + '.css' - }).parse(lessSource, function (err, tree) { + }) + + parser.parse(lessSource, function (err, tree) { if (err) { return showError('Ruh roh! Could not parse less files.', err) } @@ -331,7 +333,6 @@ window.onload = function () { // wait for load in a dumb way because B-0 }) var $compileBtn = $('#btn-compile') - var $downloadBtn = $('#btn-download') $compileBtn.on('click', function (e) { var configData = getCustomizerData() diff --git a/grunt/.jshintrc b/grunt/.jshintrc index 8d402b53c2..d9dce889b1 100644 --- a/grunt/.jshintrc +++ b/grunt/.jshintrc @@ -6,5 +6,6 @@ "node" : true, "nonbsp": true, "strict": true, - "undef" : true + "undef" : true, + "unused": true } diff --git a/js/.jshintrc b/js/.jshintrc index e1ead322ea..c6104dc931 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -8,5 +8,6 @@ "eqnull" : true, "expr" : true, "laxbreak" : true, + "unused" : true, "validthis": true } diff --git a/js/scrollspy.js b/js/scrollspy.js index 137bd373fc..c77a9fbed7 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -43,7 +43,8 @@ this.targets = $([]) var self = this - var $targets = this.$body + + this.$body .find(this.selector) .map(function () { var $el = $(this) diff --git a/js/tests/unit/affix.js b/js/tests/unit/affix.js index b348ecf2b5..673026b8c1 100644 --- a/js/tests/unit/affix.js +++ b/js/tests/unit/affix.js @@ -28,14 +28,14 @@ $(function () { var template = $('
') template.appendTo('body') - var affixer = $('#affixTarget').affix({ + $('#affixTarget').affix({ offset: $('#affixTarget ul').position() }) $('#affixTarget') - .on('affix.bs.affix', function (e) { + .on('affix.bs.affix', function () { ok(true, 'affix event triggered') - }).on('affixed.bs.affix', function (e) { + }).on('affixed.bs.affix', function () { ok(true,'affixed event triggered') $('#affixTarget').remove() $('#affixAfter').remove() diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js index 73420863ce..ea12364788 100644 --- a/js/tests/unit/button.js +++ b/js/tests/unit/button.js @@ -98,7 +98,6 @@ $(function () { var btn1 = $(group.children()[0]) var btn2 = $(group.children()[1]) - var btn3 = $(group.children()[2]) group.appendTo($('#qunit-fixture')) diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js index 7948b3ab49..bead36f91d 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -64,7 +64,7 @@ $(function () { var target = $('') .appendTo($('#qunit-fixture')) - var collapsible = $('
') + $('
') .appendTo($('#qunit-fixture')) .on('show.bs.collapse', function () { ok(!target.hasClass('collapsed')) @@ -81,7 +81,7 @@ $(function () { var target = $('') .appendTo($('#qunit-fixture')) - var collapsible = $('
') + $('
') .appendTo($('#qunit-fixture')) .on('hide.bs.collapse', function () { ok(target.hasClass('collapsed')) @@ -101,19 +101,19 @@ $(function () { var target1 = $('') .appendTo(accordion.find('.accordion-group').eq(0)) - var collapsible1 = $('
') + $('
') .appendTo(accordion.find('.accordion-group').eq(0)) var target2 = $('') .appendTo(accordion.find('.accordion-group').eq(1)) - var collapsible2 = $('
') + $('
') .appendTo(accordion.find('.accordion-group').eq(1)) var target3 = $('') .appendTo(accordion.find('.accordion-group').eq(2)) - var collapsible3 = $('
') + $('
') .appendTo(accordion.find('.accordion-group').eq(2)) .on('show.bs.collapse', function () { ok(target1.hasClass('collapsed')) @@ -136,19 +136,19 @@ $(function () { var target1 = $('') .appendTo(accordion.find('.accordion-group').eq(0)) - var collapsible1 = $('
') + $('
') .appendTo(accordion.find('.accordion-group').eq(0)) var target2 = $('') .appendTo(accordion.find('.accordion-group').eq(1)) - var collapsible2 = $('
') + $('
') .appendTo(accordion.find('.accordion-group').eq(1)) var target3 = $('') .appendTo(accordion.find('.accordion-group').eq(2)) - var collapsible3 = $('
') + $('
') .appendTo(accordion.find('.accordion-group').eq(2)) .on('show.bs.collapse', function () { ok(target1.hasClass('collapsed')) diff --git a/js/tests/unit/scrollspy.js b/js/tests/unit/scrollspy.js index d91b6b3131..670735a468 100644 --- a/js/tests/unit/scrollspy.js +++ b/js/tests/unit/scrollspy.js @@ -18,7 +18,6 @@ $(function () { test('should switch active class on scroll', function () { var sectionHTML = '
', - $section = $(sectionHTML).append('#qunit-fixture'), topbarHTML = '
' + '
' + '
' + @@ -30,6 +29,7 @@ $(function () { '
', $topbar = $(topbarHTML).scrollspy() + $(sectionHTML).append('#qunit-fixture') ok($topbar.find('.active', true)) }) diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index e670883e35..e6ae119930 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -68,7 +68,7 @@ $(function () { test('should fire show event', function () { stop() - var tooltip = $('
') + $('
') .on('show.bs.tooltip', function () { ok(true, 'show was called') start() @@ -78,7 +78,7 @@ $(function () { test('should fire shown event', function () { stop() - var tooltip = $('
') + $('
') .on('shown.bs.tooltip', function () { ok(true, 'shown was called') start() @@ -88,7 +88,7 @@ $(function () { test('should not fire shown event when default prevented', function () { stop() - var tooltip = $('
') + $('
') .on('show.bs.tooltip', function (e) { e.preventDefault() ok(true, 'show was called') @@ -102,7 +102,7 @@ $(function () { test('should fire hide event', function () { stop() - var tooltip = $('
') + $('
') .on('shown.bs.tooltip', function () { $(this).tooltip('hide') }) @@ -115,7 +115,7 @@ $(function () { test('should fire hidden event', function () { stop() - var tooltip = $('
') + $('
') .on('shown.bs.tooltip', function () { $(this).tooltip('hide') }) @@ -128,7 +128,7 @@ $(function () { test('should not fire hidden event when default prevented', function () { stop() - var tooltip = $('
') + $('
') .on('shown.bs.tooltip', function () { $(this).tooltip('hide') }) @@ -272,14 +272,14 @@ $(function () { test('should show tooltip with delegate selector on click', function () { var div = $('
') - var tooltip = div.appendTo('#qunit-fixture') + div.appendTo('#qunit-fixture') .tooltip({ selector: 'a[rel=tooltip]', trigger: 'click' }) div.find('a').trigger('click') ok($('.tooltip').is('.fade.in'), 'tooltip is faded in') }) test('should show tooltip when toggle is called', function () { - var tooltip = $('') + $('') .appendTo('#qunit-fixture') .tooltip({trigger: 'manual'}) .tooltip('toggle') @@ -298,8 +298,8 @@ $(function () { test('should place tooltip inside window', function () { var container = $('
').appendTo('body') - .css({position: 'absolute', width: 200, height: 200, bottom: 0, left: 0}), - tooltip = $('Hover me') + .css({position: 'absolute', width: 200, height: 200, bottom: 0, left: 0}) + $('Hover me') .css({position: 'absolute', top: 0, left: 0}) .appendTo(container) .tooltip({placement: 'top', animate: false}) diff --git a/js/tooltip.js b/js/tooltip.js index f27beacc6d..bb47d43365 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -195,7 +195,6 @@ } Tooltip.prototype.applyPlacement = function (offset, placement) { - var replace var $tip = this.tip() var width = $tip[0].offsetWidth var height = $tip[0].offsetHeight