more work on cdb properties : delete/delete-all, fixed refresh on insert prop, auto add on insert

bin/cdb.css

@@ -190,9 +190,7 @@
 }
 .cdb .cdb-sheet td.t_list.parent-sub-table,
 .cdb .cdb-sheet td.t_properties.parent-sub-table {
-  background-color: #40667e;
-  color: black;
-  font-weight: bold;
+  background-color: #313a48;
 }
 .cdb .cdb-sheet td.t_enum {
   padding-left: 5px;

bin/cdb.less

@@ -210,9 +210,7 @@
 				max-width: 32px;
 			}
 			&.parent-sub-table {
-				background-color: rgb(64, 102, 126);
-				color: black;
-				font-weight: bold;
+				background-color: #313a48;
 			}
 		}
 

hide/comp/cdb/Editor.hx

@@ -460,66 +460,52 @@ class Editor extends Component {
 		return null;
 	}
 
-	public function newColumn( sheet : cdb.Sheet, ?index : Int ) {
+	public function newColumn( sheet : cdb.Sheet, ?index : Int, ?onDone : cdb.Data.Column -> Void ) {
 		var modal = new hide.comp.cdb.ModalColumnForm(base, null, element);
 		modal.setCallback(function() {
 			var c = modal.getColumn(base, sheet, null);
-			if (c == null) {
+			if (c == null)
 				return;
-			}
-			var err = newColumn_save(sheet, c, index + 1);
+			beginChanges();
+			var err = sheet.addColumn(c, index + 1);
+			endChanges();
 			if (err != null) {
 				modal.error(err);
-			} else {
-				modal.closeModal();
+				return;
 			}
+			// perform side effects before refresh
+			if( onDone != null )
+				onDone(c);
+			// if first column or subtable, refresh all
+			if( sheet.columns.length == 1 || sheet.parent != null )
+				refresh();
+			for( t in tables )
+				if( t.sheet == sheet )
+					t.refresh();
+			modal.closeModal();
 		});
 	}
 
-	function newColumn_save( sheet : cdb.Sheet, c : cdb.Data.Column, ?index : Int ) {
-		beginChanges();
-		var err = sheet.addColumn(c, index);
-		endChanges();
-		if (err != null) {
-			return err;
-		}
-		if( sheet.columns.length == 1 )
-			refresh();
-		for( t in tables )
-			if( t.sheet == sheet )
-				t.refresh();
-		return null;
-	}
-
 	public function editColumn( sheet : cdb.Sheet, col : cdb.Data.Column ) {
 		var modal = new hide.comp.cdb.ModalColumnForm(base, col, element);
 		modal.setCallback(function() {
 			var c = modal.getColumn(base, sheet, col);
-			if (c == null) {
+			if (c == null)
 				return;
-			}
-			var err = editColumn_save(base, sheet, col, c);
+			beginChanges();
+			var err = base.updateColumn(sheet, col, c);
+			endChanges();
 			if (err != null) {
 				modal.error(err);
-			} else {
-				modal.closeModal();
+				return;
 			}
+			for( t in tables )
+				if( t.sheet == sheet )
+					t.refresh();
+			modal.closeModal();
 		});
 	}
 
-	function editColumn_save( base : cdb.Database, sheet : cdb.Sheet, colOld : cdb.Data.Column, colNew : cdb.Data.Column ) {
-		beginChanges();
-		var err = base.updateColumn(sheet, colOld, colNew);
-		endChanges();
-		for( t in tables )
-			if( t.sheet == sheet )
-				t.refresh();
-		if (err != null) {
-			return err;
-		}
-		return null;
-	}
-
 	public function deleteColumn( sheet : cdb.Sheet, cname : String ) {
 		beginChanges();
 		sheet.deleteColumn(cname);
@@ -580,14 +566,9 @@ class Editor extends Component {
 		table.refresh();
 	}
 
-	public function popupColumn( table : Table, col : cdb.Data.Column ) {
-		var indexColumn = 0;
-		for (c in table.sheet.columns) {
-			if (c == col) {
-				break;
-			}
-			indexColumn++;
-		}
+	public function popupColumn( table : Table, col : cdb.Data.Column, ?cell : Cell ) {
+		var col = cell.column;
+		var indexColumn = table.sheet.columns.indexOf(col);
 		var menu : Array<hide.comp.ContextMenu.ContextMenuItem> = [
 			{ label : "Edit", click : function () editColumn(table.sheet, col) },
 			{ label : "Add Column", click : function () newColumn(table.sheet, indexColumn) },
@@ -602,16 +583,29 @@ class Editor extends Component {
 			}},
 			{ label: "", isSeparator: true },
 			{ label : "Delete", click : function () {
-				deleteColumn(table.sheet, col.name);
+				if( table.displayMode == Properties ) {
+					beginChanges();
+					changeObject(cell.line, col, base.getDefault(col));
+					endChanges();
+				} else {
+					deleteColumn(table.sheet, col.name);
+				}
 				refresh();
 			}}
 		];
 		if( col.type == TString && col.kind == Script )
 			menu.insert(1,{ label : "Edit all", click : function() editScripts(table,col) });
+		if( table.displayMode == Properties ) {
+			menu.push({ label : "Delete All", click : function() {
+				deleteColumn(table.sheet, col.name);
+				refresh();
+			}});
+		}
 		new hide.comp.ContextMenu(menu);
 	}
 
 	function editScripts( table : Table, col : cdb.Data.Column ) {
+		// TODO : create single edit-all script view allowing global search & replace
 	}
 
 	function moveLine( line : Line, delta : Int ) {

hide/comp/cdb/Table.hx

@@ -237,7 +237,7 @@ class Table extends Component {
 
 			th.mousedown(function(e) {
 				if( e.which == 3 ) {
-					editor.popupColumn(this, c);
+					editor.popupColumn(this, c, cell);
 					editor.cursor.clickCell(cell, false);
 					e.preventDefault();
 					return;
@@ -262,7 +262,9 @@ class Table extends Component {
 			sel.val("");
 			editor.element.focus();
 			if( v == "$new" ) {
-				editor.newColumn(sheet);
+				editor.newColumn(sheet, null, function(c) {
+					if( c.opt ) insertProperty(c.name);
+				});
 				return;
 			}
 			insertProperty(v);