Move entry saving for re-order/delete into this.columnData

ryedin · Jul 11, 2011 · d0a1349 · d0a1349
1 parent b1bdbfc
commit d0a1349
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/source/javascript/Container.js b/source/javascript/Container.js
@@ -111,8 +111,8 @@ enyo.kind({
 			if(col.info.type === SPAZ_COLUMN_HOME){
 				col.kind = "Spaz.UnifiedColumn";
 			}
-			if(this.columnEntries[i]) {
-				col.entries = this.columnEntries[i];
+			if(this.columnData[i].entries){
+				col.entries = this.columnData[i].entries;
 			}
 
 			cols.push(
@@ -124,9 +124,9 @@ enyo.kind({
 		});
 		this.$.columnsScroller.createComponents(cols, {owner: this});
 		this.$.columnsScroller.render();
-		this.columnEntries = [];
+		//this.columnEntries = [];
 
-		App.Prefs.set('columns', this.columnData);		
+		this.saveColumnData()	
 	},
 	createColumn: function(inAccountId, inColumn, inQuery){
 
@@ -139,16 +139,23 @@ enyo.kind({
 
 		this.$.columnsScroller.snapTo(this.$.columnsScroller.getControls().length-2);
 
+	},
+	saveColumnData: function(){
+		_.each(this.columnData, function(columnData){
+			columnData.entries = null;
+		});
+		App.Prefs.set('columns', this.columnData);
+
+		this.saveColumnEntries();
+
 	},
 
 	moveColumnLeft: function(inSender){
 		this.saveColumnEntries();
 
 		var del_idx = parseInt(inSender.name.replace('Column', ''), 10);
 		var column = this.columnData.splice(del_idx, 1)[0];
-		var entries = this.columnEntries.splice(del_idx, 1)[0];
 		this.columnData.splice(del_idx-1, 0, column);
-		this.columnEntries.splice(del_idx-1, 0, entries);
 
 		this.createColumns();
 	},
@@ -157,9 +164,7 @@ enyo.kind({
 
 		var del_idx = parseInt(inSender.name.replace('Column', ''), 10);
 		var column = this.columnData.splice(del_idx, 1)[0];
-		var entries = this.columnEntries.splice(del_idx, 1)[0];
 		this.columnData.splice(del_idx+1, 0, column);
-		this.columnEntries.splice(del_idx+1, 0, entries);
 
 		this.createColumns();
 	},
@@ -180,13 +185,11 @@ enyo.kind({
 			var del_idx = parseInt(this.columnToDelete.name.replace('Column', ''), 10);
 			this.columnData.splice(del_idx, 1);
 
-			// save the column set
-			App.Prefs.set('columns', this.columnData);
-
 			this.columnToDelete.destroy();
 			this.columnToDelete = null;
 
-			this.saveColumnEntries();
+			this.saveColumnData();
+
 			this.createColumns();
 		}
 	},
@@ -256,11 +259,10 @@ enyo.kind({
 	},
 
 	saveColumnEntries: function() {
-		this.columnEntries = [];
 		enyo.forEach(this.$.columnsScroller.getControls(), enyo.bind(this, function(control) {
 			if(_.includes(control.kind, "Column") && !_.includes(control.kind, "Spacer")){
 				var col_idx = parseInt(control.name.replace('Column', ''), 10);
-				this.columnEntries[col_idx] = control.getEntries();
+				this.columnData[col_idx].entries = control.getEntries();
 			}
 		}));
 	},
@@ -295,9 +297,7 @@ enyo.kind({
 				new_idx--;
 			}
 			var column = this.columnData.splice(del_idx, 1)[0];
-			var entries = this.columnEntries.splice(del_idx, 1)[0];
 			this.columnData.splice(new_idx, 0, column);
-			this.columnEntries.splice(new_idx, 0, entries);
 
 			this.createColumns();
 			//@TODO: this creates issues with starting a column drag. To replicate: Hold onto a column toolbar, move it slightly, release. It will float in an awkward postion.