fixed bug with spinner loading not updating dynamic url changes

3 files changed, 10 insertions, 11 deletions

diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 6ae99aee..055dc0d7 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -11,16 +11,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     // Controller main
     //---------------------------------------------------------------------
 
-   /* console.log ("IMAGES***************");
-    var fooImages = [
-                        {src:'http://www.pbase.com/arjunrc/image/160698184.jpg'},
-                        {src:'http://www.pbase.com/arjunrc/image/160697822.jpg'},
-                        {src:'http://www.pbase.com/arjunrc/image/160697821.jpg'},
-                        {src:'http://www.pbase.com/arjunrc/image/160697740.jpg'}
-    ];
 
-    $scope.fl = fooImages.length;
-    $scope.fooImages = fooImages;*/
 
     document.addEventListener("pause", onPause, false);
 
@@ -176,6 +167,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     this.loadNotifications = function () {
         // randomval is appended to img src, so after each interval the image reloads
         $scope.randomval = (new Date()).getTime();
+       // console.log ("New " + $scope.randomval);
     };
 
     var intervalHandle = $interval(function () {
diff --git a/www/js/app.js b/www/js/app.js
index fdd1549c..67844045 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -89,6 +89,12 @@ angular.module('zmApp', [
                     $element.after(loader);
                 }
                             loadImage();
+                $attributes.$observe('imageSpinnerSrc', function(value){
+                    //console.log ("SOURCE CHANGED");
+                     loadImage();
+                 //deregistration();
+
+                });
 
                 function loadImage() {
                     $element.bind("load", function (e) {
diff --git a/www/templates/montage.html b/www/templates/montage.html
index a8818478..f5d50537 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -41,13 +41,14 @@
                         {{monitor.Monitor.Name}}&nbsp;</header>
                 </span>
                 <article class="main">
+                    <!-- back to ng-src. spinner was not updating when rand changes-->
                     <!-- FIXME: Scale is 50% hardcoded -->
                     <img image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{randomval}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;"
                          ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId)"
                          on-hold="onHold($index)"
                          on-release="onRelease($index)"
-                         style="display:block;"
-                         image-spinner-loader="lines"/>
+                         style="display:block;"  image-spinner-loader="lines"
+                         />
                 </article>
             </span>
         </div>