Przeglądaj źródła

Uses SDPUtil filter special characters method through xmpp interface instead of importing it directly.

j8
paweldomas 9 lat temu
rodzic
commit
59b26fdf07
2 zmienionych plików z 8 dodań i 5 usunięć
  1. 4
    5
      modules/RTC/RTCUtils.js
  2. 4
    0
      modules/xmpp/xmpp.js

+ 4
- 5
modules/RTC/RTCUtils.js Wyświetl plik

1
-/* global config, require, attachMediaStream, getUserMedia */
1
+/* global APP, config, require, attachMediaStream, getUserMedia */
2
 var RTCBrowserType = require("./RTCBrowserType");
2
 var RTCBrowserType = require("./RTCBrowserType");
3
 var Resolutions = require("../../service/RTC/Resolutions");
3
 var Resolutions = require("../../service/RTC/Resolutions");
4
 var AdapterJS = require("./adapter.screenshare");
4
 var AdapterJS = require("./adapter.screenshare");
5
-var SDPUtil = require("../xmpp/SDPUtil");
6
 
5
 
7
 var currentResolution = null;
6
 var currentResolution = null;
8
 
7
 
176
                     }
175
                     }
177
                     id = tracks[0].id;
176
                     id = tracks[0].id;
178
                 }
177
                 }
179
-                return SDPUtil.filter_special_chars(id);
178
+                return APP.xmpp.filter_special_chars(id);
180
             };
179
             };
181
             this.getVideoSrc = function (element) {
180
             this.getVideoSrc = function (element) {
182
                 if(!element)
181
                 if(!element)
205
         this.getStreamID = function (stream) {
204
         this.getStreamID = function (stream) {
206
             // streams from FF endpoints have the characters '{' and '}'
205
             // streams from FF endpoints have the characters '{' and '}'
207
             // that make jQuery choke.
206
             // that make jQuery choke.
208
-            return SDPUtil.filter_special_chars(stream.id);
207
+            return APP.xmpp.filter_special_chars(stream.id);
209
         };
208
         };
210
         this.getVideoSrc = function (element) {
209
         this.getVideoSrc = function (element) {
211
             if(!element)
210
             if(!element)
251
                 attachMediaStream(elSel[0], stream);
250
                 attachMediaStream(elSel[0], stream);
252
             };
251
             };
253
             self.getStreamID = function (stream) {
252
             self.getStreamID = function (stream) {
254
-                var id = SDPUtil.filter_special_chars(stream.label);
253
+                var id = APP.xmpp.filter_special_chars(stream.label);
255
                 return id;
254
                 return id;
256
             };
255
             };
257
             self.getVideoSrc = function (element) {
256
             self.getVideoSrc = function (element) {

+ 4
- 0
modules/xmpp/xmpp.js Wyświetl plik

3
 var EventEmitter = require("events");
3
 var EventEmitter = require("events");
4
 var Recording = require("./recording");
4
 var Recording = require("./recording");
5
 var SDP = require("./SDP");
5
 var SDP = require("./SDP");
6
+var SDPUtil = require("./SDPUtil");
6
 var Settings = require("../settings/Settings");
7
 var Settings = require("../settings/Settings");
7
 var Pako = require("pako");
8
 var Pako = require("pako");
8
 var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
9
 var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
578
         if (!this.isConferenceInProgress())
579
         if (!this.isConferenceInProgress())
579
             return;
580
             return;
580
         connection.jingle.activecall.peerconnection.removeStream(stream);
581
         connection.jingle.activecall.peerconnection.removeStream(stream);
582
+    },
583
+    filter_special_chars: function (text) {
584
+        return SDPUtil.filter_special_chars(text);
581
     }
585
     }
582
 };
586
 };
583
 
587
 

Ładowanie…
Anuluj
Zapisz