From 724a0bbccab8249497819e28cf1baca7de634a06 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Thu, 17 Mar 2016 09:24:04 -0400
Subject: #133 - more cleanup

Former-commit-id: dcdb29b90a31689e78c84f51f21e9216292f1ef4
---
 www/js/DataModel.js | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

(limited to 'www')

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 0b8cc5e2..e01ed14e 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -119,24 +119,10 @@ angular.module('zmApp.controllers')
     
      function setLogin(newLogin)
      {
-         loginData = newLogin;
-         
-         
-         
-         
-          
-            //zmLog("Saving all parameters to storage");
-            //zmDebug ("DataModel/setLogin: writing " + JSON.stringify(newLogin));
-            
-            //$localstorage.setObject($rootScope.currentServerGroup, loginData);
-            //console.log ("Saving For " + loginData.serverName);
-           // console.log ("SERVER GROUP BEFORE IS "  + JSON.stringify(serverGroupList));
-            serverGroupList[loginData.serverName]=angular.copy(loginData);
-         
-          //  console.log ("SERVER GROUP AFTER IS "  + JSON.stringify(serverGroupList));
-            //console.log (JSON.stringify(serverGroupList));
-            $localstorage.setObject("serverGroupList", serverGroupList);
-            $localstorage.set("defaultServerName",loginData.serverName);
+        loginData = angular.copy(newLogin);
+        serverGroupList[loginData.serverName]=angular.copy(loginData);
+        $localstorage.setObject("serverGroupList", serverGroupList);
+        $localstorage.set("defaultServerName",loginData.serverName);
         // console.log ("SAVING " + loginData.serverName);
         // console.log ("DATA IS " + JSON.stringify(loginData));
          
@@ -206,7 +192,7 @@ angular.module('zmApp.controllers')
         // used when an empty server profile is created
         getDefaultLoginObject: function()
         {
-            return defaultLoginData;
+            return angular.copy(defaultLoginData);
         },
         
         
@@ -257,7 +243,8 @@ angular.module('zmApp.controllers')
                 d.resolve (firstReachableUrl);
                 // also make sure loginData points to this now
                 
-                loginData = serverGroupList[firstReachableUrl.server];
+                loginData = angular.copy(serverGroupList[firstReachableUrl.server]);
+                
                 $localstorage.set("defaultServerName",firstReachableUrl.server);
                 
                 zmLog ("Based on reachability, first serverName will be " + firstReachableUrl.server);
@@ -498,11 +485,11 @@ angular.module('zmApp.controllers')
         getLogin: function () {
             
             
-            return loginData;
+            return angular.copy(loginData);
         },
         
         getServerGroups: function() {
-            return serverGroupList;
+            return angular.copy(serverGroupList);
         },
         
         setServerGroups: function(sg) 
-- 
cgit v1.2.3