Merge pull request #87 from QuickBlox/develop.webrtc.bug_fixing.07122015

bug fixing from 07122015

Author: Igor Khomenko

js/modules/webrtc/qbWebRTCSession.js

@@ -251,7 +251,7 @@ WebRTCSession.prototype.accept = function(extension) {
     oppIDs.forEach(function(opID, i, arr) {
       if(self.currentUserID > opID){
         // call to the user
-        self._callInternal(opID, {}, false);
+        self._callInternal(opID, {}, true);
       }
     });
   }

js/modules/webrtc/qbWebRTCSignalingProcessor.js

@@ -113,9 +113,18 @@ function WebRTCSignalingProcessor(service, delegate, connection) {
 
       } else {
         if (extraParams.childNodes[i].childNodes.length > 1) {
-
-          extension = self._XMLtoJS(extension, extraParams.childNodes[i].tagName, extraParams.childNodes[i]);
-
+          var nodeTextContentSize = extraParams.childNodes[i].textContent.length;
+
+          if (nodeTextContentSize > 4096) {
+            var wholeNodeContent = "";
+            
+            for(var t=0; t<extraParams.childNodes[i].childNodes.length; ++t){
+              wholeNodeContent += extraParams.childNodes[i].childNodes[t].textContent;
+            }
+            extension[extraParams.childNodes[i].tagName] = wholeNodeContent;
+          }else {
+            extension = self._XMLtoJS(extension, extraParams.childNodes[i].tagName, extraParams.childNodes[i]);
+          }
         } else {
 
           extension[extraParams.childNodes[i].tagName] = extraParams.childNodes[i].textContent;

quickblox.min.js

@@ -101,11 +101,10 @@
                         }
                     }
                 },
+                classesNameFilter: 'no aden reyes perpetua inkwell toaster walden hudson gingham mayfair lofi xpro2 _1977 brooklyn',
                 changeFilter: function(selector, filterName) {
-                    var classesNameAll = 'no aden reyes perpetua inkwell toaster walden hudson gingham mayfair lofi xpro2 _1977 brooklyn';
-                   
                     $(selector)
-                        .removeClass(classesNameAll)
+                        .removeClass(this.classesNameFilter)
                         .addClass( filterName );
                 },
                 callTime: 0,
@@ -372,18 +371,29 @@
         /** set main video */
         $(document).on('click', '.j-callees__callee_video', function() {
             var $that = $(this),
-                userID = +($(this).data('user'));
+                userID = +($(this).data('user')),
+                classesName = [],
+                activeClass = [];
 
             if( app.currentSession.peerConnections[userID].stream ) {
                 if( $that.hasClass('active') ) {
                     $that.removeClass('active');
 
                     app.currentSession.detachMediaStream('main_video');
+                    ui.changeFilter('#main_video', 'no');
                     app.mainVideo = 0;
                 } else {
                     $('.j-callees__callee_video').removeClass('active');
                     $that.addClass('active');
 
+                    ui.changeFilter('#main_video', 'no');
+
+                    activeClass = _.intersection($that.attr('class').split(/\s+/), ui.classesNameFilter.split(/\s+/) );
+
+                    /** set filter to main video if exist */
+                    if(activeClass.length) {
+                        ui.changeFilter('#main_video', activeClass[0]);
+                    }
                     app.currentSession.attachMediaStream('main_video', app.currentSession.peerConnections[userID].stream);
                     app.mainVideo = userID;
                 }
@@ -605,7 +615,7 @@
 
                 if(connectionState === QB.webrtc.SessionConnectionState.DISCONNECTED){
                     ui.toggleRemoteVideoView(userID, 'hide');
-                    $calleeStatus.text('Hung Up');
+                    $calleeStatus.text('disconnected');
                 }
 
                 if(connectionState === QB.webrtc.SessionConnectionState.CLOSED){