Changeset 79

Timestamp:

08/02/06 00:58:48 (4 years ago)

Author:

mischa

Message:

move functions where they belong, in the parent class

Location:

trunk

Files:

• datasource.js (modified) (1 diff)
• paginateddatasource.js (modified) (2 diffs)

trunk/datasource.js

@@ -88 +88 @@
   },
 
-  // aliases for use with unpaginated data sources
   totalLength: function () {
     return this.allData().length;
   },
+
   allData: function () {
-    return this.theData;
+    var theData = this.theData;
+
+    if (this.dataField && theData)
+      theData = theData[this.dataField];
+
+    return theData;
   },
 

trunk/paginateddatasource.js

@@ -5 +5 @@
 // paginated, simply call myDataSource.makePaginated().
 DataSource.prototype.extend({
+  makePaginated: function (opts) {
+      if (opts)
+          this.dataField = opts.dataField;
 
-  // returns the length of the entire data array, not just the subset on the current page
-  totalLength: function () {
-    return this.theData.length;
-  },
-
-  makePaginated: function () {
     this.extend({
 
   // returns how many pages there are
   getPageCount: function () {
-    return Math.ceil(this.length() / this.itemsPerPage) || 1;
+    return Math.ceil(this.totalLength() / this.getItemsPerPage()) || 1;
   },
 
@@ -70 +67 @@
     var theData = this.theData;
 
+    if (this.dataField && theData) {
+        theData = theData[this.dataField];
+    }
+
     if (!theData || !theData.length)
       return [];