From 782d049dcd37835f254ed13b6f2c84b0c4102d24 Mon Sep 17 00:00:00 2001 From: David Norton Date: Fri, 19 May 2006 13:53:37 +0000 Subject: [PATCH] The properties file is now better realigned. The selection no longer lost or moved on folder opening/closing. The erase functionality works, on Mac (Windows) use the delete (backspace) or forward delete (delete) keys. unfortunately there are sometimes exceptions so I am not calling erase() on each item until we figure out what the problem is. view._deleteItem() and view._insertItem() are now view._hideItem() and view._showItem() to better reflect functionality. --- chrome/chromeFiles/content/scholar/sidebar.js | 55 +++++++++++++++---- .../chromeFiles/content/scholar/sidebar.xul | 7 ++- .../locale/en-US/scholar/scholar.properties | 36 ++++++------ 3 files changed, 68 insertions(+), 30 deletions(-) diff --git a/chrome/chromeFiles/content/scholar/sidebar.js b/chrome/chromeFiles/content/scholar/sidebar.js index 118616473..299f680fc 100644 --- a/chrome/chromeFiles/content/scholar/sidebar.js +++ b/chrome/chromeFiles/content/scholar/sidebar.js @@ -18,7 +18,7 @@ Scholar.TreeView.prototype.setTree = function(treebox) var newRows = Scholar.Items.getTreeRows(); for(var i = 0; i < newRows.length; i++) - this._insertItem(newRows[i], 0, i+1); //item ref, isContainerOpen, level + this._showItem(newRows[i], 0, i+1); //item ref, isContainerOpen, level this.rowCount = this._dataItems.length; } @@ -80,7 +80,7 @@ Scholar.TreeView.prototype.toggleOpenState = function(row) { while((row + 1 < this._dataItems.length) && (this.getLevel(row + 1) > thisLevel)) { - this._deleteItem(row+1); + this._hideItem(row+1); count--; //count is negative when closing a container because we are removing rows } } @@ -91,14 +91,15 @@ Scholar.TreeView.prototype.toggleOpenState = function(row) for(var i = 0; i < newRows.length; i++) { count++; - this._insertItem(newRows[i], thisLevel+1, row+i+1); //insert new row + this._showItem(newRows[i], thisLevel+1, row+i+1); //insert new row } } this._dataItems[row][1] = !this._dataItems[row][1]; //toggle container open value + this.rowCount = this._dataItems.length; - - this._treebox.rowCountChanged(row, count); //tell treebox to repaint these + this._treebox.rowCountChanged(row+1, count); //tell treebox to repaint these + this._treebox.invalidateRow(row); } Scholar.TreeView.prototype.selectionChanged = function() @@ -116,10 +117,9 @@ Scholar.TreeView.prototype.selectionChanged = function() } -Scholar.TreeView.prototype._insertItem = function(item, level, beforeRow) { this._dataItems.splice(beforeRow, 0, [item, false, level]); } - -Scholar.TreeView.prototype._deleteItem = function(row) { this._dataItems.splice(row,1);; } +Scholar.TreeView.prototype._showItem = function(item, level, beforeRow) { this._dataItems.splice(beforeRow, 0, [item, false, level]); } +Scholar.TreeView.prototype._hideItem = function(row) { this._dataItems.splice(row,1); } Scholar.TreeView.prototype._getItemAtRow = function(row) { return this._dataItems[row][0]; } Scholar.TreeView.prototype.isSorted = function() { return false; } @@ -133,10 +133,45 @@ Scholar.TreeView.prototype.performAction = function(action) { } Scholar.TreeView.prototype.performActionOnCell = function(action, row, col) { } Scholar.TreeView.prototype.getProgressMode = function(row, col) { } +Scholar.TreeView.prototype.deleteSelectedItem = function() +{ + if(this.selection.count == 0) + { + return; + } + else if(confirm("Are you sure you want to delete the selected item"+(this.selection.count > 1 ? "s" : ""))) + { + //PS - ask first!! + var items = new Array(); + var start = new Object(); + var end = new Object(); + + for (var i=0, len=this.selection.getRangeCount(); i