Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
jquery
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
jquery
Commits
b6dd1c67
Commit
b6dd1c67
authored
Jan 30, 2013
by
jrburke
Committed by
Dave Methvin
Apr 04, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the define.amd.jQuery check, close gh-1150.
Cherry picked from 2.0 master
34c4e122
Conflicts: src/exports.js
parent
937b2b19
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
19 deletions
+21
-19
.jshintrc
src/.jshintrc
+1
-0
exports.js
src/exports.js
+19
-16
testinit.js
test/data/testinit.js
+1
-3
No files found.
src/.jshintrc
View file @
b6dd1c67
...
...
@@ -18,6 +18,7 @@
"predef": [
"define",
"module",
"jQuery"
]
}
src/exports.js
View file @
b6dd1c67
// Expose jQuery to the global object
window
.
jQuery
=
window
.
$
=
jQuery
;
if
(
typeof
module
===
"object"
&&
typeof
module
.
exports
===
"object"
)
{
// Expose jQuery as module.exports in loaders that implement the Node
// module pattern (including browserify). Do not create the global, since
// the user will be storing it themselves locally, and globals are frowned
// upon in the Node module world.
module
.
exports
=
jQuery
;
}
else
{
// Otherwise expose jQuery to the global object as usual
window
.
jQuery
=
window
.
$
=
jQuery
;
// Expose jQuery as an AMD module, but only for AMD loaders that
// understand the issues with loading multiple versions of jQuery
// in a page that all might call define(). The loader will indicate
// they have special allowances for multiple jQuery versions by
// specifying define.amd.jQuery = true. Register as a named module,
// since jQuery can be concatenated with other files that may use define,
// but not use a proper concatenation script that understands anonymous
// AMD modules. A named AMD is safest and most robust way to register.
// Lowercase jquery is used because AMD module names are derived from
// file names, and jQuery is normally delivered in a lowercase file name.
// Do this after creating the global so that if an AMD module wants to call
// noConflict to hide this version of jQuery, it will work.
if
(
typeof
define
===
"function"
&&
define
.
amd
&&
define
.
amd
.
jQuery
)
{
define
(
"jquery"
,
[],
function
()
{
return
jQuery
;
}
);
// Register as a named AMD module, since jQuery can be concatenated with other
// files that may use define, but not via a proper concatenation script that
// understands anonymous AMD modules. A named AMD is safest and most robust
// way to register. Lowercase jquery is used because AMD module names are
// derived from file names, and jQuery is normally delivered in a lowercase
// file name. Do this after creating the global so that if an AMD module wants
// to call noConflict to hide this version of jQuery, it will work.
if
(
typeof
define
===
"function"
&&
define
.
amd
)
{
define
(
"jquery"
,
[],
function
()
{
return
jQuery
;
}
);
}
}
test/data/testinit.js
View file @
b6dd1c67
...
...
@@ -19,9 +19,7 @@ function define( name, dependencies, callback ) {
amdDefined
=
callback
();
}
define
.
amd
=
{
jQuery
:
true
};
define
.
amd
=
{};
/**
* Returns an array of elements with the given IDs
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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