diff options
| author | mrmrs <[email protected]> | 2014-03-09 16:40:40 -0700 |
|---|---|---|
| committer | mrmrs <[email protected]> | 2014-03-09 16:40:40 -0700 |
| commit | 0b415c6099af274e13564d429ed9551004c71b5e (patch) | |
| tree | 2ba50400477fcbbcd08358cb5bab1f5e573659e3 /js | |
| parent | 71e9902d9a4ee0bf8bc94b4c3123a92a52d6ef65 (diff) | |
| parent | 4bf0645060fb421c9b9f6f3309aceb42dd6e3407 (diff) | |
| download | bootstrap-0b415c6099af274e13564d429ed9551004c71b5e.tar.xz bootstrap-0b415c6099af274e13564d429ed9551004c71b5e.zip | |
Merge branch 'master' into mixin-table-of-contents
* master:
Fix bad grunt merge and then G R U N T
Reorder the Gruntfile a bit
Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube
Remove unneeded quotes.
Rename generateRawFilesJs to generateRawFiles
Remove redundant parens
Conflicts:
docs/assets/js/raw-files.min.js
test-infra/npm-shrinkwrap.canonical.json
Diffstat (limited to 'js')
| -rw-r--r-- | js/.jscsrc | 1 | ||||
| -rw-r--r-- | js/tests/unit/tooltip.js | 12 | ||||
| -rw-r--r-- | js/transition.js | 8 |
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) { |