muc: Show room domain in header.
Also make sure room name gets saved once it's been updated.
This commit is contained in:
parent
49dd36dd6c
commit
496d2521fc
|
@ -21,6 +21,10 @@
|
||||||
instead of jQuery's Deferred. [jcbrand]
|
instead of jQuery's Deferred. [jcbrand]
|
||||||
- #866 Add babel in order to support ES2015 syntax [jcbrand]
|
- #866 Add babel in order to support ES2015 syntax [jcbrand]
|
||||||
|
|
||||||
|
#### Bugfixes:
|
||||||
|
|
||||||
|
- Room name wasn't being updated after changing it in the configuration form. [jcbrand]
|
||||||
|
|
||||||
## 3.1.1 (2017-07-12)
|
## 3.1.1 (2017-07-12)
|
||||||
|
|
||||||
- Use a patched version of [awesomplete](https://github.com/LeaVerou/awesomplete)
|
- Use a patched version of [awesomplete](https://github.com/LeaVerou/awesomplete)
|
||||||
|
|
|
@ -1522,10 +1522,11 @@
|
||||||
#converse-embedded-chat .chatbox .chat-title,
|
#converse-embedded-chat .chatbox .chat-title,
|
||||||
#conversejs .chatbox .chat-title {
|
#conversejs .chatbox .chat-title {
|
||||||
color: white;
|
color: white;
|
||||||
line-height: 15px;
|
|
||||||
display: block;
|
display: block;
|
||||||
|
line-height: 15px;
|
||||||
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
overflow: hidden; }
|
white-space: nowrap; }
|
||||||
#converse-embedded-chat .chatbox .chat-title a,
|
#converse-embedded-chat .chatbox .chat-title a,
|
||||||
#conversejs .chatbox .chat-title a {
|
#conversejs .chatbox .chat-title a {
|
||||||
color: white;
|
color: white;
|
||||||
|
@ -2402,8 +2403,14 @@
|
||||||
#conversejs .chat-head-chatroom .chatbox-btn.button-on {
|
#conversejs .chat-head-chatroom .chatbox-btn.button-on {
|
||||||
background-color: white;
|
background-color: white;
|
||||||
color: #E77051; }
|
color: #E77051; }
|
||||||
#converse-embedded-chat .chat-head-chatroom .chatroom-description,
|
#converse-embedded-chat .chat-head-chatroom .chat-title,
|
||||||
#conversejs .chat-head-chatroom .chatroom-description {
|
#conversejs .chat-head-chatroom .chat-title {
|
||||||
|
color: #FF977C; }
|
||||||
|
#converse-embedded-chat .chat-head-chatroom .chat-title .chatroom-name,
|
||||||
|
#conversejs .chat-head-chatroom .chat-title .chatroom-name {
|
||||||
|
color: white; }
|
||||||
|
#converse-embedded-chat .chat-head-chatroom .chat-title .chatroom-description,
|
||||||
|
#conversejs .chat-head-chatroom .chat-title .chatroom-description {
|
||||||
color: white;
|
color: white;
|
||||||
font-size: 80%;
|
font-size: 80%;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
|
|
|
@ -1568,10 +1568,11 @@ body {
|
||||||
#converse-embedded-chat .chatbox .chat-title,
|
#converse-embedded-chat .chatbox .chat-title,
|
||||||
#conversejs .chatbox .chat-title {
|
#conversejs .chatbox .chat-title {
|
||||||
color: white;
|
color: white;
|
||||||
line-height: 15px;
|
|
||||||
display: block;
|
display: block;
|
||||||
|
line-height: 15px;
|
||||||
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
overflow: hidden; }
|
white-space: nowrap; }
|
||||||
#converse-embedded-chat .chatbox .chat-title a,
|
#converse-embedded-chat .chatbox .chat-title a,
|
||||||
#conversejs .chatbox .chat-title a {
|
#conversejs .chatbox .chat-title a {
|
||||||
color: white;
|
color: white;
|
||||||
|
@ -2518,8 +2519,14 @@ body {
|
||||||
#conversejs .chat-head-chatroom .chatbox-btn.button-on {
|
#conversejs .chat-head-chatroom .chatbox-btn.button-on {
|
||||||
background-color: white;
|
background-color: white;
|
||||||
color: #E77051; }
|
color: #E77051; }
|
||||||
#converse-embedded-chat .chat-head-chatroom .chatroom-description,
|
#converse-embedded-chat .chat-head-chatroom .chat-title,
|
||||||
#conversejs .chat-head-chatroom .chatroom-description {
|
#conversejs .chat-head-chatroom .chat-title {
|
||||||
|
color: #FF977C; }
|
||||||
|
#converse-embedded-chat .chat-head-chatroom .chat-title .chatroom-name,
|
||||||
|
#conversejs .chat-head-chatroom .chat-title .chatroom-name {
|
||||||
|
color: white; }
|
||||||
|
#converse-embedded-chat .chat-head-chatroom .chat-title .chatroom-description,
|
||||||
|
#conversejs .chat-head-chatroom .chat-title .chatroom-description {
|
||||||
color: white;
|
color: white;
|
||||||
font-size: 80%;
|
font-size: 80%;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
|
|
|
@ -100,10 +100,11 @@
|
||||||
}
|
}
|
||||||
.chat-title {
|
.chat-title {
|
||||||
color: $chat-head-text-color;
|
color: $chat-head-text-color;
|
||||||
line-height: 15px;
|
|
||||||
display: block;
|
display: block;
|
||||||
text-overflow: ellipsis;
|
line-height: 15px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
a {
|
a {
|
||||||
color: $chat-head-text-color;
|
color: $chat-head-text-color;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
|
@ -19,7 +19,11 @@
|
||||||
color: $chatroom-head-color;
|
color: $chatroom-head-color;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.chat-title {
|
||||||
|
color: $chatroom-color-lightest;
|
||||||
|
.chatroom-name {
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
.chatroom-description {
|
.chatroom-description {
|
||||||
color: white;
|
color: white;
|
||||||
font-size: 80%;
|
font-size: 80%;
|
||||||
|
@ -32,6 +36,7 @@
|
||||||
margin-top: 0.3em;
|
margin-top: 0.3em;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.chatroom {
|
.chatroom {
|
||||||
width: $chatroom-width;
|
width: $chatroom-width;
|
||||||
|
|
|
@ -120,6 +120,7 @@ $font-path: "../fonticons/fonts/" !default;
|
||||||
$chatroom-width: 300px !default;
|
$chatroom-width: 300px !default;
|
||||||
$chatroom-head-color: $red !default;
|
$chatroom-head-color: $red !default;
|
||||||
$chatroom-color-light: $light-red !default;
|
$chatroom-color-light: $light-red !default;
|
||||||
|
$chatroom-color-lightest: $light-red !default;
|
||||||
$chatroom-color-dark: $darkest-red !default;
|
$chatroom-color-dark: $darkest-red !default;
|
||||||
$chatroom-message-them-color: $green !default;
|
$chatroom-message-them-color: $green !default;
|
||||||
$chatroom-toolbar-color: $reddish-white !default;
|
$chatroom-toolbar-color: $reddish-white !default;
|
||||||
|
|
|
@ -125,6 +125,7 @@ $chatroom-head-height: 62px !default;
|
||||||
$chatroom-width: 300px !default;
|
$chatroom-width: 300px !default;
|
||||||
$chatroom-head-color: $red !default;
|
$chatroom-head-color: $red !default;
|
||||||
$chatroom-color-light: $light-red !default;
|
$chatroom-color-light: $light-red !default;
|
||||||
|
$chatroom-color-lightest: $light-red !default;
|
||||||
$chatroom-color-dark: $darkest-red !default;
|
$chatroom-color-dark: $darkest-red !default;
|
||||||
$chatroom-message-them-color: $green !default;
|
$chatroom-message-them-color: $green !default;
|
||||||
$chatroom-toolbar-color: $reddish-white !default;
|
$chatroom-toolbar-color: $reddish-white !default;
|
||||||
|
|
|
@ -342,7 +342,15 @@
|
||||||
* are correct, for example that the "type" is set to
|
* are correct, for example that the "type" is set to
|
||||||
* "chatroom".
|
* "chatroom".
|
||||||
*/
|
*/
|
||||||
settings = _.assign({'type': CHATROOMS_TYPE}, settings);
|
settings = _.assign({
|
||||||
|
'name': Strophe.unescapeNode(
|
||||||
|
Strophe.getNodeFromJid(settings.jid)
|
||||||
|
),
|
||||||
|
'domain': Strophe.getDomainFromJid(settings.jid),
|
||||||
|
'type': CHATROOMS_TYPE,
|
||||||
|
}, settings);
|
||||||
|
|
||||||
|
|
||||||
return _converse.chatboxviews.showChat(settings);
|
return _converse.chatboxviews.showChat(settings);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1284,7 +1292,9 @@
|
||||||
});
|
});
|
||||||
$form.on('submit', (ev) => {
|
$form.on('submit', (ev) => {
|
||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
this.saveConfiguration(ev.target);
|
this.saveConfiguration(ev.target).then(
|
||||||
|
this.getRoomFeatures.bind(this)
|
||||||
|
);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -1434,8 +1444,9 @@
|
||||||
* <feature var='urn:xmpp:mam:0'/>
|
* <feature var='urn:xmpp:mam:0'/>
|
||||||
*/
|
*/
|
||||||
const features = {
|
const features = {
|
||||||
'features_fetched': true
|
'features_fetched': true,
|
||||||
};
|
'name': iq.querySelector('identity').getAttribute('name')
|
||||||
|
}
|
||||||
_.each(iq.querySelectorAll('feature'), function (field) {
|
_.each(iq.querySelectorAll('feature'), function (field) {
|
||||||
const fieldname = field.getAttribute('var');
|
const fieldname = field.getAttribute('var');
|
||||||
if (!fieldname.startsWith('muc_')) {
|
if (!fieldname.startsWith('muc_')) {
|
||||||
|
@ -2623,8 +2634,6 @@
|
||||||
const chatroom = _converse.openChatRoom({
|
const chatroom = _converse.openChatRoom({
|
||||||
'id': room_jid,
|
'id': room_jid,
|
||||||
'jid': room_jid,
|
'jid': room_jid,
|
||||||
'name': Strophe.unescapeNode(Strophe.getNodeFromJid(room_jid)),
|
|
||||||
'type': CHATROOMS_TYPE,
|
|
||||||
'box_id': b64_sha1(room_jid),
|
'box_id': b64_sha1(room_jid),
|
||||||
'password': $x.attr('password')
|
'password': $x.attr('password')
|
||||||
});
|
});
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
<a class="chatbox-btn configure-chatroom-button icon-wrench" title="{{{info_configure}}} "></a>
|
<a class="chatbox-btn configure-chatroom-button icon-wrench" title="{{{info_configure}}} "></a>
|
||||||
{[ } ]}
|
{[ } ]}
|
||||||
<div class="chat-title" title="{{{jid}}}">
|
<div class="chat-title" title="{{{jid}}}">
|
||||||
{{{ name }}}
|
<span class="chatroom-name">{{{ name }}}</span>@{{{ domain }}}
|
||||||
<p class="chatroom-description">{{{ description }}}<p/>
|
<p class="chatroom-description">{{{ description }}}<p/>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user