#126 and #155 - I think I finally got it this time

Former-commit-id: 85587badc26f74e31a1a458ca3bdb3fff016968f

3 files changed, 50 insertions, 9 deletions

diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js
index e6d9bbab..166142f1 100644
--- a/www/js/ModalCtrl.js
+++ b/www/js/ModalCtrl.js
@@ -988,12 +988,22 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco
         console.log("**VIEW ** ModalCtrl left");
         
         
-        ZMDataModel.zmLog ("ModalCtrl:Stopping network pull...");
+        //ZMDataModel.zmLog ("ModalCtrl:Nullifying images..."");
         // make sure this is applied in scope digest to stop network pull
         // thats why we are doing it beforeLeave
         
-        window.stop();
+        //window.stop();
+         ZMDataModel.zmLog ("Nullifying the streams...");
         
+        
+        var element = document.getElementById("singlemonitor");
+        if (element)
+        {
+            ZMDataModel.zmDebug("Nullifying  " + element.src);
+            element.src="";
+        }
+            
+   
       
     });
 
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 2fd5b7de..31a932c9 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -84,7 +84,22 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     function footerCollapse()
     {
         
-        window.stop(); // force it here - connkey changes - FIXME: investigate why
+        //window.stop(); // force it here - connkey changes - FIXME: investigate why
+        
+        ZMDataModel.zmLog ("Nullifying the streams...");
+        
+        for (i=0; i< $scope.MontageMonitors.length; i++)
+        {
+            var element = document.getElementById("img-"+i);
+            if (element)
+            {
+                ZMDataModel.zmDebug("Nullifying  " + element.src);
+                element.src="";
+            }
+            
+        }
+        
+        
         $scope.sliderVal.realRate = $scope.sliderVal.rate *100;
         ZMDataModel.zmDebug ("Playback rate is:"  + $scope.sliderVal.realRate);
         
@@ -1326,8 +1341,21 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
             }
         }   
         
-        ZMDataModel.zmLog ("Forcing a window.stop() here");
-        window.stop();
+        /*ZMDataModel.zmLog ("Forcing a window.stop() here");
+        window.stop();*/
+        
+        ZMDataModel.zmLog ("Nullifying the streams...");
+        
+        for (i=0; i< $scope.MontageMonitors.length; i++)
+        {
+            var element = document.getElementById("img-"+i);
+            if (element)
+            {
+                ZMDataModel.zmDebug("Nullifying  " + element.src);
+                element.src="";
+            }
+            
+        }
         
         
     });
diff --git a/www/js/app.js b/www/js/app.js
index d847eac9..77bf4d48 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -686,13 +686,16 @@ angular.module('zmApp', [
                 return (d.promise);
 
             })
-            .error(function (error) {
+            .error(function (error, status) {
                 $ionicLoading.hide();
-                $rootScope.loggedIntoZm = -1;
+                
                 //console.log("**** ZM Login FAILED");
-                ZMDataModel.zmLog("zmAutologin Error " + JSON.stringify(error),
-                    "error, but not calling auth-error emit");
+            
+                // FIXME: Is this sometimes results in null
+                
+                ZMDataModel.zmLog("zmAutologin Error " + JSON.stringify(error) +  " and status " + status);
                 // bad urls etc come here
+                $rootScope.loggedIntoZm = -1;    
                 $rootScope.$emit('auth-error', error);
 
                 d.reject("Login Error");