diff options
| -rw-r--r-- | public-src/3rd-party/package.json | 2 | ||||
| -rw-r--r-- | public-src/3rd-party/yarn.lock | 8 | ||||
| -rw-r--r-- | public-src/require.config.js | 11 |
3 files changed, 16 insertions, 5 deletions
diff --git a/public-src/3rd-party/package.json b/public-src/3rd-party/package.json index d59a2a7..b0a1ee0 100644 --- a/public-src/3rd-party/package.json +++ b/public-src/3rd-party/package.json @@ -3,6 +3,8 @@ "flot": "git://github.com/flot/flot#v0.8.3", "jarmon": "git://git.lukeshu.com/2git/jarmon#lukeshu/master", "javascriptrrd": "git://git.lukeshu.com/2git/javascriptrrd#v1.1.1", + "jquery": "^1.11", + "jquery-migrate": "^1.0", "jquerytools": "git://github.com/jquerytools/jquerytools#8ac4636a01d3860f1c4726ba722190a531bf1068", "requirejs": "^2.3.5", "sorttable": "git://github.com/stuartlangridge/sorttable" diff --git a/public-src/3rd-party/yarn.lock b/public-src/3rd-party/yarn.lock index 39719ce..0cce78b 100644 --- a/public-src/3rd-party/yarn.lock +++ b/public-src/3rd-party/yarn.lock @@ -14,6 +14,14 @@ version "0.0.0" resolved "git://git.lukeshu.com/2git/javascriptrrd#ccb760b9a830c9f7aff831752edf0bb287189775" +jquery-migrate@^1.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jquery-migrate/-/jquery-migrate-1.4.1.tgz#85152f3ec99a95625f4f7d0bcf62e9b8638f5a76" + +jquery@^1.11: + version "1.12.4" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.12.4.tgz#01e1dfba290fe73deba77ceeacb0f9ba2fec9e0c" + "jquerytools@git://github.com/jquerytools/jquerytools#8ac4636a01d3860f1c4726ba722190a531bf1068": version "0.0.0" resolved "git://github.com/jquerytools/jquerytools#8ac4636a01d3860f1c4726ba722190a531bf1068" diff --git a/public-src/require.config.js b/public-src/require.config.js index e824aaa..50732cf 100644 --- a/public-src/require.config.js +++ b/public-src/require.config.js @@ -15,9 +15,10 @@ var require = { exports: "jarmon" }, // jQuery plugins - "jquerytools/tabs/tabs" : { deps: ["jquery"], exports: "jQuery.tools.tabs" }, - "jquerytools/toolbox/toolbox.history" : { deps: ["jquery" /* <1.9 */], exports: "jQuery.tools.history" }, - "flot/jquery.flot" : { deps: ["jquery" /* <1.9 */], exports: "jQuery.plot" }, + "jquery-migrate" : { deps: ["jquery"], exports: "jQuery.migrateVersion" }, + "jquerytools/tabs/tabs" : { deps: ["jquery", "jquery-migrate"], exports: "jQuery.tools.tabs" }, + "jquerytools/toolbox/toolbox.history" : { deps: ["jquery", "jquery-migrate"], exports: "jQuery.tools.history" }, + "flot/jquery.flot" : { deps: ["jquery"], exports: "jQuery.plot" }, // Flot plugins "flot/jquery.flot.time" : { deps: ["flot/jquery.flot"] }, "flot/jquery.flot.selection" : { deps: ["flot/jquery.flot"] }, @@ -30,11 +31,11 @@ var require = { "flot" : "/3rd-party/yarn/flot", "jarmon" : "/3rd-party/yarn/jarmon/jarmon/jarmon", "javascriptrrd" : "/3rd-party/yarn/javascriptrrd/src/lib", + "jquery" : "/3rd-party/yarn/jquery/dist/jquery", + "jquery-migrate": "/3rd-party/yarn/jquery-migrate/dist/jquery-migrate", "jquerytools" : "/3rd-party/yarn/jquerytools/src", "requirejs" : "/3rd-party/yarn/requirejs/require", - "jquery" : "/3rd-party/jquery-1.6.3", - "cfg" : "/cfg", }, }; |