[fusion-commits] r2229 - sandbox/jxlib-3.0/lib

[svn_fusion at osgeo.org]

Author: pagameba
Date: 2010-09-15 14:14:28 +0000 (Wed, 15 Sep 2010)
New Revision: 2229

Modified:
   sandbox/jxlib-3.0/lib/jxlib.uncompressed.js
Log:
fixing a few jxlib issues with the grid (it renders in firefox now).

Modified: sandbox/jxlib-3.0/lib/jxlib.uncompressed.js
===================================================================
--- sandbox/jxlib-3.0/lib/jxlib.uncompressed.js	2010-09-13 12:47:18 UTC (rev 2228)
+++ sandbox/jxlib-3.0/lib/jxlib.uncompressed.js	2010-09-15 14:14:28 UTC (rev 2229)
@@ -31525,7 +31525,7 @@
 
 ...
  */
-// $Id: columns.js 981 2010-09-13 12:18:35Z pagameba $
+// $Id: columns.js 982 2010-09-15 13:49:13Z pagameba $
 /**
  * Class: Jx.Columns
  *
@@ -31749,7 +31749,7 @@
       if (this.useHeaders()) {
         this.columns.each(function(col, idx) {
           if (!col.isHidden() && col != rhc) {
-            var classes = ['jxGridColHead', 'jxGridCol'+idx, 'jxGridCol'+col.options.name],
+            var classes = ['jxGridColHead', 'jxGridCol'+idx, 'jxCol-'+col.options.name, 'jxColHead-'+col.options.name],
                 th;
             if (col.isEditable()) { classes.push('jxColEditable'); }
             if (col.isResizable()) { classes.push('jxColResizable'); }
@@ -31791,7 +31791,7 @@
           rhc = grid.row.useHeaders() ? 
                      this.getByName(row.options.headerColumn) : null,
           domInserts = [],
-          i;
+          i = 0;
       this.columns.each(function(column, index) {
         if (!column.isHidden() && column != rhc) {
           if (column.options.renderer && column.options.renderer.domInsert) {
@@ -32337,7 +32337,7 @@
 
 ...
  */
-// $Id: grid.js 981 2010-09-13 12:18:35Z pagameba $
+// $Id: grid.js 982 2010-09-15 13:49:13Z pagameba $
 /**
  * Class: Jx.Grid
  *
@@ -32535,10 +32535,8 @@
   },
   
   wantEvent: function(eventName) {
-    console.log('wantEvent ' + eventName);
     var hook = this.hooks.get(eventName);
     if (hook === false) {
-      console.log('hooking event ' + eventName);
       switch(eventName) {
         case 'gridColumnEnter':
         case 'gridColumnLeave':
@@ -32591,8 +32589,6 @@
         default:
           break;
       }
-    } else {
-      console.log('event is already hooked');
     }
   },
   
@@ -32625,8 +32621,8 @@
       store.addEvent('storeColumnChanged', this.updateRow);
       store.addEvent('storeRecordRemoved', this.removeRow);
       store.addEvent('storeMultipleRecordsRemoved', this.removeRows);
-      if (this.store.loaded) {
-        this.storeLoaded();
+      if (store.loaded) {
+        this.storeLoaded(store);
       }
     }
     if (!this.columns.useHeaders()) {
@@ -32650,6 +32646,10 @@
         this.wantEvent(key);
       }
     }, this);
+    
+    if (document.id(this.options.parent)) {
+      this.addTo(this.options.parent);
+    }
   },
   
   /**
@@ -32729,7 +32729,7 @@
     return this.store;
   },
   
-  storeLoaded: function(store, response) {
+  storeLoaded: function(store) {
     var template = '',
         tr,
         columns = [],
@@ -32876,16 +32876,15 @@
    * that is handled by the render() method
    */
   drawStore: function() {
-    console.profile();
     this.domObj.resize();
     this.gridTableBody.empty();
     if (this.row.useHeaders()) {
       this.rowTableBody.empty();
     }
     this.store.each(function(record,index) {
+      this.store.index = index;
       this.drawRow(record, index);
     }, this);
-    console.profileEnd();
   },
   
   /**
@@ -32903,6 +32902,7 @@
     var columns = this.columns,
         body = this.gridTableBody,
         row = this.row,
+        store = this.store,
         rowHeaders = row.useHeaders(),
         autoRowHeight = row.options.rowHeight == 'auto',
         rowBody = this.rowTableBody,
@@ -32919,13 +32919,13 @@
       position = 'bottom';
     }
     tr = row.getGridRowElement(index, '');
-    columns.getRow(tr, record);
     if (position == 'replace' && index < body.childNodes.length) {
       tr.inject(body.childNodes[index], 'after');
       body.childNodes[index].dispose();
     } else {
       tr.inject(body, position);
     }
+    columns.getRow(tr, record);
     if (rowHeaders) {
       if (row.options.headerColumn) {
         rowHeaderColumn = columns.getByName(row.options.headerColumn);
@@ -33507,7 +33507,7 @@
 
 ...
  */
-// $Id: grid.selector.js 981 2010-09-13 12:18:35Z pagameba $
+// $Id: grid.selector.js 982 2010-09-15 13:49:13Z pagameba $
 /**
  * Class: Jx.Plugin.Grid.Selector
  *
@@ -33563,7 +33563,12 @@
          * Option: checkAsHeader
          * Determines if the check column is the header of the rows
          */
-        checkAsHeader: false
+        checkAsHeader: false,
+        /**
+         * Option: sortableColumn
+         * Determines if the check column is sortable
+         */
+        sortableColumn: false
     },
     
     domInsert: true,
@@ -33622,7 +33627,8 @@
             renderMode: 'fixed',
             width: 20,
             renderer: null,
-            name: 'selection'
+            name: 'selection',
+            isSortable: this.options.sortableColumn || false
           }, grid);
           this.checkColumn.options.renderer = this;
           grid.columns.columns.reverse();
@@ -34390,7 +34396,7 @@
  - emblems.png
 ...
  */
-// $Id: grid.sorter.js 981 2010-09-13 12:18:35Z pagameba $
+// $Id: grid.sorter.js 982 2010-09-15 13:49:13Z pagameba $
 /**
  * Class: Jx.Plugin.Grid.Sorter
  *