Getting lattest version

.npmignore

@@ -0,0 +1 @@
+dev/build

bower.json

@@ -3,9 +3,9 @@
   "main": [
     "lib/jquery.jtable.min.js"
   ],
-  "version": "2.4.0",
+  "version": "2.6.0",
   "authors": [
-    "Halil ibrahim Kalkan <[email protected]>"
+    "Halil ibrahim Kalkan <[email protected]>"
   ],
   "description": "A JQuery plugin to create AJAX based CRUD tables (grids). It supports paging, sorting, selecting, master/child tables, show/hide/resize columns, localization, themes and more.A JQuery plugin to create AJAX based CRUD tables (grids). It supports paging, sorting, selecting, master/child tables, show/hide/resize columns, localization, themes and more.",
   "keywords": [
@@ -18,7 +18,7 @@
     "sorting"
   ],
   "license": "MIT",
-  "homepage": "http://www.jtable.orghttp://www.jtable.org",
+  "homepage": "http://www.jtable.org",
   "ignore": [
     "**/.*",
     "node_modules",

dev/jquery.jtable.build.txt

@@ -10,4 +10,4 @@ add jquery.jtable.selecting.js
 add jquery.jtable.paging.js
 add jquery.jtable.sorting.js
 add jquery.jtable.dynamiccolumns.js
-add jquery.jtable.masterchild.js
+add jquery.jtable.masterchild.js

dev/jquery.jtable.core.js

@@ -4,7 +4,7 @@
 (function ($) {
 
     var unloadingPage;
-    
+
     $(window).on('beforeunload', function () {
         unloadingPage = true;
     });
@@ -24,6 +24,10 @@
             fields: {},
             animationsEnabled: true,
             defaultDateFormat: 'yy-mm-dd',
+            defaultChangeMonth: false,
+            defaultChangeYear: false,
+            defaultYearRange: 'c-10:c+10',
+            defaultMaxDate: null,
             dialogShowEffect: 'fade',
             dialogHideEffect: 'fade',
             showCloseButton: false,
@@ -95,6 +99,8 @@
 
         _cache: null, //General purpose cache dictionary (object)
 
+        _extraFieldTypes:[],
+
         /************************************************************************
         * CONSTRUCTOR AND INITIALIZATION METHODS                                *
         *************************************************************************/
@@ -117,7 +123,7 @@
             this._createErrorDialogDiv();
             this._addNoDataRow();
 
-            this._cookieKeyPrefix = this._generateCookieKeyPrefix();            
+            this._cookieKeyPrefix = this._generateCookieKeyPrefix();
         },
 
         /* Normalizes some options for all fields (sets default values).
@@ -138,6 +144,9 @@
             if (props.inputClass == undefined) {
                 props.inputClass = '';
             }
+            if (props.placeholder == undefined) {
+                props.placeholder = '';
+            }
 
             //Convert dependsOn to array if it's a comma seperated lists
             if (props.dependsOn && $.type(props.dependsOn) === 'string') {
@@ -157,6 +166,7 @@
             this._columnList = [];
             this._fieldList = [];
             this._cache = [];
+            this._extraFieldTypes = [];
         },
 
         /* Fills _fieldList, _columnList arrays and sets _keyField variable.
@@ -708,7 +718,11 @@
                 return field.display({ record: record });
             }
 
-            if (field.type == 'date') {
+            var extraFieldType = this._findItemByProperty(this._extraFieldTypes, 'type', field.type);
+            if(extraFieldType && extraFieldType.creator){
+                return extraFieldType.creator(record, field);
+            }
+            else if (field.type == 'date') {
                 return this._getDisplayTextForDateRecordField(field, fieldValue);
             } else if (field.type == 'checkbox') {
                 return this._getCheckBoxTextForFieldByValue(fieldName, fieldValue);
@@ -743,13 +757,19 @@
         /* Finds an option object by given value.
         *************************************************************************/
         _findOptionByValue: function (options, value) {
-            for (var i = 0; i < options.length; i++) {
-                if (options[i].Value == value) {
-                    return options[i];
+            return this._findItemByProperty(options, 'Value', value);
+        },
+
+        /* Finds an option object by given value.
+        *************************************************************************/
+        _findItemByProperty: function (items, key, value) {
+            for (var i = 0; i < items.length; i++) {
+                if (items[i][key] == value) {
+                    return items[i];
                 }
             }
 
-            return {}; //no option found
+            return {}; //no item found
         },
 
         /* Gets text for a date field.
@@ -761,7 +781,44 @@
 
             var displayFormat = field.displayFormat || this.options.defaultDateFormat;
             var date = this._parseDate(fieldValue);
-            return $.datepicker.formatDate(displayFormat, date);
+            try {
+                return this._formatDate(displayFormat, date);
+            } catch (e) {
+                return date;
+            }
+        },
+
+         /* Format the date/time field.
+        *************************************************************************/
+        _formatDate: function (format, date) {
+
+            var pad = function (n, width, z) {
+                z = z || '0';
+                n = n + '';
+                return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;
+            };
+
+            format = format.replace('ss', pad(date.getSeconds(), 2));
+            format = format.replace('s', date.getSeconds());
+            format = format.replace('dd', pad(date.getDate(), 2));
+            format = format.replace('d', date.getDate());
+            format = format.replace('mm', pad(date.getMinutes(), 2));
+            format = format.replace('m', date.getMinutes());
+            //format = format.replace('MMMM', monthNames[date.getMonth()]);
+            //format = format.replace('MMM', monthNames[date.getMonth()].substring(0, 3));
+            format = format.replace('MM', pad(date.getMonth() + 1, 2));
+            format = format.replace(/M(?![ao])/, date.getMonth() + 1);
+            //format = format.replace('DD', Days[date.getDay()]);
+            //format = format.replace(/D(?!e)/, Days[date.getDay()].substring(0, 3));
+            format = format.replace('yyyy', date.getFullYear());
+            format = format.replace('YYYY', date.getFullYear());
+            format = format.replace('yy', (date.getFullYear() + "").substring(2));
+            format = format.replace('YY', (date.getFullYear() + "").substring(2));
+            format = format.replace('HH', pad(date.getHours(), 2));
+            format = format.replace('H', date.getHours());
+            format = format.replace('hh', pad(date.getHours(), 2));
+            format = format.replace('h', date.getHours());
+            return format;
         },
 
         /* Gets options for a field according to user preferences.
@@ -926,29 +983,46 @@
         *  /Date(1320259705710)/
         *  2011-01-01 20:32:42 (YYYY-MM-DD HH:MM:SS)
         *  2011-01-01 (YYYY-MM-DD)
+        *  2011-10-15T14:42:51 (ISO 8601)
         *************************************************************************/
         _parseDate: function (dateString) {
-            if (dateString.indexOf('Date') >= 0) { //Format: /Date(1320259705710)/
-                return new Date(
-                    parseInt(dateString.substr(6), 10)
-                );
-            } else if (dateString.length == 10) { //Format: 2011-01-01
-                return new Date(
-                    parseInt(dateString.substr(0, 4), 10),
-                    parseInt(dateString.substr(5, 2), 10) - 1,
-                    parseInt(dateString.substr(8, 2), 10)
-                );
-            } else if (dateString.length == 19) { //Format: 2011-01-01 20:32:42
-                return new Date(
-                    parseInt(dateString.substr(0, 4), 10),
-                    parseInt(dateString.substr(5, 2), 10) - 1,
-                    parseInt(dateString.substr(8, 2, 10)),
-                    parseInt(dateString.substr(11, 2), 10),
-                    parseInt(dateString.substr(14, 2), 10),
-                    parseInt(dateString.substr(17, 2), 10)
-                );
-            } else {
-                this._logWarn('Given date is not properly formatted: ' + dateString);
+            try {
+                if (dateString.indexOf('Date') >= 0) { //Format: /Date(1320259705710)/
+                    return new Date(
+                        parseInt(dateString.substr(6), 10)
+                    );
+                } else if (dateString.length == 10) { //Format: 2011-01-01
+                    return new Date(
+                        parseInt(dateString.substr(0, 4), 10),
+                        parseInt(dateString.substr(5, 2), 10) - 1,
+                        parseInt(dateString.substr(8, 2), 10)
+                    );
+                } else if (dateString.length == 19) { //Format: 2011-01-01 20:32:42
+                    return new Date(
+                        parseInt(dateString.substr(0, 4), 10),
+                        parseInt(dateString.substr(5, 2), 10) - 1,
+                        parseInt(dateString.substr(8, 2), 10),
+                        parseInt(dateString.substr(11, 2), 10),
+                        parseInt(dateString.substr(14, 2), 10),
+                        parseInt(dateString.substr(17, 2), 10)
+                    );
+                } else if (dateString.indexOf('T') > 0) { //Format: ISO 8601 2009-10-15T14:42:51
+                    var dtstr = dateString.replace(/\D/g, " ");
+                    var dtcomps = dtstr.split(" ");
+                    dtcomps[1]--;   // modify month between 1 based ISO 8601 and zero based Date
+                    return new Date(
+                        Date.UTC(
+                            dtcomps[0],
+                            dtcomps[1],
+                            dtcomps[2],
+                            dtcomps[3],
+                            dtcomps[4],
+                            dtcomps[5]));
+                } else {
+                    throw 'Given date is not properly formatted: ' + dateString;
+                }
+            } catch (e) {
+                this._logWarn(e);
                 return 'format error!';
             }
         },
@@ -1170,7 +1244,7 @@
                     jqXHR.abort();
                     return;
                 }
-                
+
                 if (options.error) {
                     options.error(arguments);
                 }

dev/jquery.jtable.creation.js

@@ -61,7 +61,7 @@
                 autoOpen: false,
                 show: self.options.dialogShowEffect,
                 hide: self.options.dialogHideEffect,
-                width: 'auto',
+                width: self.options.formDialogWidth ? self.options.formDialogWidth : 'auto',
                 minWidth: '300',
                 modal: true,
                 title: self.options.messages.addNewRecord,

dev/jquery.jtable.deletion.js

@@ -98,6 +98,7 @@
                                         self._$deleteRecordDiv.dialog('close');
                                     },
                                     function (message) { //error
+                                        self._$deleteRecordDiv.dialog('close');
                                         self._showError(message);
                                         self._setEnabledOfDialogButton($deleteButton, true, self.options.messages.deleteText);
                                     }

dev/jquery.jtable.editing.js

@@ -65,7 +65,7 @@
                 autoOpen: false,
                 show: self.options.dialogShowEffect,
                 hide: self.options.dialogHideEffect,
-                width: 'auto',
+                width: self.options.formDialogWidth ? self.options.formDialogWidth : 'auto',
                 minWidth: '300',
                 modal: true,
                 title: self.options.messages.editRecord,
@@ -415,7 +415,7 @@
             var $columns = $tableRow.find('td');
             for (var i = 0; i < this._columnList.length; i++) {
                 var displayItem = this._getDisplayTextForRecordField(record, this._columnList[i]);
-                if ((displayItem != "") && (displayItem == 0)) displayItem = "0";
+                if ((displayItem === 0)) displayItem = "0";
                 $columns.eq(this._firstDataColumnOffset + i).html(displayItem || '');
             }
 

dev/jquery.jtable.forms.js

@@ -105,9 +105,20 @@
             if(value != undefined) {
                 $input.val(value);
             }
-            
+
             var displayFormat = field.displayFormat || this.options.defaultDateFormat;
-            $input.datepicker({ dateFormat: displayFormat });
+            var changeMonth = field.changeMonth || this.options.defaultChangeMonth;
+            var changeYear = field.changeYear || this.options.defaultChangeYear;
+            var yearRange = field.yearRange || this.options.defaultYearRange;
+            var maxDate = field.maxDate || this.options.defaultMaxDate;
+
+            $input.datepicker({
+              dateFormat: displayFormat,
+              changeMonth: changeMonth,
+              changeYear: changeYear,
+              yearRange: yearRange,
+              maxDate: maxDate
+            });
             return $('<div />')
                 .addClass('jtable-input jtable-date-input')
                 .append($input);
@@ -120,7 +131,7 @@
             if (value != undefined) {
                 $textArea.val(value);
             }
-            
+
             return $('<div />')
                 .addClass('jtable-input jtable-textarea-input')
                 .append($textArea);
@@ -129,11 +140,11 @@
         /* Creates a standart textbox for a field.
         *************************************************************************/
         _createTextInputForField: function (field, fieldName, value) {
-            var $input = $('<input class="' + field.inputClass + '" id="Edit-' + fieldName + '" type="text" name="' + fieldName + '"></input>');
+            var $input = $('<input class="' + field.inputClass + '" placeholder="' + field.placeholder + '" id="Edit-' + fieldName + '" type="text" name="' + fieldName + '"></input>');
             if (value != undefined) {
                 $input.val(value);
             }
-            
+
             return $('<div />')
                 .addClass('jtable-input jtable-text-input')
                 .append($input);
@@ -142,11 +153,11 @@
         /* Creates a password input for a field.
         *************************************************************************/
         _createPasswordInputForField: function (field, fieldName, value) {
-            var $input = $('<input class="' + field.inputClass + '" id="Edit-' + fieldName + '" type="password" name="' + fieldName + '"></input>');
+            var $input = $('<input class="' + field.inputClass + '" placeholder="' + field.placeholder + '" id="Edit-' + fieldName + '" type="password" name="' + fieldName + '"></input>');
             if (value != undefined) {
                 $input.val(value);
             }
-            
+
             return $('<div />')
                 .addClass('jtable-input jtable-password-input')
                 .append($input);
@@ -236,7 +247,7 @@
 
             return $containerDiv;
         },
-        
+
         /* Fills a dropdown list with given options.
         *************************************************************************/
         _fillDropDownListWithOptions: function ($select, options, value) {
@@ -373,7 +384,7 @@
                     }
 
                     var field = self.options.fields[fieldName];
-                    
+
                     //check if this combobox depends on others
                     if (!field.dependsOn) {
                         return;

dev/jquery.jtable.header.txt

@@ -1,6 +1,6 @@
 /* 
 
-jTable 2.4.0
+jTable 2.5.0
 http://www.jtable.org
 
 ---------------------------------------------------------------------------

dev/jquery.jtable.sorting.js

@@ -57,7 +57,7 @@
         _createHeaderCellForField: function (fieldName, field) {
             var $headerCell = base._createHeaderCellForField.apply(this, arguments);
             if (this.options.sorting && field.sorting) {
-                this._makeColumnSortable($headerCell, fieldName);
+                this._makeColumnSortable($headerCell, fieldName, field.initialSortingDirection);
             }
 
             return $headerCell;
@@ -104,7 +104,7 @@
 
         /* Makes a column sortable.
         *************************************************************************/
-        _makeColumnSortable: function ($columnHeader, fieldName) {
+        _makeColumnSortable: function ($columnHeader, fieldName, initialSortingDirection) {
             var self = this;
 
             $columnHeader
@@ -119,6 +119,10 @@
                     self._sortTableByColumn($columnHeader);
                 });
 
+            if(initialSortingDirection){
+                $columnHeader.addClass('jtable-column-header-sorted-' + initialSortingDirection.toLowerCase());
+            }        
+
             //Set default sorting
             $.each(this._lastSorting, function (sortIndex, sortField) {
                 if (sortField.fieldName == fieldName) {