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