diff --git a/modules/RTC/RTCUtils.js b/modules/RTC/RTCUtils.js index cd6ad3622..a965d61e6 100644 --- a/modules/RTC/RTCUtils.js +++ b/modules/RTC/RTCUtils.js @@ -1,8 +1,7 @@ -/* global config, require, attachMediaStream, getUserMedia */ +/* global APP, config, require, attachMediaStream, getUserMedia */ var RTCBrowserType = require("./RTCBrowserType"); var Resolutions = require("../../service/RTC/Resolutions"); var AdapterJS = require("./adapter.screenshare"); -var SDPUtil = require("../xmpp/SDPUtil"); var currentResolution = null; @@ -176,7 +175,7 @@ function RTCUtils(RTCService, onTemasysPluginReady) } id = tracks[0].id; } - return SDPUtil.filter_special_chars(id); + return APP.xmpp.filter_special_chars(id); }; this.getVideoSrc = function (element) { if(!element) @@ -205,7 +204,7 @@ function RTCUtils(RTCService, onTemasysPluginReady) this.getStreamID = function (stream) { // streams from FF endpoints have the characters '{' and '}' // that make jQuery choke. - return SDPUtil.filter_special_chars(stream.id); + return APP.xmpp.filter_special_chars(stream.id); }; this.getVideoSrc = function (element) { if(!element) @@ -251,7 +250,7 @@ function RTCUtils(RTCService, onTemasysPluginReady) attachMediaStream(elSel[0], stream); }; self.getStreamID = function (stream) { - var id = SDPUtil.filter_special_chars(stream.label); + var id = APP.xmpp.filter_special_chars(stream.label); return id; }; self.getVideoSrc = function (element) { diff --git a/modules/xmpp/xmpp.js b/modules/xmpp/xmpp.js index af9ea708f..47a4f042b 100644 --- a/modules/xmpp/xmpp.js +++ b/modules/xmpp/xmpp.js @@ -3,6 +3,7 @@ var Moderator = require("./moderator"); var EventEmitter = require("events"); var Recording = require("./recording"); var SDP = require("./SDP"); +var SDPUtil = require("./SDPUtil"); var Settings = require("../settings/Settings"); var Pako = require("pako"); var StreamEventTypes = require("../../service/RTC/StreamEventTypes"); @@ -578,6 +579,9 @@ var XMPP = { if (!this.isConferenceInProgress()) return; connection.jingle.activecall.peerconnection.removeStream(stream); + }, + filter_special_chars: function (text) { + return SDPUtil.filter_special_chars(text); } };