Commit 6c10d2b7 authored by JC Brand's avatar JC Brand

Remove strophe.muc.js completely. closes #307

parent df724788
...@@ -175,6 +175,11 @@ ...@@ -175,6 +175,11 @@
// Add Strophe Namespaces // Add Strophe Namespaces
Strophe.addNamespace('CHATSTATES', 'http://jabber.org/protocol/chatstates'); Strophe.addNamespace('CHATSTATES', 'http://jabber.org/protocol/chatstates');
Strophe.addNamespace('MUC_ADMIN', Strophe.NS.MUC + "#admin");
Strophe.addNamespace('MUC_OWNER', Strophe.NS.MUC + "#owner");
Strophe.addNamespace('MUC_REGISTER', "jabber:iq:register");
Strophe.addNamespace('MUC_ROOMCONF', Strophe.NS.MUC + "#roomconfig");
Strophe.addNamespace('MUC_USER', Strophe.NS.MUC + "#user");
Strophe.addNamespace('REGISTER', 'jabber:iq:register'); Strophe.addNamespace('REGISTER', 'jabber:iq:register');
Strophe.addNamespace('XFORM', 'jabber:x:data'); Strophe.addNamespace('XFORM', 'jabber:x:data');
...@@ -2427,7 +2432,7 @@ ...@@ -2427,7 +2432,7 @@
createChatRoomMessage: function (text) { createChatRoomMessage: function (text) {
var msgid = converse.connection.getUniqueId(); var msgid = converse.connection.getUniqueId();
var msg = $msg({ var msg = $msg({
to: this.getRoomJIDAndNick(), to: this.model.get('jid'),
from: converse.connection.jid, from: converse.connection.jid,
type: 'groupchat', type: 'groupchat',
id: msgid id: msgid
......
...@@ -36,7 +36,6 @@ require.config({ ...@@ -36,7 +36,6 @@ require.config({
"strophe-websocket": "components/strophejs/src/websocket", "strophe-websocket": "components/strophejs/src/websocket",
"strophe-polyfill": "components/strophejs/src/polyfills", "strophe-polyfill": "components/strophejs/src/polyfills",
"strophe.disco": "components/strophejs-plugins/disco/strophe.disco", "strophe.disco": "components/strophejs-plugins/disco/strophe.disco",
"strophe.muc": "src/strophe.muc",
"strophe.roster": "src/strophe.roster", "strophe.roster": "src/strophe.roster",
"strophe.vcard": "src/strophe.vcard", "strophe.vcard": "src/strophe.vcard",
"text": 'components/requirejs-text/text', "text": 'components/requirejs-text/text',
...@@ -169,7 +168,6 @@ require.config({ ...@@ -169,7 +168,6 @@ require.config({
'crypto.sha256': { deps: ['crypto.core'] }, 'crypto.sha256': { deps: ['crypto.core'] },
'bigint': { deps: ['crypto'] }, 'bigint': { deps: ['crypto'] },
'strophe.disco': { deps: ['strophe'] }, 'strophe.disco': { deps: ['strophe'] },
'strophe.muc': { deps: ['strophe'] },
'strophe.register': { deps: ['strophe'] }, 'strophe.register': { deps: ['strophe'] },
'strophe.roster': { deps: ['strophe'] }, 'strophe.roster': { deps: ['strophe'] },
'strophe.vcard': { deps: ['strophe'] } 'strophe.vcard': { deps: ['strophe'] }
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
<script type="text/javascript" src="src/otr.js"></script> <script type="text/javascript" src="src/otr.js"></script>
<script type="text/javascript" src="components/strophe/strophe.min.js"></script> <script type="text/javascript" src="components/strophe/strophe.min.js"></script>
<script type="text/javascript" src="src/strophe.roster.js"></script> <script type="text/javascript" src="src/strophe.roster.js"></script>
<script type="text/javascript" src="components/strophe.muc/index.js"></script>
<script type="text/javascript" src="components/strophejs-plugins/vcard/strophe.vcard.js"></script> <script type="text/javascript" src="components/strophejs-plugins/vcard/strophe.vcard.js"></script>
<script type="text/javascript" src="components/strophejs-plugins/disco/strophe.disco.js"></script> <script type="text/javascript" src="components/strophejs-plugins/disco/strophe.disco.js"></script>
<script type="text/javascript" src="components/underscore/underscore.js"></script> <script type="text/javascript" src="components/underscore/underscore.js"></script>
......
...@@ -8,7 +8,6 @@ define("converse-dependencies", [ ...@@ -8,7 +8,6 @@ define("converse-dependencies", [
"jquery.browser", "jquery.browser",
"typeahead", "typeahead",
"strophe", "strophe",
"strophe.muc",
"strophe.roster", "strophe.roster",
"strophe.vcard", "strophe.vcard",
"strophe.disco" "strophe.disco"
......
...@@ -7,7 +7,6 @@ define("converse-dependencies", [ ...@@ -7,7 +7,6 @@ define("converse-dependencies", [
"jquery.browser", "jquery.browser",
"typeahead", "typeahead",
"strophe", "strophe",
"strophe.muc",
"strophe.roster", "strophe.roster",
"strophe.vcard", "strophe.vcard",
"strophe.disco" "strophe.disco"
......
...@@ -9,7 +9,6 @@ define("converse-dependencies", [ ...@@ -9,7 +9,6 @@ define("converse-dependencies", [
"jquery.easing", // XXX: Can be removed, only for https://conversejs.org "jquery.easing", // XXX: Can be removed, only for https://conversejs.org
"typeahead", "typeahead",
"strophe", "strophe",
"strophe.muc",
"strophe.roster", "strophe.roster",
"strophe.vcard", "strophe.vcard",
"strophe.disco" "strophe.disco"
......
...@@ -5,7 +5,6 @@ define("converse-dependencies", [ ...@@ -5,7 +5,6 @@ define("converse-dependencies", [
"otr", "otr",
"moment", "moment",
"strophe", "strophe",
"strophe.muc",
"strophe.roster", "strophe.roster",
"strophe.vcard", "strophe.vcard",
"strophe.disco", "strophe.disco",
......
This diff is collapsed.
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