Changeset 11bcb73

Timestamp:

Dec 5, 2011, 12:58:03 PM (11 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

37c23b

Parents:

07ec84

Message:

repaired sorting and filter view

File:

• content/vI_rdfDataTree.js (modified) (5 diffs)

content/vI_rdfDataTree.js

@@ -69 +69 @@
         //to prevent the user from losing the row they edited
         var topVisibleRow = null;
-        if (this.idTable) { topVisibleRow = this.treeElem.treeBoxObject.getFirstVisibleRow(); }
+        if (this.idTable)
+          topVisibleRow = this.treeElem.treeBoxObject.getFirstVisibleRow();
         if (this.idData == null) {
             this.idData = [];
@@ -92 +93 @@
             this.idTable = curTable;
         }   
+        
         this.sort();
         
         //restore scroll position
-        if (topVisibleRow) {
+        if (topVisibleRow && topVisibleRow <= this.idTable.length) {
             this.treeElem.treeBoxObject.scrollToRow(topVisibleRow);
         }
@@ -125 +127 @@
 //      Log.debug("sort: " + columnName);
         var order = this.treeElem.getAttribute("sortDirection") == "ascending" ? 1 : -1;
-        //if the column is passed and it's already sorted by that column, reverse sort
+        // if the column is passed and it's already sorted by that column, reverse sort
         if (columnName && (this.treeElem.getAttribute("sortResource") == columnName)) {
                 order *= -1;
@@ -137 +139 @@
             return 0;
         }
-        if (columnName) this.idTable.sort(columnSort);
+        if (!columnName)
+          columnName = this.treeElem.getAttribute("sortResource")
+        
+        this.idTable.sort(columnSort);
         
         //setting these will make the sort option persist
@@ -346 +351 @@
         for each (var treeType in rdfDataTreeCollection.treeTypes) {
             rdfDataTreeCollection.trees[treeType].idData = null;
-            rdfDataTreeCollection.trees[treeType].idTable = null;
             rdfDataTreeCollection.trees[treeType].loadTable()
         }