From 7a80b801d750387fe34d38835b48051512b95978 Mon Sep 17 00:00:00 2001 From: jonahss Date: Wed, 19 Feb 2014 21:27:50 -0800 Subject: updated qunit test reporting so sauce labs can report failing tests --- js/tests/index.html | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/tests/index.html b/js/tests/index.html index 60f543abf..c6d3d27af 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -11,8 +11,32 @@ -- cgit v1.2.3 From 63031a3ca5a44d828122226c26232c00f4463f98 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 26 Feb 2014 01:25:57 +0200 Subject: Bump grunt-jscs-checker. --- js/.jscs.json | 15 --------------- js/.jscsrc | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 js/.jscs.json create mode 100644 js/.jscsrc (limited to 'js') diff --git a/js/.jscs.json b/js/.jscs.json deleted file mode 100644 index 313bfb690..000000000 --- a/js/.jscs.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "disallowKeywords": ["with"], - "requireLeftStickedOperators": [","], - "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], - "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], - "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"], - "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], - "requireLineFeedAtFileEnd": true, - "requireRightStickedOperators": ["!"], - "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], - "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], - "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], - "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, - "validateLineBreaks": "LF" -} diff --git a/js/.jscsrc b/js/.jscsrc new file mode 100644 index 000000000..313bfb690 --- /dev/null +++ b/js/.jscsrc @@ -0,0 +1,15 @@ +{ + "disallowKeywords": ["with"], + "requireLeftStickedOperators": [","], + "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], + "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], + "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"], + "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], + "requireLineFeedAtFileEnd": true, + "requireRightStickedOperators": ["!"], + "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], + "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], + "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], + "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, + "validateLineBreaks": "LF" +} -- cgit v1.2.3 From 537e10033e055bc060ecbd57a678e6cfcfffed30 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 19 Feb 2014 09:11:05 +0200 Subject: Switch to using JSCS for the indentation check. --- js/.jscsrc | 3 ++- js/.jshintrc | 3 +-- js/tests/unit/tooltip.js | 25 ++++++++++++------------- 3 files changed, 15 insertions(+), 16 deletions(-) (limited to 'js') diff --git a/js/.jscsrc b/js/.jscsrc index 313bfb690..5fa37a0c9 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -1,15 +1,16 @@ { "disallowKeywords": ["with"], - "requireLeftStickedOperators": [","], "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], + "requireLeftStickedOperators": [","], "requireLineFeedAtFileEnd": true, "requireRightStickedOperators": ["!"], "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, + "validateIndentation": 2, "validateLineBreaks": "LF" } diff --git a/js/.jshintrc b/js/.jshintrc index ae8a0b404..6a47fe03b 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -7,8 +7,7 @@ "eqeqeq" : false, "eqnull" : true, "expr" : true, - "indent" : 2, "laxbreak" : true, "quotmark" : "single", "validthis": true -} \ No newline at end of file +} diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index c3af7d82e..f0ac577c6 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -273,8 +273,7 @@ $(function () { test('should show tooltip with delegate selector on click', function () { var div = $('
') var tooltip = div.appendTo('#qunit-fixture') - .tooltip({ selector: 'a[rel=tooltip]', - trigger: 'click' }) + .tooltip({ selector: 'a[rel=tooltip]', trigger: 'click' }) div.find('a').trigger('click') ok($('.tooltip').is('.fade.in'), 'tooltip is faded in') }) @@ -392,21 +391,21 @@ $(function () { test('tooltips should be placed dynamically, with the dynamic placement option', function () { $.support.transition = false var ttContainer = $('
').css({ - 'height' : 400, - 'overflow' : 'hidden', - 'position' : 'absolute', - 'top' : 0, - 'left' : 0, - 'width' : 600 - }) - .appendTo('body') + 'height' : 400, + 'overflow' : 'hidden', + 'position' : 'absolute', + 'top' : 0, + 'left' : 0, + 'width' : 600 + }) + .appendTo('body') var topTooltip = $('
Top Dynamic Tooltip
') .appendTo('#dynamic-tt-test') .tooltip({placement: 'auto'}) .tooltip('show') - ok($('.tooltip').is('.bottom'), 'top positioned tooltip is dynamically positioned bottom') + ok($('.tooltip').is('.bottom'), 'top positioned tooltip is dynamically positioned bottom') topTooltip.tooltip('hide') @@ -415,7 +414,7 @@ $(function () { .tooltip({placement: 'right auto'}) .tooltip('show') - ok($('.tooltip').is('.left'), 'right positioned tooltip is dynamically positioned left') + ok($('.tooltip').is('.left'), 'right positioned tooltip is dynamically positioned left') rightTooltip.tooltip('hide') var leftTooltip = $('
Left Dynamic Tooltip
') @@ -423,7 +422,7 @@ $(function () { .tooltip({placement: 'auto left'}) .tooltip('show') - ok($('.tooltip').is('.right'), 'left positioned tooltip is dynamically positioned right') + ok($('.tooltip').is('.right'), 'left positioned tooltip is dynamically positioned right') leftTooltip.tooltip('hide') ttContainer.remove() -- cgit v1.2.3 From d65f749390a32ec8c7abb09199bf31a7cca415ac Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 19 Feb 2014 09:11:25 +0200 Subject: Move the quotes check to JSCS. --- js/.jscsrc | 3 ++- js/.jshintrc | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/.jscsrc b/js/.jscsrc index 5fa37a0c9..7572481c7 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -12,5 +12,6 @@ "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, "validateIndentation": 2, - "validateLineBreaks": "LF" + "validateLineBreaks": "LF", + "validateQuoteMarks": "'" } diff --git a/js/.jshintrc b/js/.jshintrc index 6a47fe03b..e1ead322e 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -8,6 +8,5 @@ "eqnull" : true, "expr" : true, "laxbreak" : true, - "quotmark" : "single", "validthis": true } -- cgit v1.2.3 From 2619325626d25c2f7b342bfc17451e5ff451615f Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 19 Feb 2014 14:28:05 +0200 Subject: JSCS: Use more style checks. --- js/.jscsrc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'js') diff --git a/js/.jscsrc b/js/.jscsrc index 7572481c7..e8168b8b8 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -1,6 +1,9 @@ { + "disallowEmptyBlocks": true, "disallowKeywords": ["with"], "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], + "disallowMixedSpacesAndTabs": true, + "disallowMultipleLineStrings": true, "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], -- cgit v1.2.3 From be8f125ce6225222507f0b7329ea88b99207ac21 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 27 Feb 2014 17:38:37 +0200 Subject: Move `camelcase` check to JSCS. --- js/.jscsrc | 1 + 1 file changed, 1 insertion(+) (limited to 'js') diff --git a/js/.jscsrc b/js/.jscsrc index e8168b8b8..ceaffbcd5 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -7,6 +7,7 @@ "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], + "requireCamelCaseOrUpperCaseIdentifiers": true, "requireLeftStickedOperators": [","], "requireLineFeedAtFileEnd": true, "requireRightStickedOperators": ["!"], -- cgit v1.2.3 From 25450730247f4e77f30660f52762fa83e44d6fa1 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 27 Feb 2014 17:38:46 +0200 Subject: Move `trailing` check to JSCS. --- js/.jscsrc | 1 + 1 file changed, 1 insertion(+) (limited to 'js') diff --git a/js/.jscsrc b/js/.jscsrc index ceaffbcd5..2da777a22 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -7,6 +7,7 @@ "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], + "disallowTrailingWhitespace": true, "requireCamelCaseOrUpperCaseIdentifiers": true, "requireLeftStickedOperators": [","], "requireLineFeedAtFileEnd": true, -- cgit v1.2.3 From 297303a7cc73188d127cc7ac2f116e5c02feab1d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 6 Mar 2014 11:12:17 -0800 Subject: use quotes around all element attr vals in JS; fixes #12946 --- js/collapse.js | 4 ++-- js/dropdown.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'js') diff --git a/js/collapse.js b/js/collapse.js index 7130282b0..6907dda3a 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -148,7 +148,7 @@ // COLLAPSE DATA-API // ================= - $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) { + $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) { var $this = $(this), href var target = $this.attr('data-target') || e.preventDefault() @@ -160,7 +160,7 @@ var $parent = parent && $(parent) if (!data || !data.transitioning) { - if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed') + if ($parent) $parent.find('[data-toggle="collapse"][data-parent="' + parent + '"]').not($this).addClass('collapsed') $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') } diff --git a/js/dropdown.js b/js/dropdown.js index 6e206a0d1..b35ce562d 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -14,7 +14,7 @@ // ========================= var backdrop = '.dropdown-backdrop' - var toggle = '[data-toggle=dropdown]' + var toggle = '[data-toggle="dropdown"]' var Dropdown = function (element) { $(element).on('click.bs.dropdown', this.toggle) } @@ -69,7 +69,7 @@ } var desc = ' li:not(.divider):visible a' - var $items = $parent.find('[role=menu]' + desc + ', [role=listbox]' + desc) + var $items = $parent.find('[role="menu"]' + desc + ', [role="listbox"]' + desc) if (!$items.length) return @@ -142,6 +142,6 @@ .on('click.bs.dropdown.data-api', clearMenus) .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) - .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]', Dropdown.prototype.keydown) + .on('keydown.bs.dropdown.data-api', toggle + ', [role="menu"], [role="listbox"]', Dropdown.prototype.keydown) }(jQuery); -- cgit v1.2.3 From e9cced72fd7b7924d8b2d2a6b4be9247aa567680 Mon Sep 17 00:00:00 2001 From: fat Date: Sat, 8 Mar 2014 19:20:47 -0800 Subject: fix #9342 --- js/affix.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/affix.js b/js/affix.js index 05c909e16..84953c5cd 100644 --- a/js/affix.js +++ b/js/affix.js @@ -66,7 +66,7 @@ offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false if (this.affixed === affix) return - if (this.unpin) this.$element.css('top', '') + if (this.unpin != null) this.$element.css('top', '') var affixType = 'affix' + (affix ? '-' + affix : '') var e = $.Event(affixType + '.bs.affix') -- cgit v1.2.3 From 4d96e69a55a7d5c964d672fe2cf8f89c057bcb57 Mon Sep 17 00:00:00 2001 From: fat Date: Sat, 8 Mar 2014 19:45:38 -0800 Subject: fixes #9836 --- js/collapse.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/collapse.js b/js/collapse.js index 6907dda3a..59e27f13d 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -56,7 +56,8 @@ this.transitioning = 1 - var complete = function () { + var complete = function (e) { + if (e && e.target != this.$element[0]) return this.$element .removeClass('collapsing') .addClass('collapse in') @@ -95,7 +96,8 @@ this.transitioning = 1 - var complete = function () { + var complete = function (e) { + if (e && e.target != this.$element[0]) return this.transitioning = 0 this.$element .trigger('hidden.bs.collapse') -- cgit v1.2.3 From 9d027d2beedc5d287de2ec0ae740cf4be05b46ac Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 9 Mar 2014 11:10:15 +0200 Subject: Remove unneeded quotes. --- js/.jscsrc | 1 + js/tests/unit/tooltip.js | 12 ++++++------ js/transition.js | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) (limited to 'js') diff --git a/js/.jscsrc b/js/.jscsrc index 2da777a22..fc8bc88ca 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -4,6 +4,7 @@ "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowMixedSpacesAndTabs": true, "disallowMultipleLineStrings": true, + "disallowQuotedKeysInObjects": "allButReserved", "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index f0ac577c6..9df234236 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -391,12 +391,12 @@ $(function () { test('tooltips should be placed dynamically, with the dynamic placement option', function () { $.support.transition = false var ttContainer = $('
').css({ - 'height' : 400, - 'overflow' : 'hidden', - 'position' : 'absolute', - 'top' : 0, - 'left' : 0, - 'width' : 600 + height : 400, + overflow : 'hidden', + position : 'absolute', + top : 0, + left : 0, + width : 600 }) .appendTo('body') diff --git a/js/transition.js b/js/transition.js index efa8c1716..b8559c74e 100644 --- a/js/transition.js +++ b/js/transition.js @@ -17,10 +17,10 @@ var el = document.createElement('bootstrap') var transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd', - 'MozTransition' : 'transitionend', - 'OTransition' : 'oTransitionEnd otransitionend', - 'transition' : 'transitionend' + WebkitTransition : 'webkitTransitionEnd', + MozTransition : 'transitionend', + OTransition : 'oTransitionEnd otransitionend', + transition : 'transitionend' } for (var name in transEndEventNames) { -- cgit v1.2.3