From 704cef5590b45fd9e15d3d2b253f21e6cc23ebcb Mon Sep 17 00:00:00 2001 From: JC Brand Date: Sat, 25 Feb 2017 21:17:46 +0000 Subject: [PATCH] Make work with latest strophe build --- config.js | 10 +--------- package.json | 2 +- src/wrapper-end.js | 3 +-- src/wrapper-no-deps.js | 3 +-- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/config.js b/config.js index 02e395c73..87399536f 100644 --- a/config.js +++ b/config.js @@ -29,15 +29,7 @@ require.config({ "pluggable": "node_modules/pluggable.js/dist/pluggable", "polyfill": "src/polyfill", "sizzle": "node_modules/jquery/sizzle/dist/sizzle", - "strophe": "node_modules/strophe.js/src/wrapper", - "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": "node_modules/strophe.js/strophe", "strophe.disco": "node_modules/strophejs-plugin-disco/strophe.disco", "strophe.ping": "node_modules/strophejs-plugin-ping/strophe.ping", "strophe.rsm": "node_modules/strophejs-plugin-rsm/strophe.rsm", diff --git a/package.json b/package.json index c5f08cbbd..c8847b970 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "otr": "0.2.16", "phantom-jasmine": "0.1.8", "phantomjs": "~1.9.7-1", - "pluggable.js": "https://github.com/jcbrand/pluggable.js.git#e5fc6a78dd568a120674ff7325da038d5ba9b334", + "pluggable.js": "1.0.0", "po2json": "^0.4.4", "requirejs": "2.3.3", "sinon": "^1.17.3", diff --git a/src/wrapper-end.js b/src/wrapper-end.js index 71be86738..9a43e2ebd 100644 --- a/src/wrapper-end.js +++ b/src/wrapper-end.js @@ -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.browser', [], function () { return jQuery; }); define('typeahead', [], function () { return jQuery; }); @@ -13,7 +13,6 @@ define('strophe', [], function () { '$msg': $msg, '$pres': $pres, 'SHA1': SHA1, - 'Base64': Base64, 'MD5': MD5, 'b64_hmac_sha1': SHA1.b64_hmac_sha1, 'b64_sha1': SHA1.b64_sha1, diff --git a/src/wrapper-no-deps.js b/src/wrapper-no-deps.js index 912a9119d..500c5012e 100644 --- a/src/wrapper-no-deps.js +++ b/src/wrapper-no-deps.js @@ -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('awesomplete', [], function () { return jQuery; }); define('lodash', [], function () { return _; }); @@ -11,7 +11,6 @@ define('strophe', [], function () { '$msg': $msg, '$pres': $pres, 'SHA1': SHA1, - 'Base64': Base64, 'MD5': MD5, 'b64_hmac_sha1': SHA1.b64_hmac_sha1, 'b64_sha1': SHA1.b64_sha1,