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

Make work with latest strophe build

Browse Source
This commit is contained in:
JC Brand 2017-02-25 21:17:46 +00:00
parent 08fc0823de
commit 704cef5590
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config.js
View File

@ -29,15 +29,7 @@ require.config({
"pluggable": "node_modules/pluggable.js/dist/pluggable", "pluggable": "node_modules/pluggable.js/dist/pluggable",
"polyfill": "src/polyfill", "polyfill": "src/polyfill",
"sizzle": "node_modules/jquery/sizzle/dist/sizzle", "sizzle": "node_modules/jquery/sizzle/dist/sizzle",
"strophe": "node_modules/strophe.js/src/wrapper", "strophe": "node_modules/strophe.js/strophe",
"strophe-base64": "node_modules/strophe.js/src/base64",
"strophe-bosh": "node_modules/strophe.js/src/bosh",
"strophe-core": "node_modules/strophe.js/src/core",
"strophe-md5": "node_modules/strophe.js/src/md5",
"strophe-polyfill": "node_modules/strophe.js/src/polyfills",
"strophe-sha1": "node_modules/strophe.js/src/sha1",
"strophe-utils": "node_modules/strophe.js/src/utils",
"strophe-websocket": "node_modules/strophe.js/src/websocket",
"strophe.disco": "node_modules/strophejs-plugin-disco/strophe.disco", "strophe.disco": "node_modules/strophejs-plugin-disco/strophe.disco",
"strophe.ping": "node_modules/strophejs-plugin-ping/strophe.ping", "strophe.ping": "node_modules/strophejs-plugin-ping/strophe.ping",
"strophe.rsm": "node_modules/strophejs-plugin-rsm/strophe.rsm", "strophe.rsm": "node_modules/strophejs-plugin-rsm/strophe.rsm",

2
package.json
View File

@ -62,7 +62,7 @@
"otr": "0.2.16", "otr": "0.2.16",
"phantom-jasmine": "0.1.8", "phantom-jasmine": "0.1.8",
"phantomjs": "~1.9.7-1", "phantomjs": "~1.9.7-1",
"pluggable.js": "https://github.com/jcbrand/pluggable.js.git#e5fc6a78dd568a120674ff7325da038d5ba9b334", "pluggable.js": "1.0.0",
"po2json": "^0.4.4", "po2json": "^0.4.4",
"requirejs": "2.3.3", "requirejs": "2.3.3",
"sinon": "^1.17.3", "sinon": "^1.17.3",

3
src/wrapper-end.js
View File

@ -1,4 +1,4 @@
/*global jQuery, _, moment, Strophe, $build, $iq, $msg, $pres, SHA1, Base64, MD5, DSA, OTR */ /*global jQuery, _, moment, Strophe, $build, $iq, $msg, $pres, SHA1, MD5, DSA, OTR */
define('jquery', [], function () { return jQuery; }); define('jquery', [], function () { return jQuery; });
define('jquery.browser', [], function () { return jQuery; }); define('jquery.browser', [], function () { return jQuery; });
define('typeahead', [], function () { return jQuery; }); define('typeahead', [], function () { return jQuery; });
@ -13,7 +13,6 @@ define('strophe', [], function () {
'$msg': $msg, '$msg': $msg,
'$pres': $pres, '$pres': $pres,
'SHA1': SHA1, 'SHA1': SHA1,
'Base64': Base64,
'MD5': MD5, 'MD5': MD5,
'b64_hmac_sha1': SHA1.b64_hmac_sha1, 'b64_hmac_sha1': SHA1.b64_hmac_sha1,
'b64_sha1': SHA1.b64_sha1, 'b64_sha1': SHA1.b64_sha1,

3
src/wrapper-no-deps.js
View File

@ -1,4 +1,4 @@
/*global jQuery, _, moment, Strophe, $build, $iq, $msg, $pres, SHA1, Base64, MD5, DSA, OTR */ /*global jQuery, _, moment, Strophe, $build, $iq, $msg, $pres, SHA1, MD5, DSA, OTR */
define('jquery.browser', [], function () { return jQuery; }); define('jquery.browser', [], function () { return jQuery; });
define('awesomplete', [], function () { return jQuery; }); define('awesomplete', [], function () { return jQuery; });
define('lodash', [], function () { return _; }); define('lodash', [], function () { return _; });
@ -11,7 +11,6 @@ define('strophe', [], function () {
'$msg': $msg, '$msg': $msg,
'$pres': $pres, '$pres': $pres,
'SHA1': SHA1, 'SHA1': SHA1,
'Base64': Base64,
'MD5': MD5, 'MD5': MD5,
'b64_hmac_sha1': SHA1.b64_hmac_sha1, 'b64_hmac_sha1': SHA1.b64_hmac_sha1,
'b64_sha1': SHA1.b64_sha1, 'b64_sha1': SHA1.b64_sha1,