commit a75fb2ddb670d59b1f22529c9b8fd1a2fac79f2a
parent 72a2dd92168028ae37cadca6bae55dbc99c8c392
Author: David Norton <david@nortoncrew.com>
Date: Fri, 19 May 2006 18:21:27 +0000
Added items show without refreshing.
The title column is by default the only one visible.
Diffstat:
3 files changed, 30 insertions(+), 39 deletions(-)
diff --git a/chrome/chromeFiles/content/scholar/sidebar.js b/chrome/chromeFiles/content/scholar/sidebar.js
@@ -19,8 +19,6 @@ Scholar.TreeView.prototype.setTree = function(treebox)
var newRows = Scholar.Items.getTreeRows();
for(var i = 0; i < newRows.length; i++)
this._showItem(newRows[i], 0, i+1); //item ref, isContainerOpen, level
-
- this.rowCount = this._dataItems.length;
}
Scholar.TreeView.prototype.getCellText = function(row, column)
@@ -97,7 +95,6 @@ Scholar.TreeView.prototype.toggleOpenState = function(row)
}
this._dataItems[row][1] = !this._dataItems[row][1]; //toggle container open value
- this.rowCount = this._dataItems.length;
this._treebox.rowCountChanged(row+1, count); //tell treebox to repaint these
this._treebox.invalidateRow(row);
this._treebox.endUpdateBatch();
@@ -112,15 +109,15 @@ Scholar.TreeView.prototype.selectionChanged = function()
}
else
{
- removeDynamicRows();
+ removeDynamicRows(dynamicBox);
document.getElementById('tb-edit').hidden = true;
}
}
-Scholar.TreeView.prototype._showItem = function(item, level, beforeRow) { this._dataItems.splice(beforeRow, 0, [item, false, level]); }
+Scholar.TreeView.prototype._showItem = function(item, level, beforeRow) { this._dataItems.splice(beforeRow, 0, [item, false, level]); this.rowCount++; }
-Scholar.TreeView.prototype._hideItem = function(row) { this._dataItems.splice(row,1); }
+Scholar.TreeView.prototype._hideItem = function(row) { this._dataItems.splice(row,1); this.rowCount--; }
Scholar.TreeView.prototype._getItemAtRow = function(row) { return this._dataItems[row][0]; }
Scholar.TreeView.prototype.isSorted = function() { return false; }
@@ -171,7 +168,6 @@ Scholar.TreeView.prototype.deleteSelection = function()
//remove row from tree
this._hideItem(rows[i]-i);
- this.rowCount--;
this._treebox.rowCountChanged(rows[i]-i, -1);
}
this._treebox.endUpdateBatch();
@@ -185,7 +181,7 @@ Scholar.DragObserver.drop = function(row, orient) { }
function viewSelectedItem()
{
- removeDynamicRows();
+ removeDynamicRows(dynamicBox);
var thisItem = myTreeView._getItemAtRow(myTreeView.selection.currentIndex);
@@ -246,7 +242,7 @@ function editItem(thisItem)
document.getElementById('list-pane').hidden = true;
document.getElementById('edit-pane').hidden = false;
- removeDynamicRows();
+ removeDynamicRows(dynamicBox);
var fieldNames = getFullFieldList(thisItem);
for(var i = 0; i<fieldNames.length; i++)
@@ -270,35 +266,13 @@ function editItem(thisItem)
}
}
-/* DISABLE EDITING OF CREATORS UNTIL WE COME UP WITH A GOOD METHOD
- var beforeField = dynamicBox.firstChild.nextSibling;
-
- for (var i=0,len=thisItem.numCreators(); i<len; i++)
- {
- var creator = thisItem.getCreator(i);
-
- var label = document.createElement("label");
- label.setAttribute("value","Creator:");
- label.setAttribute("control","dynamic-creator-"+i);
-
- var valueElement = document.createElement("textbox");
- valueElement.setAttribute("value",creator.lastName+", "+creator.firstName);
- valueElement.setAttribute("id","dynamic-field-"+i);
-
- var row = document.createElement("row");
- row.appendChild(label);
- row.appendChild(valueElement);
-
- dynamicBox.insertBefore(row, beforeField);
- }
-*/
itemBeingEdited = thisItem;
}
-function removeDynamicRows()
+function removeDynamicRows(box)
{
- while(dynamicBox.hasChildNodes())
- dynamicBox.removeChild(dynamicBox.firstChild);
+ while(box.hasChildNodes())
+ box.removeChild(box.firstChild);
}
function getFullFieldList(item)
@@ -318,7 +292,13 @@ function returnToTree(save)
var valueElements = dynamicBox.getElementsByTagName("textbox"); //All elements of tagname 'textbox' should be the values of edits
for(var i=0; i<valueElements.length; i++)
itemBeingEdited.setField(valueElements[i].getAttribute("fieldName"),valueElements[i].value);
-
+
+ if(!itemBeingEdited.getID())
+ {
+ myTreeView._showItem(itemBeingEdited, 0, myTreeView.rowCount);
+ myTreeView._treebox.rowCountChanged(myTreeView.rowCount-1,1);
+ }
+
itemBeingEdited.save();
}
itemBeingEdited = null;
diff --git a/chrome/chromeFiles/content/scholar/sidebar.xul b/chrome/chromeFiles/content/scholar/sidebar.xul
@@ -32,7 +32,14 @@
<treecol
id="creator_column"
label="&sidebar.items.creator_column;"
- flex="1"/>
+ flex="1"
+ hidden="true"/>
+ <splitter class="tree-splitter"/>
+ <treecol
+ id="source_column"
+ label="&sidebar.items.source_column;"
+ flex="1"
+ hidden="true"/>
</treecols>
<treechildren/>
</tree>
@@ -59,7 +66,7 @@
</grid>
</vbox>
- <hbox id="edit-pane" hidden="true">
+ <hbox id="edit-pane" hidden="true">
<button label="Cancel" oncommand="returnToTree(false)"/>
<button label="Save" oncommand="returnToTree(true)"/>
</hbox>
diff --git a/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd b/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd
@@ -1,4 +1,8 @@
<!ENTITY statusbarpanel.helloworld "Hello, World">
<!ENTITY sidebar.items.title_column "Title">
-<!ENTITY sidebar.items.creator_column "Creator">
-\ No newline at end of file
+<!ENTITY sidebar.items.creator_column "Creator">
+<!ENTITY sidebar.items.source_column "Source">
+<!ENTITY sidebar.creators.firstname_column "First name">
+<!ENTITY sidebar.creators.lastname_column "Last name">
+<!ENTITY sidebar.creators.type_column "Type">
+\ No newline at end of file
