Release: v1.3.1

tabalinas · Dec 9, 2015 · cbb80c2 · cbb80c2
1 parent 039c7d3
commit cbb80c2
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 18 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "jsgrid",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "main": [
         "dist/jsgrid.js",
         "dist/jsgrid.css",

diff --git a/dist/jsgrid-theme.css b/dist/jsgrid-theme.css
diff --git a/dist/jsgrid-theme.min.css b/dist/jsgrid-theme.min.css
diff --git a/dist/jsgrid.css b/dist/jsgrid.css
@@ -1,5 +1,5 @@
 /*
- * jsGrid v1.3.0 (http://js-grid.com)
+ * jsGrid v1.3.1 (http://js-grid.com)
  * (c) 2015 Artem Tabalin
  * Licensed under MIT (https://github.com/tabalinas/jsgrid/blob/master/LICENSE)
  */

diff --git a/dist/jsgrid.js b/dist/jsgrid.js
@@ -1,5 +1,5 @@
 /*
- * jsGrid v1.3.0 (http://js-grid.com)
+ * jsGrid v1.3.1 (http://js-grid.com)
  * (c) 2015 Artem Tabalin
  * Licensed under MIT (https://github.com/tabalinas/jsgrid/blob/master/LICENSE)
  */
@@ -614,7 +614,7 @@
 
         _createCell: function(item, field) {
             var $result;
-            var fieldValue = item[field.name];
+            var fieldValue = this._getItemFieldValue(item, field);
 
             if($.isFunction(field.cellRenderer)) {
                 $result = $(field.cellRenderer(fieldValue, item));
@@ -630,6 +630,38 @@
             return $result;
         },
 
+        _getItemFieldValue: function(item, field) {
+            var props = field.name.split('.');
+            var result = item[props.shift()];
+
+            while(result && props.length) {
+                result = result[props.shift()];
+            }
+
+            return result;
+        },
+
+        _setItemFieldValue: function(item, field, value) {
+            var props = field.name.split('.');
+            var current = item;
+            var prop = props[0];
+
+            while(current && props.length > 1) {
+                item = current;
+                prop = props.shift();
+                current = item[prop];
+            }
+
+            if(!current) {
+                while(props.length) {
+                    item = item[prop] = {};
+                    prop = props.shift();
+                }
+            }
+
+            item[prop] = value;
+        },
+
         sort: function(field, order) {
             if($.isPlainObject(field)) {
                 order = field.order;
@@ -997,7 +1029,7 @@
             var result = {};
             this._eachField(function(field) {
                 if(field.filtering) {
-                    result[field.name] = field.filterValue();
+                    this._setItemFieldValue(result, field, field.filterValue());
                 }
             });
             return result;
@@ -1049,7 +1081,7 @@
             var result = {};
             this._eachField(function(field) {
                 if(field.inserting) {
-                    result[field.name] = field.insertValue();
+                    this._setItemFieldValue(result, field, field.insertValue());
                 }
             });
             return result;
@@ -1103,9 +1135,11 @@
             var $result = $("<tr>").addClass(this.editRowClass);
 
             this._eachField(function(field) {
+                var fieldValue = this._getItemFieldValue(item, field);
+
                 $("<td>").addClass(field.editcss || field.css)
                     .appendTo($result)
-                    .append(field.editTemplate ? field.editTemplate(item[field.name], item) : "")
+                    .append(field.editTemplate ? field.editTemplate(fieldValue, item) : "")
                     .width(field.width || "auto");
             });
 
@@ -1126,9 +1160,9 @@
         _updateRow: function($updatingRow, editedItem) {
             var updatingItem = $updatingRow.data(JSGRID_ROW_DATA_KEY),
                 updatingItemIndex = this._itemIndex(updatingItem),
-                previousItem = $.extend({}, updatingItem);
+                previousItem = $.extend(true, {}, updatingItem);
 
-            $.extend(updatingItem, editedItem);
+            $.extend(true, updatingItem, editedItem);
 
             var args = this._callEventHandler(this.onItemUpdating, {
                 row: $updatingRow,
@@ -1167,7 +1201,7 @@
             var result = {};
             this._eachField(function(field) {
                 if(field.editing) {
-                    result[field.name] = field.editValue();
+                    this._setItemFieldValue(result, field, field.editValue());
                 }
             });
             return result;
@@ -1515,7 +1549,7 @@
 
     Field.prototype = {
         name: "",
-        title: "",
+        title: null,
         css: "",
         align: "",
         width: 100,
@@ -1528,7 +1562,7 @@
         sorter: "string", // name of SortStrategy or function to compare elements
 
         headerTemplate: function() {
-            return this.title || this.name;
+            return (this.title === undefined || this.title === null) ? this.name : this.title;
         },
 
         itemTemplate: function(value, item) {

diff --git a/dist/jsgrid.min.css b/dist/jsgrid.min.css
diff --git a/dist/jsgrid.min.js b/dist/jsgrid.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "jsgrid",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "description": "Lightweight data grid jQuery plugin. It supports basic grid operations like inserting, filtering, editing, deleting, paging and sorting. Although jsGrid is tunable and allows to customize appearance and components.",
     "keywords": [
         "grid",