Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Use newest strophe and plugins with AMD support.

Browse Source
This commit is contained in:
JC Brand 2015-02-22 15:53:23 +01:00
parent 04912c5c5a
commit 71e9736b1d
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bower.json
View File

@ -1,6 +1,8 @@
{
"name": "converse",
"name": "converse.js",
"description": "Web-based XMPP/Jabber chat client written in javascript",
"version": "0.8.6",
"license": "MPL",
"devDependencies": {
"jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x",
"otr": "0.2.12",
@ -15,10 +17,9 @@
"backbone": "1.1.2",
"backbone.browserStorage": "*",
"backbone.overview": "*",
"strophe": "~1.1.3",
"otr": "0.2.12",
"crypto-js-evanvosberg": "~3.1.2",
"almond": "~0.2.9",
"almond": "~0.3.0",
"requirejs-text": "~2.0.12",
"requirejs-tpl-jcbrand": "*",
"momentjs": "~2.6.0",
@ -28,8 +29,9 @@
"bootstrapJS": "https://raw.githubusercontent.com/jcbrand/bootstrap/7d96a5f60d26c67b5348b270a775518b96a702c8/dist/js/bootstrap.js",
"fontawesome": "~4.1.0",
"typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js",
"strophejs-plugins": "https://github.com/strophe/strophejs-plugins.git#conversejs",
"skeleton-sass": "~2.0.3"
"skeleton-sass": "~2.0.3",
"strophejs": "https://github.com/strophe/strophejs.git#9e285eaa59f4ceb2b25e4d95c5bbe90690251bbc",
"strophejs-plugins": "https://github.com/strophe/strophejs-plugins.git#amd"
},
"exportsOverride": {}
}

16
main.js
View File

@ -27,14 +27,14 @@ require.config({
"jquery.browser": "components/jquery.browser/dist/jquery.browser",
"jquery.easing": "components/jquery-easing-original/index", // XXX: Only required for https://conversejs.org website
"moment": "components/momentjs/moment",
"strophe-base64": "components/strophe/src/base64",
"strophe-bosh": "components/strophe/src/bosh",
"strophe-core": "components/strophe/src/core",
"strophe": "components/strophe/src/wrapper",
"strophe-md5": "components/strophe/src/md5",
"strophe-sha1": "components/strophe/src/sha1",
"strophe-websocket": "components/strophe/src/websocket",
"strophe-polyfill": "components/strophe/src/polyfill",
"strophe-base64": "components/strophejs/src/base64",
"strophe-bosh": "components/strophejs/src/bosh",
"strophe-core": "components/strophejs/src/core",
"strophe": "components/strophejs/src/wrapper",
"strophe-md5": "components/strophejs/src/md5",
"strophe-sha1": "components/strophejs/src/sha1",
"strophe-websocket": "components/strophejs/src/websocket",
"strophe-polyfill": "components/strophejs/src/polyfills",
"strophe.disco": "components/strophejs-plugins/disco/strophe.disco",
"strophe.muc": "src/strophe.muc",
"strophe.roster": "src/strophe.roster",