Skip to content

Commit 2c31e61

Browse files
committed
Merge branch 'master' of github.com:requirejs/example-jquery-shim
2 parents 044607c + afd87e3 commit 2c31e61

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Example of using jQuery and require.js with a shim config.
22
====
33

4-
This example shows one way to load jQuery and jQuery plugins with require.js. jQuery itself registers as an AMD module and can easily be loaded. Most plugins, however, does not register as AMD modules, and therefore, require.js doesn't know that the plugins need jQuery to be loaded.
4+
This example shows one way to load jQuery and jQuery plugins with require.js. jQuery itself registers as an AMD module and can easily be loaded. Most plugins, however, do not register as AMD modules, and therefore, require.js doesn't know that the plugins need jQuery to be loaded.
55

66
If the plugins you use all call [define()](http://requirejs.org/docs/api.html#define) to declare their dependencies, then you may want to use the [example that uses jQuery from a CDN](https://github.com/requirejs/example-jquery-cdn) instead.
77

tools/build.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"mainConfigFile": "../www/js/app.js",
1111

1212
"modules": [
13-
//Optimize the application files. jQuery is not
14-
//included since it is already in require-jquery.js
13+
//Optimize the application files. jQuery and the plugins will be included
14+
//automatically, as they are dependencies of app.js.
1515
{
1616
"name": "app"
1717
}

0 commit comments

Comments
 (0)