diff options
| -rw-r--r-- | Gruntfile.js | 6 | ||||
| -rw-r--r-- | dist/js/bootstrap.js | 8 | ||||
| -rw-r--r-- | docs/assets/js/src/customizer.js | 6 | ||||
| -rw-r--r-- | js/.jscsrc | 1 | ||||
| -rw-r--r-- | js/tests/unit/tooltip.js | 12 | ||||
| -rw-r--r-- | js/transition.js | 8 |
6 files changed, 21 insertions, 20 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 4aaef63ef..aee50c463 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -66,8 +66,8 @@ module.exports = function (grunt) { }, grunt: { options: { - 'requireCamelCaseOrUpperCaseIdentifiers': null, - 'requireParenthesesAroundIIFE': true + requireCamelCaseOrUpperCaseIdentifiers: null, + requireParenthesesAroundIIFE: true }, src: '<%= jshint.grunt.src %>' }, @@ -95,7 +95,7 @@ module.exports = function (grunt) { ], docs: { options: { - 'ids': false, + ids: false, 'overqualified-elements': false }, src: 'docs/assets/css/src/docs.css' diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 10ce289be..e389c1960 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -25,10 +25,10 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re 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) { diff --git a/docs/assets/js/src/customizer.js b/docs/assets/js/src/customizer.js index a0e4a28d1..4ce304f1a 100644 --- a/docs/assets/js/src/customizer.js +++ b/docs/assets/js/src/customizer.js @@ -45,11 +45,11 @@ window.onload = function () { // wait for load in a dumb way because B-0 function createGist(configJson) { var data = { - 'description': 'Bootstrap Customizer Config', + description: 'Bootstrap Customizer Config', 'public': true, - 'files': { + files: { 'config.json': { - 'content': configJson + content: configJson } } } 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 = $('<div id="dynamic-tt-test"/>').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) { |