aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2014-03-09 11:10:15 +0200
committerXhmikosR <[email protected]>2014-03-09 11:10:52 +0200
commit9d027d2beedc5d287de2ec0ae740cf4be05b46ac (patch)
treeedceb9c1bd6c2dd5e4de194e554f44ead159488a /js
parent5e6d16ef4dc531e284bf629a9336f608847bd608 (diff)
downloadbootstrap-9d027d2beedc5d287de2ec0ae740cf4be05b46ac.tar.xz
bootstrap-9d027d2beedc5d287de2ec0ae740cf4be05b46ac.zip
Remove unneeded quotes.
Diffstat (limited to 'js')
-rw-r--r--js/.jscsrc1
-rw-r--r--js/tests/unit/tooltip.js12
-rw-r--r--js/transition.js8
3 files changed, 11 insertions, 10 deletions
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) {