jsxgrid 2.3.0 → 2.4.0

package/src/fields/jsgrid.field.Xselect.js

@@ -1,11 +1,11 @@
-(function(jsGrid, $, undefined) {
-
-    if (!jsGrid) {
-        if (window.console) {
-            console.error("[jsxgrid] jsgrid.field.Xselect.js was loaded before the jsxgrid engine (jsxgrid.js) - include the engine first.");
-        }
-        return;
-    }
+(function(jsGrid, $, undefined) {
+
+    if (!jsGrid) {
+        if (window.console) {
+            console.error("[jsxgrid] jsgrid.field.Xselect.js was loaded before the jsxgrid engine (jsxgrid.js) - include the engine first.");
+        }
+        return;
+    }
 
 
     // Standalone: does not extend jsGrid.SelectField, only jsGrid.Field.
@@ -35,7 +35,8 @@
         valueType: NUMBER_VALUE_TYPE,
         pseudoElement: null,//pseudoElement that will be unsifted to start of select data in filters
         select2: null,
-        defaultSelected: null,
+        defaultSelected: null,//value to preselect in the filter, applied once on first filter render then reset
+        defaultValue: null,//value to preselect in the insert row, applied every time a fresh insert row is built (not reset after use, unlike defaultSelected)
 
         itemTemplate: function (value) {
             var items = this.items,
@@ -64,7 +65,11 @@
             if (!this.inserting)
                 return "";
 
-            return this.insertControl = this._createSelect();
+            var $result = this.insertControl = this._createSelect();
+            if (this.defaultValue !== null) {
+                $result.val(this.defaultValue);
+            }
+            return $result;
         },
 
         editTemplate: function (value) {

package/src/fields/jsgrid.field.Xtext.js

@@ -20,6 +20,7 @@
         autosearch: true,
         readOnly: false,
         defaultSelected: null,//value to preset the filter input with, applied once on first filter render then reset
+        defaultValue: null,//value to prefill the insert row with, applied every time a fresh insert row is built (not reset after use, unlike defaultSelected)
 
         filterTemplate: function () {
             if (!this.filtering)
@@ -49,7 +50,11 @@
             if (!this.inserting)
                 return "";
 
-            return this.insertControl = this._createTextBox();
+            var $result = this.insertControl = this._createTextBox();
+            if (this.defaultValue !== null) {
+                $result.val(this.defaultValue);
+            }
+            return $result;
         },
 
         editTemplate: function (value) {

package/src/fields/jsgrid.field.Xtextarea.js

@@ -1,11 +1,11 @@
-(function(jsGrid, $, undefined) {
-
-    if (!jsGrid) {
-        if (window.console) {
-            console.error("[jsxgrid] jsgrid.field.Xtextarea.js was loaded before the jsxgrid engine (jsxgrid.js) - include the engine first.");
-        }
-        return;
-    }
+(function(jsGrid, $, undefined) {
+
+    if (!jsGrid) {
+        if (window.console) {
+            console.error("[jsxgrid] jsgrid.field.Xtextarea.js was loaded before the jsxgrid engine (jsxgrid.js) - include the engine first.");
+        }
+        return;
+    }
 
 
     // Standalone: does not extend jsGrid.TextAreaField, only jsGrid.Field.
@@ -21,6 +21,7 @@
         readOnly: false,
         maxShowSymbols: 50,
         defaultSelected: null,//value to preset the filter input with, applied once on first filter render then reset
+        defaultValue: null,//value to prefill the insert row with, applied every time a fresh insert row is built (not reset after use, unlike defaultSelected)
 
         filterTemplate: function () {
             if (!this.filtering)
@@ -54,7 +55,11 @@
             if (!this.inserting)
                 return "";
 
-            return this.insertControl = this._createTextArea();
+            var $result = this.insertControl = this._createTextArea();
+            if (this.defaultValue !== null) {
+                $result.val(this.defaultValue);
+            }
+            return $result;
         },
 
         editTemplate: function (value) {

package/src/jsgrid.core.js

@@ -136,6 +136,13 @@
         sortAscClass: "jsgrid-header-sort jsgrid-header-sort-asc",
         sortDescClass: "jsgrid-header-sort jsgrid-header-sort-desc",
 
+        // jsxgrid extension: initial sort applied once at construction (field
+        // name/index/reference + "asc"/"desc"), baked into the first render/load
+        // instead of requiring a separate sort() call (and the extra
+        // refresh/reload that would trigger) right after creating the grid.
+        sortField: null,
+        sortOrder: null,
+
         paging: false,
         pagerContainer: null,
         pageIndex: 1,
@@ -209,11 +216,38 @@
             this._initLoadStrategy();
             this._initController();
             this._initFields();
+            this._initSorting();
             this._attachWindowLoadResize();
             this._attachWindowResizeCallback();
             this._callEventHandler(this.onInit)
         },
 
+        _initSorting: function() {
+            if(!this.sortField) {
+                return;
+            }
+
+            var field = this._normalizeField(this.sortField);
+            if(!field) {
+                return;
+            }
+
+            this._sortField = field;
+            this._sortOrder = this.sortOrder || SORT_ORDER_ASC;
+
+            // Static in-memory data (already present at construction time, not
+            // fetched via a controller) needs an explicit sort here - normal
+            // rendering never sorts on its own, only an actual sort() call does
+            // (see DirectLoadingStrategy.sort()). Controller-backed data follows
+            // the same rule sorting already does elsewhere: pageLoading sends
+            // sortField/sortOrder to the server via loadData()'s filter, while
+            // plain (non-paged) controller data is left as the controller
+            // returns it, same as clicking a sortable header would leave it.
+            if($.isArray(this.data) && this.data.length) {
+                this._sortData();
+            }
+        },
+
         _initInstanceLocale: function(locale) {
             if(!locale) {
                 return;
@@ -533,6 +567,10 @@
                         .on("click", $.proxy(function() {
                             this.sort(index);
                         }, this));
+
+                    if(field === this._sortField) {
+                        $th.addClass(this._sortOrder === SORT_ORDER_ASC ? this.sortAscClass : this.sortDescClass);
+                    }
                 }
             });
 
@@ -591,7 +629,6 @@
         },
 
         _resetPager: function() {
-            this._firstDisplayingPage = 1;
             this._setPage(1);
         },
 
@@ -1059,24 +1096,29 @@
         },
 
         _setPage: function(pageIndex) {
-            var firstDisplayingPage = this._firstDisplayingPage,
-                pageButtonCount = this.pageButtonCount;
-
             this.pageIndex = pageIndex;
-
-            if(pageIndex < firstDisplayingPage) {
-                this._firstDisplayingPage = pageIndex;
-            }
-
-            if(pageIndex > firstDisplayingPage + pageButtonCount - 1) {
-                this._firstDisplayingPage = pageIndex - pageButtonCount + 1;
-            }
+            this._firstDisplayingPage = this._centeredFirstDisplayingPage(pageIndex);
 
             this._callEventHandler(this.onPageChanged, {
                 pageIndex: pageIndex
             });
         },
 
+        // Keeps the visible page-number window centered on pageIndex (e.g.
+        // pageButtonCount=5 shows pageIndex-2 .. pageIndex+2), clamped to the
+        // actual page range, instead of only shifting once pageIndex falls
+        // outside the previous window - so the next/prev page is always just
+        // one click away, without ever needing the "..." nav button first.
+        _centeredFirstDisplayingPage: function(pageIndex) {
+            var pageButtonCount = this.pageButtonCount,
+                pageCount = this._pagesCount(),
+                halfWindow = Math.floor((pageButtonCount - 1) / 2),
+                first = pageIndex - halfWindow,
+                lastPossibleFirst = Math.max(1, pageCount - pageButtonCount + 1);
+
+            return Math.min(Math.max(1, first), lastPossibleFirst);
+        },
+
         _controllerCall: function(method, param, isCanceled, doneCallback) {
             if(isCanceled)
                 return $.Deferred().reject().promise();