Updated chrome versions

lynckia · Aug 7, 2013 · da3769b · da3769b
1 parent e90c61e
commit da3769b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/erizo_controller/erizoClient/src/Connection.js b/erizo_controller/erizoClient/src/Connection.js
@@ -16,8 +16,8 @@ Erizo.Connection = function (spec) {
     if (typeof module !== 'undefined' && module.exports) {
         L.Logger.error('Publish/subscribe video/audio streams not supported in erizofc yet');
         that = Erizo.FcStack(spec);
-    } else if (window.navigator.appVersion.match(/Chrome\/([\w\W]*?)\./)[1] === "26" ||
-               window.navigator.appVersion.match(/Chrome\/([\w\W]*?)\./)[1] === "27") {
+    } else if (window.navigator.appVersion.match(/Chrome\/([\w\W]*?)\./)[1] === "27" ||
+               window.navigator.appVersion.match(/Chrome\/([\w\W]*?)\./)[1] === "28") {
         // Google Chrome Stable.
         console.log("Stable!");
         that = Erizo.ChromeStableStack(spec);

diff --git a/erizo_controller/erizoClient/src/Stream.js b/erizo_controller/erizoClient/src/Stream.js
@@ -101,7 +101,7 @@ Erizo.Stream = function (spec) {
 
     that.show = function (elementID, options) {
         that.elementID = elementID;
-        if (that.hasVideo()) {
+        if (that.hasVideo() || this.hasScreen()) {
             // Draw on HTML
             if (elementID !== undefined) {
                 var player = new Erizo.VideoPlayer({id: that.getID(), stream: that, elementID: elementID, options: options});

diff --git a/erizo_controller/erizoController/erizoController.js b/erizo_controller/erizoController/erizoController.js
@@ -291,7 +291,7 @@ var listen = function () {
 
             sendMsgToRoom(socket.room, 'onRemoveStream', {id: streamId});
 
-            if (socket.room.streams[streamId].hasAudio() || socket.room.streams[streamId].hasVideo()) {
+            if (socket.room.streams[streamId].hasAudio() || socket.room.streams[streamId].hasVideo() || socket.room.streams[streamId].hasScreen()) {
                 socket.state = 'sleeping';
                 socket.room.webRtcController.removePublisher(streamId);
             }
@@ -315,7 +315,7 @@ var listen = function () {
 
             socket.room.streams[to].removeDataSubscriber(socket.id);
 
-            if (socket.room.streams[to].hasAudio() || socket.room.streams[to].hasVideo()) {
+            if (socket.room.streams[to].hasAudio() || socket.room.streams[to].hasVideo() || socket.room.streams[to].hasScreen()) {
                 socket.room.webRtcController.removeSubscriber(socket.id, to);
             }
 
@@ -350,7 +350,7 @@ var listen = function () {
                     if (socket.streams.hasOwnProperty(i)) {
                         id = socket.streams[i];
 
-                        if (socket.room.streams[id].hasAudio() || socket.room.streams[id].hasVideo()) {
+                        if (socket.room.streams[id].hasAudio() || socket.room.streams[id].hasVideo() || socket.room.streams[id].hasScreen()) {
                             socket.room.webRtcController.removeClient(socket.id, id);
                         }