nits

Former-commit-id: 8ba60cf9cc46727dbe207bd163eec53a2c30547c

3 files changed, 21 insertions, 3 deletions

diff --git a/www/js/HelpCtrl.js b/www/js/HelpCtrl.js
index b7cad31a..85a7e45e 100644
--- a/www/js/HelpCtrl.js
+++ b/www/js/HelpCtrl.js
@@ -1,6 +1,6 @@
 /* jshint -W041 */
 /* jslint browser: true*/
-/* global cordova,StatusBar,angular,console */
+/* global cordova,StatusBar,angular,console, Masonry */
 
 angular.module('zmApp.controllers').controller('zmApp.HelpCtrl', ['$scope', '$rootScope', '$ionicModal', 'ZMDataModel','$ionicSideMenuDelegate', '$ionicHistory', '$state', function ($scope, $rootScope, $ionicModal, ZMDataModel,$ionicSideMenuDelegate, $ionicHistory, $state) {
 $scope.openMenu = function () {
@@ -34,6 +34,8 @@ $scope.openMenu = function () {
         console.log("**VIEW ** Help Ctrl Entered");
         ZMDataModel.setAwake(false);
 
+        
+
     });
 
 }]);
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 31a932c9..11f47063 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -396,7 +396,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                                         $scope.MontageMonitors[ndx].eventUrlTime=data.event.Event.StartTime;
                                         
                                         $scope.MontageMonitors[ndx].eventUrl=ld.streamingurl+"/nph-zms?source=event&mode=jpeg&event="+data.event.Event.Id+"&frame=1&replay="+($scope.sliderVal.enableGapless?"gapless":"single");
-                                    },300);
+                                    },700);
                                
                         }
                         
diff --git a/www/js/app.js b/www/js/app.js
index 6f9f7e34..216441d9 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -334,6 +334,12 @@ angular.module('zmApp', [
             if (zmCookie) {
                 config.headers.Cookie = "ZMSESSID=" + zmCookie;
             }
+            
+            else
+            {
+              //  console.log ("No cookie present in " + config.url);
+            }
+            
             if ((config.url.indexOf("/api/states/change/") > -1) ||
                 (config.url.indexOf("getDiskPercent.json") > -1) ||
                 (config.url.indexOf("daemonCheck.json") > -1) ||
@@ -358,7 +364,8 @@ angular.module('zmApp', [
 
                 if (zmSess) {
                     if (zmSess[1]) {
-
+                            
+                       // console.log ("***** SETTING COOKIE TO "  + zmCookie);
                         zmCookie = zmSess[1];
                     }
                 }
@@ -596,13 +603,20 @@ angular.module('zmApp', [
                         title: 'reCaptcha enabled',
                         template: 'Looks like you have enabled reCaptcha. It needs to be turned off for zmNinja to work'
                     });
+                    
+                    
 
                     // close it after 5 seconds
                     $timeout(function () {
 
                         alertPopup.close();
                     }, 5000);
+                    
+                    d.reject ("Error-disable recaptcha");
+                return (d.promise);
                 }
+            
+                
 
             });
 
@@ -662,9 +676,11 @@ angular.module('zmApp', [
                     $rootScope.$emit('auth-error', "incorrect credentials");
 
                     d.reject("Login Error");
+                    return (d.promise);
                 }
 
                 // Now go ahead and re-get auth key 
+                // if login was a success
                 $rootScope.authSession = "undefined";
                 var ld = ZMDataModel.getLogin();
                 ZMDataModel.getAuthKey($rootScope.validMonitorId)