Skip to content

C
converse.js
Commit d6110a1e authored by JC Brand's avatar JC Brand
Browse files
Options

Patch all scripts that rely on jquery to be AMD compatible.

parent 85f86240
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 32 deletions
bower.json
View file @ d6110a1e
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
"requirejs-tpl-jcbrand": "*", "requirejs-tpl-jcbrand": "*",
"momentjs": "~2.6.0", "momentjs": "~2.6.0",
"jquery.browser": "https://raw.githubusercontent.com/jcbrand/jquery-browser-plugin/ae5e88aa7a26f583e8865c3961ba857918c4c9c1/dist/jquery.browser.js", "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", "bootstrap": "~3.2.0",
"bootstrapJS": "https://raw.githubusercontent.com/jcbrand/bootstrap/7d96a5f60d26c67b5348b270a775518b96a702c8/dist/js/bootstrap.js",
"fontawesome": "~4.1.0", "fontawesome": "~4.1.0",
"typeahead.js": "~0.10.5" "typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js"
}, },
"exportsOverride": {} "exportsOverride": {}
} }
builds/converse-no-locales-no-otr.min.js
View file @ d6110a1e
This diff is collapsed.
builds/converse-no-otr.min.js
View file @ d6110a1e
This diff is collapsed.
builds/converse.min.js
View file @ d6110a1e
This diff is collapsed.
builds/converse.website-no-otr.min.js
View file @ d6110a1e
This diff is collapsed.
builds/converse.website.min.js
View file @ d6110a1e
This diff is collapsed.
main.js
View file @ d6110a1e
...@@ -4,14 +4,15 @@ config = { ...@@ -4,14 +4,15 @@ config = {
"backbone": "components/backbone/backbone", "backbone": "components/backbone/backbone",
"backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage", "backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
"backbone.overview": "components/backbone.overview/backbone.overview", "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-dependencies": "src/deps-website",
"converse-templates": "src/templates", "converse-templates": "src/templates",
"eventemitter": "components/otr/build/dep/eventemitter", "eventemitter": "components/otr/build/dep/eventemitter",
"jquery": "components/jquery/dist/jquery", "jquery": "components/jquery/dist/jquery",
"jquery-private": "src/jquery-private", "jquery-private": "src/jquery-private",
"jquery.browser": "components/jquery.browser/dist/jquery.browser", "jquery.browser": "components/jquery.browser/index",
"jquery.easing": "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website "jquery.easing": "components/jquery-easing-original/index", // XXX: Only required for https://conversejs.org website
"moment": "components/momentjs/moment", "moment": "components/momentjs/moment",
"strophe": "components/strophe/strophe", "strophe": "components/strophe/strophe",
"strophe.disco": "components/strophe.disco/index", "strophe.disco": "components/strophe.disco/index",
...@@ -20,7 +21,7 @@ config = { ...@@ -20,7 +21,7 @@ config = {
"strophe.vcard": "components/strophe.vcard/index", "strophe.vcard": "components/strophe.vcard/index",
"text": 'components/requirejs-text/text', "text": 'components/requirejs-text/text',
"tpl": 'components/requirejs-tpl-jcbrand/tpl', "tpl": 'components/requirejs-tpl-jcbrand/tpl',
"typeahead": "components/typeahead.js/dist/typeahead.jquery", "typeahead": "components/typeahead.js/index",
"underscore": "components/underscore/underscore", "underscore": "components/underscore/underscore",
"utils": "src/utils", "utils": "src/utils",
......
src/build-no-locales-no-otr.js
View file @ d6110a1e
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
"eventemitter": "components/otr/build/dep/eventemitter", "eventemitter": "components/otr/build/dep/eventemitter",
"jquery": "components/jquery/dist/jquery", "jquery": "components/jquery/dist/jquery",
"jquery-private": "src/jquery-private", "jquery-private": "src/jquery-private",
"jquery.browser": "components/jquery.browser/dist/jquery.browser", "jquery.browser": "components/jquery.browser/index",
"jquery.easing": "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website "jquery.easing": "components/jquery-easing-original/index", // XXX: Only required for https://conversejs.org website
"moment": "components/momentjs/moment", "moment": "components/momentjs/moment",
"strophe": "components/strophe/strophe", "strophe": "components/strophe/strophe",
"strophe.disco": "components/strophe.disco/index", "strophe.disco": "components/strophe.disco/index",
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"strophe.vcard": "components/strophe.vcard/index", "strophe.vcard": "components/strophe.vcard/index",
"text": 'components/requirejs-text/text', "text": 'components/requirejs-text/text',
"tpl": 'components/requirejs-tpl-jcbrand/tpl', "tpl": 'components/requirejs-tpl-jcbrand/tpl',
"typeahead": "components/typeahead.js/dist/typeahead.jquery", "typeahead": "components/typeahead.js/index",
"underscore": "components/underscore/underscore", "underscore": "components/underscore/underscore",
"utils": "src/utils", "utils": "src/utils",
......
src/build-no-otr.js
View file @ d6110a1e
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
"eventemitter": "components/otr/build/dep/eventemitter", "eventemitter": "components/otr/build/dep/eventemitter",
"jquery": "components/jquery/dist/jquery", "jquery": "components/jquery/dist/jquery",
"jquery-private": "src/jquery-private", "jquery-private": "src/jquery-private",
"jquery.browser": "components/jquery.browser/dist/jquery.browser", "jquery.browser": "components/jquery.browser/index",
"moment": "components/momentjs/moment", "moment": "components/momentjs/moment",
"strophe": "components/strophe/strophe", "strophe": "components/strophe/strophe",
"strophe.disco": "components/strophe.disco/index", "strophe.disco": "components/strophe.disco/index",
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
"strophe.vcard": "components/strophe.vcard/index", "strophe.vcard": "components/strophe.vcard/index",
"text": 'components/requirejs-text/text', "text": 'components/requirejs-text/text',
"tpl": 'components/requirejs-tpl-jcbrand/tpl', "tpl": 'components/requirejs-tpl-jcbrand/tpl',
"typeahead": "components/typeahead.js/dist/typeahead.jquery", "typeahead": "components/typeahead.js/index",
"underscore": "components/underscore/underscore", "underscore": "components/underscore/underscore",
"utils": "src/utils", "utils": "src/utils",
......
src/build-website-no-otr.js
View file @ d6110a1e
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
"backbone": "components/backbone/backbone", "backbone": "components/backbone/backbone",
"backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage", "backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
"backbone.overview": "components/backbone.overview/backbone.overview", "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-dependencies": "src/deps-website-no-otr",
"converse-templates": "src/templates", "converse-templates": "src/templates",
"eventemitter": "components/otr/build/dep/eventemitter", "eventemitter": "components/otr/build/dep/eventemitter",
"jquery": "components/jquery/dist/jquery", "jquery": "components/jquery/dist/jquery",
"jquery-private": "src/jquery-private", "jquery-private": "src/jquery-private",
"jquery.browser": "components/jquery.browser/dist/jquery.browser", "jquery.browser": "components/jquery.browser/index",
"jquery.easing": "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website "jquery.easing": "components/jquery-easing-original/index", // XXX: Only required for https://conversejs.org website
"moment": "components/momentjs/moment", "moment": "components/momentjs/moment",
"strophe": "components/strophe/strophe", "strophe": "components/strophe/strophe",
"strophe.disco": "components/strophe.disco/index", "strophe.disco": "components/strophe.disco/index",
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"strophe.vcard": "components/strophe.vcard/index", "strophe.vcard": "components/strophe.vcard/index",
"text": 'components/requirejs-text/text', "text": 'components/requirejs-text/text',
"tpl": 'components/requirejs-tpl-jcbrand/tpl', "tpl": 'components/requirejs-tpl-jcbrand/tpl',
"typeahead": "components/typeahead.js/dist/typeahead.jquery", "typeahead": "components/typeahead.js/index",
"underscore": "components/underscore/underscore", "underscore": "components/underscore/underscore",
"utils": "src/utils", "utils": "src/utils",
......
src/build-website.js
View file @ d6110a1e
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
"backbone": "components/backbone/backbone", "backbone": "components/backbone/backbone",
"backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage", "backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
"backbone.overview": "components/backbone.overview/backbone.overview", "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-dependencies": "src/deps-website",
"converse-templates": "src/templates", "converse-templates": "src/templates",
"eventemitter": "components/otr/build/dep/eventemitter", "eventemitter": "components/otr/build/dep/eventemitter",
"jquery": "components/jquery/dist/jquery", "jquery": "components/jquery/dist/jquery",
"jquery-private": "src/jquery-private", "jquery-private": "src/jquery-private",
"jquery.browser": "components/jquery.browser/dist/jquery.browser", "jquery.browser": "components/jquery.browser/index",
"jquery.easing": "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website "jquery.easing": "components/jquery-easing-original/index", // XXX: Only required for https://conversejs.org website
"moment": "components/momentjs/moment", "moment": "components/momentjs/moment",
"strophe": "components/strophe/strophe", "strophe": "components/strophe/strophe",
"strophe.disco": "components/strophe.disco/index", "strophe.disco": "components/strophe.disco/index",
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"strophe.vcard": "components/strophe.vcard/index", "strophe.vcard": "components/strophe.vcard/index",
"text": 'components/requirejs-text/text', "text": 'components/requirejs-text/text',
"tpl": 'components/requirejs-tpl-jcbrand/tpl', "tpl": 'components/requirejs-tpl-jcbrand/tpl',
"typeahead": "components/typeahead.js/dist/typeahead.jquery", "typeahead": "components/typeahead.js/index",
"underscore": "components/underscore/underscore", "underscore": "components/underscore/underscore",
"utils": "src/utils", "utils": "src/utils",
......
src/build.js
View file @ d6110a1e
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
"eventemitter": "components/otr/build/dep/eventemitter", "eventemitter": "components/otr/build/dep/eventemitter",
"jquery": "components/jquery/dist/jquery", "jquery": "components/jquery/dist/jquery",
"jquery-private": "src/jquery-private", "jquery-private": "src/jquery-private",
"jquery.browser": "components/jquery.browser/dist/jquery.browser", "jquery.browser": "components/jquery.browser/index",
"moment": "components/momentjs/moment", "moment": "components/momentjs/moment",
"strophe": "components/strophe/strophe", "strophe": "components/strophe/strophe",
"strophe.disco": "components/strophe.disco/index", "strophe.disco": "components/strophe.disco/index",
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
"strophe.vcard": "components/strophe.vcard/index", "strophe.vcard": "components/strophe.vcard/index",
"text": 'components/requirejs-text/text', "text": 'components/requirejs-text/text',
"tpl": 'components/requirejs-tpl-jcbrand/tpl', "tpl": 'components/requirejs-tpl-jcbrand/tpl',
"typeahead": "components/typeahead.js/dist/typeahead.jquery", "typeahead": "components/typeahead.js/index",
"underscore": "components/underscore/underscore", "underscore": "components/underscore/underscore",
"utils": "src/utils", "utils": "src/utils",
......
src/deps-website-no-otr.js
View file @ d6110a1e
...@@ -2,7 +2,7 @@ define("converse-dependencies", [ ...@@ -2,7 +2,7 @@ define("converse-dependencies", [
"jquery", "jquery",
"moment", "moment",
"locales", "locales",
"bootstrap", // XXX: Can be removed, only for https://conversejs.org "bootstrapJS", // XXX: Can be removed, only for https://conversejs.org
"backbone.browserStorage", "backbone.browserStorage",
"backbone.overview", "backbone.overview",
"jquery.browser", "jquery.browser",
......
src/deps-website.js
View file @ d6110a1e
...@@ -3,7 +3,7 @@ define("converse-dependencies", [ ...@@ -3,7 +3,7 @@ define("converse-dependencies", [
"otr", "otr",
"moment", "moment",
"locales", "locales",
"bootstrap", // XXX: Only for https://conversejs.org "bootstrapJS", // XXX: Only for https://conversejs.org
"backbone.browserStorage", "backbone.browserStorage",
"backbone.overview", "backbone.overview",
"jquery.browser", "jquery.browser",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7