Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
1c6fa901
Commit
1c6fa901
authored
10 years ago
by
Katie Zhu
Committed by
fat
10 years ago
Browse files
Options
Download
Email Patches
Plain Diff
MD/CommonJS/Globals #12909
parent
6a248244
5 merge requests
!28721
Hot test
,
!16605
Test pull please ignore
,
!22103
test
,
!25326
Adjust examples
,
!13772
AMD/CommonJS/Globals #12909
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
js/.jscsrc
+1
-2
js/.jscsrc
js/.jshintrc
+2
-2
js/.jshintrc
js/affix.js
+6
-2
js/affix.js
js/alert.js
+6
-2
js/alert.js
js/button.js
+6
-2
js/button.js
js/carousel.js
+6
-2
js/carousel.js
js/collapse.js
+6
-2
js/collapse.js
js/dropdown.js
+6
-2
js/dropdown.js
js/modal.js
+6
-2
js/modal.js
js/popover.js
+6
-2
js/popover.js
js/scrollspy.js
+6
-2
js/scrollspy.js
js/tab.js
+6
-2
js/tab.js
js/tooltip.js
+6
-2
js/tooltip.js
js/transition.js
+6
-2
js/transition.js
with
75 additions
and
28 deletions
+75
-28
js/.jscsrc
+
1
-
2
View file @
1c6fa901
...
@@ -11,10 +11,9 @@
...
@@ -11,10 +11,9 @@
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
"disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true },
"disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true },
"disallowSpacesInsideArrayBrackets": true,
"disallowSpacesInsideArrayBrackets": true,
"disallowSpacesInsideParentheses": true,
"disallowTrailingComma": true,
"disallowTrailingComma": true,
"disallowSpacesInsideParentheses": true,
"disallowTrailingWhitespace": true,
"disallowTrailingWhitespace": true,
"requireCamelCaseOrUpperCaseIdentifiers": true,
"requireCapitalizedConstructors": true,
"requireCapitalizedConstructors": true,
"requireCommaBeforeLineBreak": true,
"requireCommaBeforeLineBreak": true,
"requireDotNotation": true,
"requireDotNotation": true,
...
...
This diff is collapsed.
Click to expand it.
js/.jshintrc
+
2
-
2
View file @
1c6fa901
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
"latedef" : true,
"latedef" : true,
"laxbreak" : true,
"laxbreak" : true,
"nonbsp" : true,
"nonbsp" : true,
"strict" : true,
"undef" : true,
"undef" : true,
"unused" : true
"unused" : true,
"predef" : [ "define", "require" ]
}
}
This diff is collapsed.
Click to expand it.
js/affix.js
+
6
-
2
View file @
1c6fa901
...
@@ -7,7 +7,11 @@
...
@@ -7,7 +7,11 @@
* ======================================================================== */
* ======================================================================== */
+
function
(
$
)
{
(
function
(
o_o
)
{
typeof
define
===
'
function
'
&&
define
.
amd
?
define
([
'
jquery
'
],
o_o
)
:
typeof
exports
===
'
object
'
?
o_o
(
require
(
'
jquery
'
))
:
o_o
(
this
.
jQuery
)
})(
function
(
$
)
{
'
use strict
'
;
'
use strict
'
;
// AFFIX CLASS DEFINITION
// AFFIX CLASS DEFINITION
...
@@ -139,4 +143,4 @@
...
@@ -139,4 +143,4 @@
})
})
})
})
}
(
jQuery
);
});
This diff is collapsed.
Click to expand it.
js/alert.js
+
6
-
2
View file @
1c6fa901
...
@@ -7,7 +7,11 @@
...
@@ -7,7 +7,11 @@
* ======================================================================== */
* ======================================================================== */
+
function
(
$
)
{
(
function
(
o_o
)
{
typeof
define
===
'
function
'
&&
define
.
amd
?
define
([
'
jquery
'
],
o_o
)
:
typeof
exports
===
'
object
'
?
o_o
(
require
(
'
jquery
'
))
:
o_o
(
this
.
jQuery
)
})(
function
(
$
)
{
'
use strict
'
;
'
use strict
'
;
// ALERT CLASS DEFINITION
// ALERT CLASS DEFINITION
...
@@ -89,4 +93,4 @@
...
@@ -89,4 +93,4 @@
$
(
document
).
on
(
'
click.bs.alert.data-api
'
,
dismiss
,
Alert
.
prototype
.
close
)
$
(
document
).
on
(
'
click.bs.alert.data-api
'
,
dismiss
,
Alert
.
prototype
.
close
)
}
(
jQuery
);
});
This diff is collapsed.
Click to expand it.
js/button.js
+
6
-
2
View file @
1c6fa901
...
@@ -7,7 +7,11 @@
...
@@ -7,7 +7,11 @@
* ======================================================================== */
* ======================================================================== */
+
function
(
$
)
{
(
function
(
o_o
)
{
typeof
define
===
'
function
'
&&
define
.
amd
?
define
([
'
jquery
'
],
o_o
)
:
typeof
exports
===
'
object
'
?
o_o
(
require
(
'
jquery
'
))
:
o_o
(
this
.
jQuery
)
})(
function
(
$
)
{
'
use strict
'
;
'
use strict
'
;
// BUTTON PUBLIC CLASS DEFINITION
// BUTTON PUBLIC CLASS DEFINITION
...
@@ -107,4 +111,4 @@
...
@@ -107,4 +111,4 @@
e
.
preventDefault
()
e
.
preventDefault
()
})
})
}
(
jQuery
);
});
This diff is collapsed.
Click to expand it.
js/carousel.js
+
6
-
2
View file @
1c6fa901
...
@@ -7,7 +7,11 @@
...
@@ -7,7 +7,11 @@
* ======================================================================== */
* ======================================================================== */
+
function
(
$
)
{
(
function
(
o_o
)
{
typeof
define
===
'
function
'
&&
define
.
amd
?
define
([
'
jquery
'
],
o_o
)
:
typeof
exports
===
'
object
'
?
o_o
(
require
(
'
jquery
'
))
:
o_o
(
this
.
jQuery
)
})(
function
(
$
)
{
'
use strict
'
;
'
use strict
'
;
// CAROUSEL CLASS DEFINITION
// CAROUSEL CLASS DEFINITION
...
@@ -209,4 +213,4 @@
...
@@ -209,4 +213,4 @@
})
})
})
})
}
(
jQuery
);
});
This diff is collapsed.
Click to expand it.
js/collapse.js
+
6
-
2
View file @
1c6fa901
...
@@ -7,7 +7,11 @@
...
@@ -7,7 +7,11 @@
* ======================================================================== */
* ======================================================================== */
+
function
(
$
)
{
(
function
(
o_o
)
{
typeof
define
===
'
function
'
&&
define
.
amd
?
define
([
'
jquery
'
],
o_o
)
:
typeof
exports
===
'
object
'
?
o_o
(
require
(
'
jquery
'
))
:
o_o
(
this
.
jQuery
)
})(
function
(
$
)
{
'
use strict
'
;
'
use strict
'
;
// COLLAPSE PUBLIC CLASS DEFINITION
// COLLAPSE PUBLIC CLASS DEFINITION
...
@@ -178,4 +182,4 @@
...
@@ -178,4 +182,4 @@
Plugin
.
call
(
$target
,
option
)
Plugin
.
call
(
$target
,
option
)
})
})
}
(
jQuery
);
});
This diff is collapsed.
Click to expand it.
js/dropdown.js
+
6
-
2
View file @
1c6fa901
...
@@ -7,7 +7,11 @@
...
@@ -7,7 +7,11 @@
* ======================================================================== */
* ======================================================================== */
+
function
(
$
)
{
(
function
(
o_o
)
{
typeof
define
===
'
function
'
&&
define
.
amd
?
define
([
'
jquery
'
],
o_o
)
:
typeof
exports
===
'
object
'
?
o_o
(
require
(
'
jquery
'
))
:
o_o
(
this
.
jQuery
)
})(
function
(
$
)
{
'
use strict
'
;
'
use strict
'
;
// DROPDOWN CLASS DEFINITION
// DROPDOWN CLASS DEFINITION
...
@@ -148,4 +152,4 @@
...
@@ -148,4 +152,4 @@
.
on
(
'
click.bs.dropdown.data-api
'
,
toggle
,
Dropdown
.
prototype
.
toggle
)
.
on
(
'
click.bs.dropdown.data-api
'
,
toggle
,
Dropdown
.
prototype
.
toggle
)
.
on
(
'
keydown.bs.dropdown.data-api
'
,
toggle
+
'
, [role="menu"], [role="listbox"]
'
,
Dropdown
.
prototype
.
keydown
)
.
on
(
'
keydown.bs.dropdown.data-api
'
,
toggle
+
'
, [role="menu"], [role="listbox"]
'
,
Dropdown
.
prototype
.
keydown
)
}
(
jQuery
);
});
This diff is collapsed.
Click to expand it.
js/modal.js
+
6
-
2
View file @
1c6fa901
...
@@ -7,7 +7,11 @@
...
@@ -7,7 +7,11 @@
* ======================================================================== */
* ======================================================================== */
+
function
(
$
)
{
(
function
(
o_o
)
{
typeof
define
===
'
function
'
&&
define
.
amd
?
define
([
'
jquery
'
],
o_o
)
:
typeof
exports
===
'
object
'
?
o_o
(
require
(
'
jquery
'
))
:
o_o
(
this
.
jQuery
)
})(
function
(
$
)
{
'
use strict
'
;
'
use strict
'
;
// MODAL CLASS DEFINITION
// MODAL CLASS DEFINITION
...
@@ -277,4 +281,4 @@
...
@@ -277,4 +281,4 @@
Plugin
.
call
(
$target
,
option
,
this
)
Plugin
.
call
(
$target
,
option
,
this
)
})
})
}
(
jQuery
);
});
This diff is collapsed.
Click to expand it.
js/popover.js
+
6
-
2
View file @
1c6fa901
...
@@ -7,7 +7,11 @@
...
@@ -7,7 +7,11 @@
* ======================================================================== */
* ======================================================================== */
+
function
(
$
)
{
(
function
(
o_o
)
{
typeof
define
===
'
function
'
&&
define
.
amd
?
define
([
'
jquery
'
],
o_o
)
:
typeof
exports
===
'
object
'
?
o_o
(
require
(
'
jquery
'
))
:
o_o
(
this
.
jQuery
)
})(
function
(
$
)
{
'
use strict
'
;
'
use strict
'
;
// POPOVER PUBLIC CLASS DEFINITION
// POPOVER PUBLIC CLASS DEFINITION
...
@@ -110,4 +114,4 @@
...
@@ -110,4 +114,4 @@
return
this
return
this
}
}
}
(
jQuery
);
});
This diff is collapsed.
Click to expand it.
js/scrollspy.js
+
6
-
2
View file @
1c6fa901
...
@@ -7,7 +7,11 @@
...
@@ -7,7 +7,11 @@
* ======================================================================== */
* ======================================================================== */
+
function
(
$
)
{
(
function
(
o_o
)
{
typeof
define
===
'
function
'
&&
define
.
amd
?
define
([
'
jquery
'
],
o_o
)
:
typeof
exports
===
'
object
'
?
o_o
(
require
(
'
jquery
'
))
:
o_o
(
this
.
jQuery
)
})(
function
(
$
)
{
'
use strict
'
;
'
use strict
'
;
// SCROLLSPY CLASS DEFINITION
// SCROLLSPY CLASS DEFINITION
...
@@ -157,4 +161,4 @@
...
@@ -157,4 +161,4 @@
})
})
})
})
}
(
jQuery
);
});
This diff is collapsed.
Click to expand it.
js/tab.js
+
6
-
2
View file @
1c6fa901
...
@@ -7,7 +7,11 @@
...
@@ -7,7 +7,11 @@
* ======================================================================== */
* ======================================================================== */
+
function
(
$
)
{
(
function
(
o_o
)
{
typeof
define
===
'
function
'
&&
define
.
amd
?
define
([
'
jquery
'
],
o_o
)
:
typeof
exports
===
'
object
'
?
o_o
(
require
(
'
jquery
'
))
:
o_o
(
this
.
jQuery
)
})(
function
(
$
)
{
'
use strict
'
;
'
use strict
'
;
// TAB CLASS DEFINITION
// TAB CLASS DEFINITION
...
@@ -125,4 +129,4 @@
...
@@ -125,4 +129,4 @@
Plugin
.
call
(
$
(
this
),
'
show
'
)
Plugin
.
call
(
$
(
this
),
'
show
'
)
})
})
}
(
jQuery
);
});
This diff is collapsed.
Click to expand it.
js/tooltip.js
+
6
-
2
View file @
1c6fa901
...
@@ -8,7 +8,11 @@
...
@@ -8,7 +8,11 @@
* ======================================================================== */
* ======================================================================== */
+
function
(
$
)
{
(
function
(
o_o
)
{
typeof
define
===
'
function
'
&&
define
.
amd
?
define
([
'
jquery
'
],
o_o
)
:
typeof
exports
===
'
object
'
?
o_o
(
require
(
'
jquery
'
))
:
o_o
(
this
.
jQuery
)
})(
function
(
$
)
{
'
use strict
'
;
'
use strict
'
;
// TOOLTIP PUBLIC CLASS DEFINITION
// TOOLTIP PUBLIC CLASS DEFINITION
...
@@ -454,4 +458,4 @@
...
@@ -454,4 +458,4 @@
return
this
return
this
}
}
}
(
jQuery
);
});
This diff is collapsed.
Click to expand it.
js/transition.js
+
6
-
2
View file @
1c6fa901
...
@@ -7,7 +7,11 @@
...
@@ -7,7 +7,11 @@
* ======================================================================== */
* ======================================================================== */
+
function
(
$
)
{
(
function
(
o_o
)
{
typeof
define
===
'
function
'
&&
define
.
amd
?
define
([
'
jquery
'
],
o_o
)
:
typeof
exports
===
'
object
'
?
o_o
(
require
(
'
jquery
'
))
:
o_o
(
this
.
jQuery
)
})(
function
(
$
)
{
'
use strict
'
;
'
use strict
'
;
// CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
// CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
...
@@ -46,4 +50,4 @@
...
@@ -46,4 +50,4 @@
$
.
support
.
transition
=
transitionEnd
()
$
.
support
.
transition
=
transitionEnd
()
})
})
}
(
jQuery
);
});
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets