From 4aad52797c9ec43c30561f481f595be178f6ab94 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 6 Dec 2013 12:20:59 +0200 Subject: [PATCH 1/2] Use a space after function consistently. --- dist/js/bootstrap.js | 4 ++-- js/tests/unit/modal.js | 14 +++++++------- js/tests/unit/phantom.js | 8 ++++---- js/tests/unit/popover.js | 4 ++-- js/tests/unit/tab.js | 4 ++-- js/tests/unit/tooltip.js | 34 +++++++++++++++++----------------- js/tooltip.js | 4 ++-- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 850e6e53b4..183279907a 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1272,7 +1272,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } } - Tooltip.prototype.applyPlacement = function(offset, placement) { + Tooltip.prototype.applyPlacement = function (offset, placement) { var replace var $tip = this.tip() var width = $tip[0].offsetWidth @@ -1323,7 +1323,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" if (replace) $tip.offset(offset) } - Tooltip.prototype.replaceArrow = function(delta, dimension, position) { + Tooltip.prototype.replaceArrow = function (delta, dimension, position) { this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') } diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index 5755d27511..a6dade99bf 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -74,7 +74,7 @@ $(function () { ok($('#modal-test').length, 'modal inserted into dom') $(this).modal("hide") }) - .on("hidden.bs.modal", function() { + .on("hidden.bs.modal", function () { ok(!$('#modal-test').is(":visible"), 'modal hidden') $('#modal-test').remove() start() @@ -92,7 +92,7 @@ $(function () { ok($('#modal-test').length, 'modal inserted into dom') div.modal("toggle") }) - .on("hidden.bs.modal", function() { + .on("hidden.bs.modal", function () { ok(!$('#modal-test').is(":visible"), 'modal hidden') div.remove() start() @@ -110,7 +110,7 @@ $(function () { ok($('#modal-test').length, 'modal inserted into dom') div.find('.close').click() }) - .on("hidden.bs.modal", function() { + .on("hidden.bs.modal", function () { ok(!$('#modal-test').is(":visible"), 'modal hidden') div.remove() start() @@ -127,7 +127,7 @@ $(function () { ok($('#modal-test').is(":visible"), 'modal visible') div.modal("hide") }) - .on("hidden.bs.modal", function() { + .on("hidden.bs.modal", function () { ok(!$('#modal-test').is(":visible"), 'modal hidden') div.remove() start() @@ -146,7 +146,7 @@ $(function () { ok($('#modal-test').is(":visible"), 'modal visible') $('#modal-test').click() }) - .bind("hidden.bs.modal", function() { + .bind("hidden.bs.modal", function () { ok(!$('#modal-test').is(":visible"), 'modal hidden') div.remove() start() @@ -164,7 +164,7 @@ $(function () { triggered = 0 $('#modal-test').click() }) - .one("hidden.bs.modal", function() { + .one("hidden.bs.modal", function () { div.modal("show") }) .bind("hide.bs.modal", function () { @@ -184,7 +184,7 @@ $(function () { $('#close').click() ok(!$('#modal-test').is(":visible"), 'modal hidden') }) - .one("hidden.bs.modal", function() { + .one("hidden.bs.modal", function () { div.one('hidden.bs.modal', function () { start() }).modal("show") diff --git a/js/tests/unit/phantom.js b/js/tests/unit/phantom.js index c584c5a353..cf9da25375 100644 --- a/js/tests/unit/phantom.js +++ b/js/tests/unit/phantom.js @@ -22,7 +22,7 @@ } // These methods connect QUnit to PhantomJS. - QUnit.log = function(obj) { + QUnit.log = function (obj) { // What is this I don’t even if (obj.message === '[object Object], undefined:undefined') { return } // Parse some stuff before sending it. @@ -32,15 +32,15 @@ sendMessage('qunit.log', obj.result, actual, expected, obj.message, obj.source) } - QUnit.testStart = function(obj) { + QUnit.testStart = function (obj) { sendMessage('qunit.testStart', obj.name) } - QUnit.testDone = function(obj) { + QUnit.testDone = function (obj) { sendMessage('qunit.testDone', obj.name, obj.failed, obj.passed, obj.total) } - QUnit.moduleStart = function(obj) { + QUnit.moduleStart = function (obj) { sendMessage('qunit.moduleStart', obj.name) } diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js index c9f7d63a76..a57c787b80 100644 --- a/js/tests/unit/popover.js +++ b/js/tests/unit/popover.js @@ -97,7 +97,7 @@ $(function () { $('#qunit-fixture').empty() }) - test("should respect custom classes", function() { + test("should respect custom classes", function () { $.support.transition = false var popover = $('@fat') .appendTo('#qunit-fixture') @@ -118,7 +118,7 @@ $(function () { }) test("should destroy popover", function () { - var popover = $('
').popover({trigger: 'hover'}).on('click.foo', function(){}) + var popover = $('
').popover({trigger: 'hover'}).on('click.foo', function (){}) ok(popover.data('bs.popover'), 'popover has data') ok($._data(popover[0], 'events').mouseover && $._data(popover[0], 'events').mouseout, 'popover has hover event') ok($._data(popover[0], 'events').click[0].namespace == 'foo', 'popover has extra click.foo event') diff --git a/js/tests/unit/tab.js b/js/tests/unit/tab.js index 0db7cdb5b5..18aab7bd77 100644 --- a/js/tests/unit/tab.js +++ b/js/tests/unit/tab.js @@ -76,9 +76,9 @@ $(function () { + '' $(dropHTML).find('ul>li:first a').tab('show').end() - .find('ul>li:last a').on('show', function(event){ + .find('ul>li:last a').on('show', function (event){ equal(event.relatedTarget.hash, "#1-1") - }).on('shown', function(event){ + }).on('shown', function (event){ equal(event.relatedTarget.hash, "#1-1") }).tab('show') }) diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index dc3ddd377e..f589f3deae 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -69,7 +69,7 @@ $(function () { test("should fire show event", function () { stop() var tooltip = $('
') - .on("show.bs.tooltip", function() { + .on("show.bs.tooltip", function () { ok(true, "show was called") start() }) @@ -79,7 +79,7 @@ $(function () { test("should fire shown event", function () { stop() var tooltip = $('
') - .on("shown.bs.tooltip", function() { + .on("shown.bs.tooltip", function () { ok(true, "shown was called") start() }) @@ -89,12 +89,12 @@ $(function () { test("should not fire shown event when default prevented", function () { stop() var tooltip = $('
') - .on("show.bs.tooltip", function(e) { + .on("show.bs.tooltip", function (e) { e.preventDefault() ok(true, "show was called") start() }) - .on("shown.bs.tooltip", function() { + .on("shown.bs.tooltip", function () { ok(false, "shown was called") }) .tooltip('show') @@ -103,10 +103,10 @@ $(function () { test("should fire hide event", function () { stop() var tooltip = $('
') - .on("shown.bs.tooltip", function() { + .on("shown.bs.tooltip", function () { $(this).tooltip('hide') }) - .on("hide.bs.tooltip", function() { + .on("hide.bs.tooltip", function () { ok(true, "hide was called") start() }) @@ -116,10 +116,10 @@ $(function () { test("should fire hidden event", function () { stop() var tooltip = $('
') - .on("shown.bs.tooltip", function() { + .on("shown.bs.tooltip", function () { $(this).tooltip('hide') }) - .on("hidden.bs.tooltip", function() { + .on("hidden.bs.tooltip", function () { ok(true, "hidden was called") start() }) @@ -129,15 +129,15 @@ $(function () { test("should not fire hidden event when default prevented", function () { stop() var tooltip = $('
') - .on("shown.bs.tooltip", function() { + .on("shown.bs.tooltip", function () { $(this).tooltip('hide') }) - .on("hide.bs.tooltip", function(e) { + .on("hide.bs.tooltip", function (e) { e.preventDefault() ok(true, "hide was called") start() }) - .on("hidden.bs.tooltip", function() { + .on("hidden.bs.tooltip", function () { ok(false, "hidden was called") }) .tooltip('show') @@ -258,7 +258,7 @@ $(function () { }) test("should destroy tooltip", function () { - var tooltip = $('
').tooltip().on('click.foo', function(){}) + var tooltip = $('
').tooltip().on('click.foo', function (){}) ok(tooltip.data('bs.tooltip'), 'tooltip has data') ok($._data(tooltip[0], 'events').mouseover && $._data(tooltip[0], 'events').mouseout, 'tooltip has hover event') ok($._data(tooltip[0], 'events').click[0].namespace == 'foo', 'tooltip has extra click.foo event') @@ -297,7 +297,7 @@ $(function () { tooltip.tooltip('hide') }) - test("should place tooltip inside window", 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") @@ -308,7 +308,7 @@ $(function () { stop() - setTimeout(function(){ + setTimeout(function (){ ok($(".tooltip").offset().left >= 0) start() @@ -316,7 +316,7 @@ $(function () { }, 100) }) - test("should place tooltip on top of element", function(){ + test("should place tooltip on top of element", function (){ var container = $("
").appendTo("body") .css({position: "absolute", bottom: 0, left: 0, textAlign: "right", width: 300, height: 300}) , p = $("

").appendTo(container) @@ -328,7 +328,7 @@ $(function () { stop() - setTimeout(function(){ + setTimeout(function (){ var tooltip = container.find(".tooltip") start() @@ -337,7 +337,7 @@ $(function () { }, 100) }) - test("should add position class before positioning so that position-specific styles are taken into account", function(){ + test("should add position class before positioning so that position-specific styles are taken into account", function (){ $("head").append('') var container = $("

").appendTo("body") diff --git a/js/tooltip.js b/js/tooltip.js index 4c848f0e21..8debad96be 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -192,7 +192,7 @@ } } - Tooltip.prototype.applyPlacement = function(offset, placement) { + Tooltip.prototype.applyPlacement = function (offset, placement) { var replace var $tip = this.tip() var width = $tip[0].offsetWidth @@ -243,7 +243,7 @@ if (replace) $tip.offset(offset) } - Tooltip.prototype.replaceArrow = function(delta, dimension, position) { + Tooltip.prototype.replaceArrow = function (delta, dimension, position) { this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') } From 5e2ef69e1cc0ee62dfe1206f25030d1f89d9e50f Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 6 Dec 2013 12:23:08 +0200 Subject: [PATCH 2/2] Use a space before functions' bracket consistently. --- js/tests/unit/popover.js | 2 +- js/tests/unit/tab.js | 4 ++-- js/tests/unit/tooltip.js | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js index a57c787b80..2a11e0fdfc 100644 --- a/js/tests/unit/popover.js +++ b/js/tests/unit/popover.js @@ -118,7 +118,7 @@ $(function () { }) test("should destroy popover", function () { - var popover = $('
').popover({trigger: 'hover'}).on('click.foo', function (){}) + var popover = $('
').popover({trigger: 'hover'}).on('click.foo', function () {}) ok(popover.data('bs.popover'), 'popover has data') ok($._data(popover[0], 'events').mouseover && $._data(popover[0], 'events').mouseout, 'popover has hover event') ok($._data(popover[0], 'events').click[0].namespace == 'foo', 'popover has extra click.foo event') diff --git a/js/tests/unit/tab.js b/js/tests/unit/tab.js index 18aab7bd77..8122628129 100644 --- a/js/tests/unit/tab.js +++ b/js/tests/unit/tab.js @@ -76,9 +76,9 @@ $(function () { + '' $(dropHTML).find('ul>li:first a').tab('show').end() - .find('ul>li:last a').on('show', function (event){ + .find('ul>li:last a').on('show', function (event) { equal(event.relatedTarget.hash, "#1-1") - }).on('shown', function (event){ + }).on('shown', function (event) { equal(event.relatedTarget.hash, "#1-1") }).tab('show') }) diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index f589f3deae..2139dc8117 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -258,7 +258,7 @@ $(function () { }) test("should destroy tooltip", function () { - var tooltip = $('
').tooltip().on('click.foo', function (){}) + var tooltip = $('
').tooltip().on('click.foo', function () {}) ok(tooltip.data('bs.tooltip'), 'tooltip has data') ok($._data(tooltip[0], 'events').mouseover && $._data(tooltip[0], 'events').mouseout, 'tooltip has hover event') ok($._data(tooltip[0], 'events').click[0].namespace == 'foo', 'tooltip has extra click.foo event') @@ -297,7 +297,7 @@ $(function () { tooltip.tooltip('hide') }) - test("should place tooltip inside window", 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") @@ -308,7 +308,7 @@ $(function () { stop() - setTimeout(function (){ + setTimeout(function () { ok($(".tooltip").offset().left >= 0) start() @@ -316,7 +316,7 @@ $(function () { }, 100) }) - test("should place tooltip on top of element", function (){ + test("should place tooltip on top of element", function () { var container = $("
").appendTo("body") .css({position: "absolute", bottom: 0, left: 0, textAlign: "right", width: 300, height: 300}) , p = $("

").appendTo(container) @@ -328,7 +328,7 @@ $(function () { stop() - setTimeout(function (){ + setTimeout(function () { var tooltip = container.find(".tooltip") start() @@ -337,7 +337,7 @@ $(function () { }, 100) }) - test("should add position class before positioning so that position-specific styles are taken into account", function (){ + test("should add position class before positioning so that position-specific styles are taken into account", function () { $("head").append('') var container = $("

").appendTo("body")