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

pull/470/head
damencho 9 years ago
commit 66212862ce
  1. 9
      conference.js
  2. 27593
      libs/lib-jitsi-meet.js
  3. 2
      modules/UI/side_pannels/chat/Commands.js
  4. 3
      service/UI/UIEvents.js

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

File diff suppressed because it is too large Load Diff

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

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

Loading…
Cancel
Save