diff options
| -rw-r--r-- | www/js/DataModel.js | 22 | ||||
| -rw-r--r-- | www/js/LoginCtrl.js | 5 |
2 files changed, 21 insertions, 6 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 66c0c1a5..555433c0 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -60,7 +60,7 @@ angular.module('zmApp.controllers') 'montageHiddenOrder':'', 'montageArraySize':'0', - 'graphSize':200, + 'graphSize':2000, 'minAlarmCount':'1', 'montageSize':'3', 'useNphZms':true, @@ -216,6 +216,26 @@ angular.module('zmApp.controllers') serverGroupList = $localstorage.getObject("serverGroupList"); + var demoServer = "{\"serverName\":\"zmNinjaDemo\",\"username\":\"zmninja\",\"password\":\"zmNinja$xc129\",\"url\":\"https://demo.zoneminder.com/zm\",\"apiurl\":\"https://demo.zoneminder.com/zm/api\",\"eventServer\":\"\",\"maxMontage\":\"40\",\"streamingurl\":\"https://demo.zoneminder.com/cgi-bin-zm\",\"maxFPS\":\"3\",\"montageQuality\":\"50\",\"singleImageQuality\":\"100\",\"montageHistoryQuality\":\"50\",\"useSSL\":true,\"keepAwake\":true,\"isUseAuth\":\"1\",\"isUseEventServer\":false,\"disablePush\":false,\"eventServerMonitors\":\"\",\"eventServerInterval\":\"\",\"refreshSec\":\"2\",\"enableDebug\":false,\"usePin\":false,\"pinCode\":\"\",\"canSwipeMonitors\":true,\"persistMontageOrder\":false,\"onTapScreen\":\"events\",\"enableh264\":true,\"gapless\":false,\"montageOrder\":\"\",\"montageHiddenOrder\":\"\",\"montageArraySize\":\"0\",\"graphSize\":2000,\"minAlarmCount\":\"1\",\"montageSize\":\"3\",\"useNphZms\":true,\"useNphZmsForEvents\":true,\"packMontage\":false,\"exitOnSleep\":false,\"forceNetworkStop\":false,\"defaultPushSound\":false,\"enableBlog\":true,\"use24hr\":false, \"packeryPositions\":\"\"}"; + var demoS = JSON.parse(demoServer); + console.log ("JSON parsed demo" + JSON.stringify(demoS)); + + var isFoundDemo = false; + var as = Object.keys (serverGroupList); + for (var x=0; x<as.length; x++) + { + if (as[x] == 'zmNinjaDemo') + isFoundDemo = true; + //console.log ("************ FOUND SERVER NAME " + as[x]); + // if serverGroupList[x] + } + if (!isFoundDemo) + { + zmDebug ("Pushing demo server config to server groups"); + //serverGroupList.push(demoS); + serverGroupList[demoS.serverName] = angular.copy(demoS); + } + var sname = $localstorage.get("defaultServerName"); //console.log ("!!!!!!!!!!!!!!!!!!default server name is " + sname); diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index ab19a751..0c09e4c3 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -273,11 +273,6 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r //console.log('Saving login'); ZMDataModel.setFirstUse(false); - - - - - // lets so some basic sanitization of the data // I am already adding "/" so lets remove spurious ones // though webkit has no problems. Even so, this is to avoid |