Patch all scripts that rely on jquery to be AMD compatible.
This commit is contained in:
parent
85f8624087
commit
d6110a1e52
@ -27,10 +27,11 @@
|
||||
"requirejs-tpl-jcbrand": "*",
|
||||
"momentjs": "~2.6.0",
|
||||
"jquery.browser": "https://raw.githubusercontent.com/jcbrand/jquery-browser-plugin/ae5e88aa7a26f583e8865c3961ba857918c4c9c1/dist/jquery.browser.js",
|
||||
"jquery-easing-original": "~1.3.1",
|
||||
"jquery-easing-original": "https://raw.githubusercontent.com/jcbrand/jquery.easing/7de3458b1845a72c1f407debf6b223c8446396bf/jquery.easing.1.3.js",
|
||||
"bootstrap": "~3.2.0",
|
||||
"bootstrapJS": "https://raw.githubusercontent.com/jcbrand/bootstrap/7d96a5f60d26c67b5348b270a775518b96a702c8/dist/js/bootstrap.js",
|
||||
"fontawesome": "~4.1.0",
|
||||
"typeahead.js": "~0.10.5"
|
||||
"typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js"
|
||||
},
|
||||
"exportsOverride": {}
|
||||
}
|
||||
|
2
builds/converse-no-locales-no-otr.min.js
vendored
2
builds/converse-no-locales-no-otr.min.js
vendored
File diff suppressed because one or more lines are too long
2
builds/converse-no-otr.min.js
vendored
2
builds/converse-no-otr.min.js
vendored
File diff suppressed because one or more lines are too long
2
builds/converse.min.js
vendored
2
builds/converse.min.js
vendored
File diff suppressed because one or more lines are too long
4
builds/converse.website-no-otr.min.js
vendored
4
builds/converse.website-no-otr.min.js
vendored
File diff suppressed because one or more lines are too long
4
builds/converse.website.min.js
vendored
4
builds/converse.website.min.js
vendored
File diff suppressed because one or more lines are too long
9
main.js
9
main.js
@ -4,14 +4,15 @@ config = {
|
||||
"backbone": "components/backbone/backbone",
|
||||
"backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
|
||||
"backbone.overview": "components/backbone.overview/backbone.overview",
|
||||
"bootstrap": "components/bootstrap/dist/js/bootstrap", // XXX: Only required for https://conversejs.org website
|
||||
"bootstrap": "components/bootstrap/dist/js/bootstrap", // XXX: Only required for https://conversejs.org website
|
||||
"bootstrapJS": "components/bootstrapJS/index", // XXX: Only required for https://conversejs.org website
|
||||
"converse-dependencies": "src/deps-website",
|
||||
"converse-templates": "src/templates",
|
||||
"eventemitter": "components/otr/build/dep/eventemitter",
|
||||
"jquery": "components/jquery/dist/jquery",
|
||||
"jquery-private": "src/jquery-private",
|
||||
"jquery.browser": "components/jquery.browser/dist/jquery.browser",
|
||||
"jquery.easing": "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website
|
||||
"jquery.browser": "components/jquery.browser/index",
|
||||
"jquery.easing": "components/jquery-easing-original/index", // XXX: Only required for https://conversejs.org website
|
||||
"moment": "components/momentjs/moment",
|
||||
"strophe": "components/strophe/strophe",
|
||||
"strophe.disco": "components/strophe.disco/index",
|
||||
@ -20,7 +21,7 @@ config = {
|
||||
"strophe.vcard": "components/strophe.vcard/index",
|
||||
"text": 'components/requirejs-text/text',
|
||||
"tpl": 'components/requirejs-tpl-jcbrand/tpl',
|
||||
"typeahead": "components/typeahead.js/dist/typeahead.jquery",
|
||||
"typeahead": "components/typeahead.js/index",
|
||||
"underscore": "components/underscore/underscore",
|
||||
"utils": "src/utils",
|
||||
|
||||
|
@ -29,8 +29,8 @@
|
||||
"eventemitter": "components/otr/build/dep/eventemitter",
|
||||
"jquery": "components/jquery/dist/jquery",
|
||||
"jquery-private": "src/jquery-private",
|
||||
"jquery.browser": "components/jquery.browser/dist/jquery.browser",
|
||||
"jquery.easing": "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website
|
||||
"jquery.browser": "components/jquery.browser/index",
|
||||
"jquery.easing": "components/jquery-easing-original/index", // XXX: Only required for https://conversejs.org website
|
||||
"moment": "components/momentjs/moment",
|
||||
"strophe": "components/strophe/strophe",
|
||||
"strophe.disco": "components/strophe.disco/index",
|
||||
@ -39,7 +39,7 @@
|
||||
"strophe.vcard": "components/strophe.vcard/index",
|
||||
"text": 'components/requirejs-text/text',
|
||||
"tpl": 'components/requirejs-tpl-jcbrand/tpl',
|
||||
"typeahead": "components/typeahead.js/dist/typeahead.jquery",
|
||||
"typeahead": "components/typeahead.js/index",
|
||||
"underscore": "components/underscore/underscore",
|
||||
"utils": "src/utils",
|
||||
|
||||
|
@ -28,7 +28,7 @@
|
||||
"eventemitter": "components/otr/build/dep/eventemitter",
|
||||
"jquery": "components/jquery/dist/jquery",
|
||||
"jquery-private": "src/jquery-private",
|
||||
"jquery.browser": "components/jquery.browser/dist/jquery.browser",
|
||||
"jquery.browser": "components/jquery.browser/index",
|
||||
"moment": "components/momentjs/moment",
|
||||
"strophe": "components/strophe/strophe",
|
||||
"strophe.disco": "components/strophe.disco/index",
|
||||
@ -37,7 +37,7 @@
|
||||
"strophe.vcard": "components/strophe.vcard/index",
|
||||
"text": 'components/requirejs-text/text',
|
||||
"tpl": 'components/requirejs-tpl-jcbrand/tpl',
|
||||
"typeahead": "components/typeahead.js/dist/typeahead.jquery",
|
||||
"typeahead": "components/typeahead.js/index",
|
||||
"underscore": "components/underscore/underscore",
|
||||
"utils": "src/utils",
|
||||
|
||||
|
@ -23,14 +23,14 @@
|
||||
"backbone": "components/backbone/backbone",
|
||||
"backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
|
||||
"backbone.overview": "components/backbone.overview/backbone.overview",
|
||||
"bootstrap": "components/bootstrap/dist/js/bootstrap", // XXX: Only required for https://conversejs.org website
|
||||
"bootstrapJS": "components/bootstrapJS/index", // XXX: Only required for https://conversejs.org website
|
||||
"converse-dependencies": "src/deps-website-no-otr",
|
||||
"converse-templates": "src/templates",
|
||||
"eventemitter": "components/otr/build/dep/eventemitter",
|
||||
"jquery": "components/jquery/dist/jquery",
|
||||
"jquery-private": "src/jquery-private",
|
||||
"jquery.browser": "components/jquery.browser/dist/jquery.browser",
|
||||
"jquery.easing": "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website
|
||||
"jquery.browser": "components/jquery.browser/index",
|
||||
"jquery.easing": "components/jquery-easing-original/index", // XXX: Only required for https://conversejs.org website
|
||||
"moment": "components/momentjs/moment",
|
||||
"strophe": "components/strophe/strophe",
|
||||
"strophe.disco": "components/strophe.disco/index",
|
||||
@ -39,7 +39,7 @@
|
||||
"strophe.vcard": "components/strophe.vcard/index",
|
||||
"text": 'components/requirejs-text/text',
|
||||
"tpl": 'components/requirejs-tpl-jcbrand/tpl',
|
||||
"typeahead": "components/typeahead.js/dist/typeahead.jquery",
|
||||
"typeahead": "components/typeahead.js/index",
|
||||
"underscore": "components/underscore/underscore",
|
||||
"utils": "src/utils",
|
||||
|
||||
|
@ -23,14 +23,14 @@
|
||||
"backbone": "components/backbone/backbone",
|
||||
"backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
|
||||
"backbone.overview": "components/backbone.overview/backbone.overview",
|
||||
"bootstrap": "components/bootstrap/dist/js/bootstrap", // XXX: Only required for https://conversejs.org website
|
||||
"bootstrapJS": "components/bootstrapJS/index", // XXX: Only required for https://conversejs.org website
|
||||
"converse-dependencies": "src/deps-website",
|
||||
"converse-templates": "src/templates",
|
||||
"eventemitter": "components/otr/build/dep/eventemitter",
|
||||
"jquery": "components/jquery/dist/jquery",
|
||||
"jquery-private": "src/jquery-private",
|
||||
"jquery.browser": "components/jquery.browser/dist/jquery.browser",
|
||||
"jquery.easing": "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website
|
||||
"jquery.browser": "components/jquery.browser/index",
|
||||
"jquery.easing": "components/jquery-easing-original/index", // XXX: Only required for https://conversejs.org website
|
||||
"moment": "components/momentjs/moment",
|
||||
"strophe": "components/strophe/strophe",
|
||||
"strophe.disco": "components/strophe.disco/index",
|
||||
@ -39,7 +39,7 @@
|
||||
"strophe.vcard": "components/strophe.vcard/index",
|
||||
"text": 'components/requirejs-text/text',
|
||||
"tpl": 'components/requirejs-tpl-jcbrand/tpl',
|
||||
"typeahead": "components/typeahead.js/dist/typeahead.jquery",
|
||||
"typeahead": "components/typeahead.js/index",
|
||||
"underscore": "components/underscore/underscore",
|
||||
"utils": "src/utils",
|
||||
|
||||
|
@ -28,7 +28,7 @@
|
||||
"eventemitter": "components/otr/build/dep/eventemitter",
|
||||
"jquery": "components/jquery/dist/jquery",
|
||||
"jquery-private": "src/jquery-private",
|
||||
"jquery.browser": "components/jquery.browser/dist/jquery.browser",
|
||||
"jquery.browser": "components/jquery.browser/index",
|
||||
"moment": "components/momentjs/moment",
|
||||
"strophe": "components/strophe/strophe",
|
||||
"strophe.disco": "components/strophe.disco/index",
|
||||
@ -37,7 +37,7 @@
|
||||
"strophe.vcard": "components/strophe.vcard/index",
|
||||
"text": 'components/requirejs-text/text',
|
||||
"tpl": 'components/requirejs-tpl-jcbrand/tpl',
|
||||
"typeahead": "components/typeahead.js/dist/typeahead.jquery",
|
||||
"typeahead": "components/typeahead.js/index",
|
||||
"underscore": "components/underscore/underscore",
|
||||
"utils": "src/utils",
|
||||
|
||||
|
@ -2,7 +2,7 @@ define("converse-dependencies", [
|
||||
"jquery",
|
||||
"moment",
|
||||
"locales",
|
||||
"bootstrap", // XXX: Can be removed, only for https://conversejs.org
|
||||
"bootstrapJS", // XXX: Can be removed, only for https://conversejs.org
|
||||
"backbone.browserStorage",
|
||||
"backbone.overview",
|
||||
"jquery.browser",
|
||||
|
@ -3,7 +3,7 @@ define("converse-dependencies", [
|
||||
"otr",
|
||||
"moment",
|
||||
"locales",
|
||||
"bootstrap", // XXX: Only for https://conversejs.org
|
||||
"bootstrapJS", // XXX: Only for https://conversejs.org
|
||||
"backbone.browserStorage",
|
||||
"backbone.overview",
|
||||
"jquery.browser",
|
||||
|
Loading…
Reference in New Issue
Block a user