haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'chat-subject-new' of https://github.com/isymchych/jitsi-meet into jitsi-meet-new

This commit is contained in:
damencho 2016-01-25 16:13:53 -06:00
parent e707eb9a79 d31aca4483
commit 66212862ce
4 changed files with 5512 additions and 5489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
conference.js
View File

@ -697,10 +697,11 @@ export default {
}); });
APP.UI.addListener(UIEvents.TOPIC_CHANGED, (topic) => { APP.UI.addListener(UIEvents.SUBJECT_CHANGED, (topic) => {
// FIXME handle topic change room.setSubject(topic);
// APP.xmpp.setSubject(topic); });
// on SUBJECT_CHANGED UI.setSubject(topic); room.on(ConferenceEvents.SUBJECT_CHANGED, function (subject) {
APP.UI.setSubject(subject);
}); });
APP.UI.addListener(UIEvents.USER_KICKED, (id) => { APP.UI.addListener(UIEvents.USER_KICKED, (id) => {

10981
libs/lib-jitsi-meet.js
View File

File diff suppressed because it is too large Load Diff

2
modules/UI/side_pannels/chat/Commands.js
View File

@ -32,7 +32,7 @@ function getCommand(message) {
*/ */
function processTopic(commandArguments, emitter) { function processTopic(commandArguments, emitter) {
var topic = UIUtil.escapeHtml(commandArguments); var topic = UIUtil.escapeHtml(commandArguments);
emitter.emit(UIEvents.TOPIC_CHANGED, topic); emitter.emit(UIEvents.SUBJECT_CHANGED, topic);
} }
/** /**

3
service/UI/UIEvents.js
View File

@ -40,5 +40,6 @@ export default {
HANGUP: "UI.hangup", HANGUP: "UI.hangup",
LOGOUT: "UI.logout", LOGOUT: "UI.logout",
RECORDING_TOGGLE: "UI.recording_toggle", RECORDING_TOGGLE: "UI.recording_toggle",
TOPIC_CHANGED: "UI.topic_changed" SIP_DIAL: "UI.sip_dial",
SUBEJCT_CHANGED: "UI.subject_changed"
}; };