rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-06 04:08:22 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'master' of github.com:twbs/bootstrap

Browse Source 
Conflicts:
	Gruntfile.js
This commit is contained in:
Mark Otto 2014-03-09 16:11:04 -07:00
commit b263a0197b
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gruntfile.js
View File

@ -66,8 +66,8 @@ module.exports = function (grunt) {
}, },
grunt: { grunt: {
options: { options: {
'requireCamelCaseOrUpperCaseIdentifiers': null, requireCamelCaseOrUpperCaseIdentifiers: null,
'requireParenthesesAroundIIFE': true requireParenthesesAroundIIFE: true
}, },
src: '<%= jshint.grunt.src %>' src: '<%= jshint.grunt.src %>'
}, },

8
dist/js/bootstrap.js vendored
View File

@ -25,10 +25,10 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var el = document.createElement('bootstrap') var el = document.createElement('bootstrap')
var transEndEventNames = { var transEndEventNames = {
'WebkitTransition' : 'webkitTransitionEnd', WebkitTransition : 'webkitTransitionEnd',
'MozTransition' : 'transitionend', MozTransition : 'transitionend',
'OTransition' : 'oTransitionEnd otransitionend', OTransition : 'oTransitionEnd otransitionend',
'transition' : 'transitionend' transition : 'transitionend'
} }
for (var name in transEndEventNames) { for (var name in transEndEventNames) {

6
docs/assets/js/src/customizer.js
View File

@ -45,11 +45,11 @@ window.onload = function () { // wait for load in a dumb way because B-0
function createGist(configJson) { function createGist(configJson) {
var data = { var data = {
'description': 'Bootstrap Customizer Config', description: 'Bootstrap Customizer Config',
'public': true, 'public': true,
'files': { files: {
'config.json': { 'config.json': {
'content': configJson content: configJson
} }
} }
} }

1
js/.jscsrc
View File

@ -4,6 +4,7 @@
"disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"disallowMixedSpacesAndTabs": true, "disallowMixedSpacesAndTabs": true,
"disallowMultipleLineStrings": true, "disallowMultipleLineStrings": true,
"disallowQuotedKeysInObjects": "allButReserved",
"disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"], "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"],
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],

12
js/tests/unit/tooltip.js
View File

@ -391,12 +391,12 @@ $(function () {
test('tooltips should be placed dynamically, with the dynamic placement option', function () { test('tooltips should be placed dynamically, with the dynamic placement option', function () {
$.support.transition = false $.support.transition = false
var ttContainer = $('<div id="dynamic-tt-test"/>').css({ var ttContainer = $('<div id="dynamic-tt-test"/>').css({
'height' : 400, height : 400,
'overflow' : 'hidden', overflow : 'hidden',
'position' : 'absolute', position : 'absolute',
'top' : 0, top : 0,
'left' : 0, left : 0,
'width' : 600 width : 600
}) })
.appendTo('body') .appendTo('body')

8
js/transition.js
View File

@ -17,10 +17,10 @@
var el = document.createElement('bootstrap') var el = document.createElement('bootstrap')
var transEndEventNames = { var transEndEventNames = {
'WebkitTransition' : 'webkitTransitionEnd', WebkitTransition : 'webkitTransitionEnd',
'MozTransition' : 'transitionend', MozTransition : 'transitionend',
'OTransition' : 'oTransitionEnd otransitionend', OTransition : 'oTransitionEnd otransitionend',
'transition' : 'transitionend' transition : 'transitionend'
} }
for (var name in transEndEventNames) { for (var name in transEndEventNames) {