Jelajahi Sumber

WIP: Initial work on creating MUC with name

Updates #2765
JC Brand 3 tahun lalu
induk
melakukan
d1983c9a53

+ 6 - 9
src/plugins/muc-views/modals/add-muc.js

@@ -24,17 +24,8 @@ export default BootstrapModal.extend({
     },
 
     toHTML () {
-        let placeholder = '';
-        if (!api.settings.get('locked_muc_domain')) {
-            const muc_domain = this.model.get('muc_domain') || api.settings.get('muc_domain');
-            placeholder = muc_domain ? `name@${muc_domain}` : __('name@conference.example.org');
-        }
         return tpl_add_muc(Object.assign(this.model.toJSON(), {
-            '_converse': _converse,
-            'label_room_address': api.settings.get('muc_domain') ? __('Groupchat name') :  __('Groupchat address'),
-            'chatroom_placeholder': placeholder,
             'muc_roomid_policy_error_msg': this.muc_roomid_policy_error_msg,
-            'muc_roomid_policy_hint': api.settings.get('muc_roomid_policy_hint')
         }));
     },
 
@@ -76,6 +67,12 @@ export default BootstrapModal.extend({
             jid = data.jid
             this.model.setDomain(jid);
         }
+
+        const roomconfig = {
+            'roomname': jid
+        }
+
+
         api.rooms.open(jid, Object.assign(data, {jid}), true);
         this.modal.hide();
         ev.target.reset();

+ 10 - 3
src/plugins/muc-views/templates/add-muc.js

@@ -19,6 +19,13 @@ const nickname_input = (o) => {
 
 
 export default (o) => {
+    let placeholder = '';
+    if (!api.settings.get('locked_muc_domain')) {
+        const muc_domain = this.model.get('muc_domain') || api.settings.get('muc_domain');
+        placeholder = muc_domain ? `name@${muc_domain}` : __('name@conference.example.org');
+    }
+    const muc_roomid_policy_hint = api.settings.get('muc_roomid_policy_hint');
+    const label_room_address = api.settings.get('muc_domain') ? __('Groupchat name') :  __('Groupchat address');
     const i18n_join = __('Join');
     const i18n_enter = __('Enter a new Groupchat');
     return html`
@@ -32,11 +39,11 @@ export default (o) => {
                     <span class="modal-alert"></span>
                     <form class="converse-form add-chatroom">
                         <div class="form-group">
-                            <label for="chatroom">${o.label_room_address}:</label>
+                            <label for="chatroom">${label_room_address}:</label>
                             ${ (o.muc_roomid_policy_error_msg) ? html`<label class="roomid-policy-error">${o.muc_roomid_policy_error_msg}</label>` : '' }
-                            <input type="text" required="required" name="chatroom" class="form-control roomjid-input" placeholder="${o.chatroom_placeholder}"/>
+                            <input type="text" required="required" name="chatroom" class="form-control roomjid-input" placeholder="${placeholder}"/>
                         </div>
-                        ${ o.muc_roomid_policy_hint ?  html`<div class="form-group">${unsafeHTML(DOMPurify.sanitize(o.muc_roomid_policy_hint, {'ALLOWED_TAGS': ['b', 'br', 'em']}))}</div>` : '' }
+                        ${ muc_roomid_policy_hint ?  html`<div class="form-group">${unsafeHTML(DOMPurify.sanitize(muc_roomid_policy_hint, {'ALLOWED_TAGS': ['b', 'br', 'em']}))}</div>` : '' }
                         ${ !api.settings.get('locked_muc_nickname') ? nickname_input(o) : '' }
                         <input type="submit" class="btn btn-primary" name="join" value="${i18n_join || ''}" ?disabled=${o.muc_roomid_policy_error_msg}>
                     </form>

+ 1 - 1
webpack.serve.js

@@ -1,8 +1,8 @@
 /* global module, __dirname */
 const HTMLWebpackPlugin = require('html-webpack-plugin');
 const common = require("./webpack.common.js");
-const { merge } = require("webpack-merge");
 const path = require("path");
+const { merge } = require("webpack-merge");
 
 module.exports = merge(common, {
     mode: "development",