diff --git a/README.md b/README.md index 7218940a8..18248caae 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ jqGrid was developed mostly by [Tony Tomov](https://github.com/tonytomov) in the The code from the GitHib repository is the fork of jqGrid 4.7.0 - the latest version available under MIT/GPL-licences. It will be provided under MIT/GPL-licences. -Below you can find short description of new features implemented in free jqGrid 4.9 (compared with version 4.8). The version is developed by [Oleg Kiriljuk](https://github.com/OlegKi), alias [Oleg](http://stackoverflow.com/users/315935/oleg) on the stackoverflow and [OlegK](http://www.trirand.com/blog/?page_id=393) on trirand forum. +Below you can find short description of the bug fixes implemented in free jqGrid 4.9.1 (compared with version 4.9). The version is developed by [Oleg Kiriljuk](https://github.com/OlegKi), alias [Oleg](http://stackoverflow.com/users/315935/oleg) on the stackoverflow and [OlegK](http://www.trirand.com/blog/?page_id=393) on trirand forum. Read [Wiki](https://github.com/free-jqgrid/jqGrid/wiki) for more detailed information about the features of free-jqGrid. @@ -17,26 +17,26 @@ One can install the package with respect of [bower](http://bower.io/search/?q=fr The repository is included on [cdnjs](https://cdnjs.com/libraries/free-jqgrid). So one can include CSS by using ```html - + ``` If you skip `http:` and `https:` prefix in the URL then the prefix of the current page will be used. In the same way you can access JavaScript files by ```html - + ``` or ```html - + ``` All language files are available in `js/i18n` sub-folder and plugins under `plugins` sub-folder. For example ```html - + ``` In the same way free jqGrid can be loaded from jsDelivr CDN too (see [here](http://www.jsdelivr.com/#!free-jqgrid)). ```html - - - + + + ``` It somebody want to test the *latest* version of free jqGrid one can load it directly from GitHib using [RawGit](http://rawgit.com/) service: @@ -46,35 +46,30 @@ It somebody want to test the *latest* version of free jqGrid one can load it dir ``` -Remark: the above URLs will be available *after* publishing the release of the version of 4.9 +Remark: the above URLs will be available *after* publishing the release of the version of 4.9.1 -### The following **main new features** are implemented in the version 4.9 +### The following bug fixes and small new features are implemented in the version 4.9.1. -* 99% of jQuery UI classes used in free jqGrid will be get now from `$.jgrid.guiStyles.jQueryUI` in the same way like free jqGrid 4.8 uses the icons from `$.jgrid.icons.jQueryUI` by default. There are exist `guiStyles` option with default value `"jQueryUI"` exactly like there are exist `iconSet` option with default value `"jQueryUI"`. Both `guiStyles` and `iconSet` options defines from which part of `$.jgrid.guiStyles` or `$.jgrid.icons` the icons or classes of common GUI elements of the grid will be used. One can extend `$.jgrid.guiStyles` with another set of elements and to use the name of the set as the value of `guiStyles` parameter. One can replace the default jQuery UI classes to the classes of another CSS framework. -* Internal methods `addXmlData` and `addJSONData` are full rewritten now. There are exist now only one `readInput`. The part of the code is moved in `$.jgrid.parseDataToHtml` which will be used in `addRowData` method too. -* The performance of jqGrid is improved. The performance of reading long XML data is improved. The performance advantage take place only if no `xmlmap` defined or if it's simple like `xmlmap: "nodeName"` or `xmlmap: "[attributeName]"`. -* Performance of jqGrid, TreeGrid, frozen columns, selection of rows, autoResizing (`autoResizeAllColumns`) and some other parts is improved. -* new `additionalProperties` parameter allows to read more properties from input data. -* Formatters supports now `getCellBuilder` property which allows to generates closure used for reading of input data. The reading of data in the loop (filling the grid) could required some relatively expensive initialization steps which can be relatively expansive. The property `getCellBuilder` allows to make the initializations once and to return the short method which can be used in the loop for reading the rows of data. Such approach improves the performance of formatters. All standard formatters have now `getCellBuilder` property. -* TreeGrid is changed in many places. There are exist no more hidden columns `level`, `parent`, `isLeaf`, `expanded`, `loaded`, `icon`. The information will be only saved in `data` parameter of jqGrid. Free jqGrid uses the new `additionalProperties` parameter for all the TreeGrid properties. It improve the performance and reduce the size used web browser. -* Frozen columns can be used now with any editing mode. The width of different rows can be different. -* Pivot module is full rewritten. Some bugs are fixed. jqPivot supports now more new options and the input data could be unsorted. See more information in [the wiki article](https://github.com/free-jqgrid/jqGrid/wiki/jqPivot-in-version-4.9). -* multiselect (`"cb"`), subgrid (`"subgrid"`) and rownumbers (`"rn"`) columns can be placed now **on any position** in the grid. New option `multiselectPosition` with default value `"left"` can be used with `"right"` value to place `"cb"` columns on the right size of jqGrid. One can use new method `remapColumnsByName` to place the column on another position (in the middle of the grid) and it will be still work. -* TreeGrid now supports `multiselect: true` option. -* By specifying any other value of `multiselectPosition` parameter as `"left"` and `"right"`, for example `multiselectPosition: "none"`, the column with checkboxs (`"cb"` column) will not created at all. One can still select multiple lines. The usage of `multiselectPosition: "none"` improve the performance of selection, compared with scenario where one creates `"cb"` column, but hide it. -* Resizing of columns is changed. One can resize the last column of the grid. The color of the resize is changed too. The previous version used `.ui-jqgrid .ui-jqgrid-resize-mark { background-color: #777; }` independent from the jQuery UI theme used. Starting with version 4.9 it will be used the class `$.jgrid.guiStyles.[guiStyleName].resizer`, which is `"ui-widget-header"` for the default guiStyleName `jQueryUI`. Thus the resizer uses the color of the border of the `"ui-widget-header"` class. New `minResizingWidth` parameter (default value 10) specify the minimal width of the column after resizing. The previous versions of jqGrid used fixed value 33px before. -* The new method `$.jgrid.builderSortIcons` is used now for building the sorting icons. One can replace the method to allows to set different icons for different columns. One can for example use different sorting icons for different type of sorting data (texts, numbers, dates and so on). -* The new method `$.jgrid.builderFmButon` is used now for building of modal dialogs. One can use replace the method for advanced customizations of the dialogs without rewriting modules of the form editing. -* The new properties `iColByName` and `iPropByName` can be used now to get the index of column from `colModel` or property from new `additionalProperties` option by name. -* The new method `remapColumnsByName` are introduced. If works in the same way like `remapColumns`, but it uses column names instead of column indexes. -* The methods `getGridRowById` and `getInd` used to access the rows by rowid are improved. -* The method `bindKeys` is rewritten. The method can be used now with data grouping. See [the answer](http://stackoverflow.com/a/30470114/315935). -* The old jqModal module is changed to allows keyboard input inside of modal dialogs. See the issue https://github.com/free-jqgrid/jqGrid/issues/59 about problems of integration of new select2 plugin in jqGrid searching and editing dialogs. -* The new option of `navGrid` is set by default to `true`. It hides unused parts of the pager and gives more place for navigator icons. It can have some compatibility problem in advanced scenarios (see [the answer](http://stackoverflow.com/a/30687097/315935) as an example). One can use `navOptions: { hideEmptyPagerParts: false }` of jqGrid or set `hideEmptyPagerParts: false` option of `navGrid` in such cases. -* The plugin `grid.odata.js`, developed by Mark Babayev (https://github.com/mirik123, markolog@gmail.com), is updated. It provides `odataGenColModel` and `odataInit` methods allows easy usage of free jqGrid with OData services. -* The new methods `createContexMenuFromNavigatorButtons` and `showHideColumnMenu` are added as plugins `jquery.createcontexmenufromnavigatorbuttons.js` and `jquery.jqgrid.showhidecolumnmenu.js`. There will be moved later in the main code of free jqGrid. -* The formatting of the source code of free jqGrid is changed to improve reading and debugging of the code. +* Bug fix in the usage of `editoptions.custom_value`. +* `buildSelect` callback includes now `cm` and `iCol` parameters. +* Bug fix in case of usage `searchoptions.dataUrl` in multiple columns and slow Ajax processing. +* Fix z-index of operation menu of `filterToobar` in case of usage in dialogs. +* Improving parsing of string returned by `cellattr`. One can for example set now any tooltips and the texts (including the words "style" or "title") will be not changed. +* Fix problem with missing common icon class for minus in TreeGrid in case of usage custom plus icon. +* Fix TreeGrid fixes for `treeGridModel: "nested"`. +* New option `sortIconsBeforeText: true` is implemented which allows to place sorting icons before texts in column headers. +* Update `grid.locale-fr.js`. Translation of `showhide` is included. +* Fix of small bug in `encodeAttr` used in `cellattr`. +* Bug fix in resizing of columns and for frozen column in case of usage together with the option `direction:"rtl"`. +* New property `headerTitle` which allows to specify title (tooltip) for the column header. It works with or without of the usage old `headertitles: true` option. +* Bug fix in case if one use string as the value of width parameter. +* Add new parameter of `getRowData` which allows to specify object with up two boolean properties: `skipHidden` and `includeId`. +* Fix the problem with recreating grouping headers in `hideCol`. The problem exist in combination with jqPivot which could creates multilevel column headers. +* Fix the error in calling of `getCellBuilder` for unknown string formatter (like non-existing `formatter: "string"` for example). +* Fix TreeGrid to load children of nodes dynamically (`treedatatype` not equal to `"local"`). +* The plugin grid.odata.js, developed by Mark Babayev (https://github.com/mirik123, markolog@gmail.com) is updated. It provides jqGrid methods allows easy usage of free jqGrid with OData services. [The wiki article](https://github.com/free-jqgrid/jqGrid/wiki/OData-plugin-for-jqGrid) described more detailed the current version of the plugin. -[The document](https://github.com/free-jqgrid/jqGrid/blob/master/README48.md) contains the readme of free jqGrid 4.8. +[README49.md](https://github.com/free-jqgrid/jqGrid/blob/master/README49.md) contains the readme of free jqGrid 4.9. +[README48.md](https://github.com/free-jqgrid/jqGrid/blob/master/README48.md) contains the readme of free jqGrid 4.8. Many thanks to all, who sent bug reports and suggestions to improve free jqGrid! diff --git a/README49.md b/README49.md new file mode 100644 index 000000000..7218940a8 --- /dev/null +++ b/README49.md @@ -0,0 +1,80 @@ +# free fork of jqGrid +====== + +jqGrid is a popular jQuery Plugin for displaying and editing data in tabular form. It has some other more sophisticated features, like subgrids, TreeGrids, grouping and so on. + +jqGrid was developed mostly by [Tony Tomov](https://github.com/tonytomov) in the past and it was available under MIT/GPL-licences till the version 4.7.0 published Dec 8, 2014 (see [here](https://github.com/tonytomov/jqGrid/tree/v4.7.0)). Short time after that the license agreement was changed (see here) and new 4.7.1 version was published. + +The code from the GitHib repository is the fork of jqGrid 4.7.0 - the latest version available under MIT/GPL-licences. It will be provided under MIT/GPL-licences. + +Below you can find short description of new features implemented in free jqGrid 4.9 (compared with version 4.8). The version is developed by [Oleg Kiriljuk](https://github.com/OlegKi), alias [Oleg](http://stackoverflow.com/users/315935/oleg) on the stackoverflow and [OlegK](http://www.trirand.com/blog/?page_id=393) on trirand forum. + +Read [Wiki](https://github.com/free-jqgrid/jqGrid/wiki) for more detailed information about the features of free-jqGrid. + +Free jqGrid can be used *for free*. You can still donate by sending money via Paypal to oleg.kiriljuk@ok-soft-gmbh.com with the comment "free jqGrid". + +One can install the package with respect of [bower](http://bower.io/search/?q=free-jqgrid) by using "bower install free-jqgrid", with respect of [npm](https://www.npmjs.com/package/free-jqgrid) by using "npm install free-jqgrid" or from [NuGet](https://www.nuget.org/packages/free-jqGrid) by using "Install-Package free-jqGrid". + +The repository is included on [cdnjs](https://cdnjs.com/libraries/free-jqgrid). So one can include CSS by using +```html + +``` +If you skip `http:` and `https:` prefix in the URL then the prefix of the current page will be used. In the same way you can access JavaScript files by +```html + +``` +or +```html + +``` +All language files are available in `js/i18n` sub-folder and plugins under `plugins` sub-folder. For example +```html + +``` + +In the same way free jqGrid can be loaded from jsDelivr CDN too (see [here](http://www.jsdelivr.com/#!free-jqgrid)). +```html + + + +``` + +It somebody want to test the *latest* version of free jqGrid one can load it directly from GitHib using [RawGit](http://rawgit.com/) service: +```html + + + +``` + +Remark: the above URLs will be available *after* publishing the release of the version of 4.9 + +### The following **main new features** are implemented in the version 4.9 + +* 99% of jQuery UI classes used in free jqGrid will be get now from `$.jgrid.guiStyles.jQueryUI` in the same way like free jqGrid 4.8 uses the icons from `$.jgrid.icons.jQueryUI` by default. There are exist `guiStyles` option with default value `"jQueryUI"` exactly like there are exist `iconSet` option with default value `"jQueryUI"`. Both `guiStyles` and `iconSet` options defines from which part of `$.jgrid.guiStyles` or `$.jgrid.icons` the icons or classes of common GUI elements of the grid will be used. One can extend `$.jgrid.guiStyles` with another set of elements and to use the name of the set as the value of `guiStyles` parameter. One can replace the default jQuery UI classes to the classes of another CSS framework. +* Internal methods `addXmlData` and `addJSONData` are full rewritten now. There are exist now only one `readInput`. The part of the code is moved in `$.jgrid.parseDataToHtml` which will be used in `addRowData` method too. +* The performance of jqGrid is improved. The performance of reading long XML data is improved. The performance advantage take place only if no `xmlmap` defined or if it's simple like `xmlmap: "nodeName"` or `xmlmap: "[attributeName]"`. +* Performance of jqGrid, TreeGrid, frozen columns, selection of rows, autoResizing (`autoResizeAllColumns`) and some other parts is improved. +* new `additionalProperties` parameter allows to read more properties from input data. +* Formatters supports now `getCellBuilder` property which allows to generates closure used for reading of input data. The reading of data in the loop (filling the grid) could required some relatively expensive initialization steps which can be relatively expansive. The property `getCellBuilder` allows to make the initializations once and to return the short method which can be used in the loop for reading the rows of data. Such approach improves the performance of formatters. All standard formatters have now `getCellBuilder` property. +* TreeGrid is changed in many places. There are exist no more hidden columns `level`, `parent`, `isLeaf`, `expanded`, `loaded`, `icon`. The information will be only saved in `data` parameter of jqGrid. Free jqGrid uses the new `additionalProperties` parameter for all the TreeGrid properties. It improve the performance and reduce the size used web browser. +* Frozen columns can be used now with any editing mode. The width of different rows can be different. +* Pivot module is full rewritten. Some bugs are fixed. jqPivot supports now more new options and the input data could be unsorted. See more information in [the wiki article](https://github.com/free-jqgrid/jqGrid/wiki/jqPivot-in-version-4.9). +* multiselect (`"cb"`), subgrid (`"subgrid"`) and rownumbers (`"rn"`) columns can be placed now **on any position** in the grid. New option `multiselectPosition` with default value `"left"` can be used with `"right"` value to place `"cb"` columns on the right size of jqGrid. One can use new method `remapColumnsByName` to place the column on another position (in the middle of the grid) and it will be still work. +* TreeGrid now supports `multiselect: true` option. +* By specifying any other value of `multiselectPosition` parameter as `"left"` and `"right"`, for example `multiselectPosition: "none"`, the column with checkboxs (`"cb"` column) will not created at all. One can still select multiple lines. The usage of `multiselectPosition: "none"` improve the performance of selection, compared with scenario where one creates `"cb"` column, but hide it. +* Resizing of columns is changed. One can resize the last column of the grid. The color of the resize is changed too. The previous version used `.ui-jqgrid .ui-jqgrid-resize-mark { background-color: #777; }` independent from the jQuery UI theme used. Starting with version 4.9 it will be used the class `$.jgrid.guiStyles.[guiStyleName].resizer`, which is `"ui-widget-header"` for the default guiStyleName `jQueryUI`. Thus the resizer uses the color of the border of the `"ui-widget-header"` class. New `minResizingWidth` parameter (default value 10) specify the minimal width of the column after resizing. The previous versions of jqGrid used fixed value 33px before. +* The new method `$.jgrid.builderSortIcons` is used now for building the sorting icons. One can replace the method to allows to set different icons for different columns. One can for example use different sorting icons for different type of sorting data (texts, numbers, dates and so on). +* The new method `$.jgrid.builderFmButon` is used now for building of modal dialogs. One can use replace the method for advanced customizations of the dialogs without rewriting modules of the form editing. +* The new properties `iColByName` and `iPropByName` can be used now to get the index of column from `colModel` or property from new `additionalProperties` option by name. +* The new method `remapColumnsByName` are introduced. If works in the same way like `remapColumns`, but it uses column names instead of column indexes. +* The methods `getGridRowById` and `getInd` used to access the rows by rowid are improved. +* The method `bindKeys` is rewritten. The method can be used now with data grouping. See [the answer](http://stackoverflow.com/a/30470114/315935). +* The old jqModal module is changed to allows keyboard input inside of modal dialogs. See the issue https://github.com/free-jqgrid/jqGrid/issues/59 about problems of integration of new select2 plugin in jqGrid searching and editing dialogs. +* The new option of `navGrid` is set by default to `true`. It hides unused parts of the pager and gives more place for navigator icons. It can have some compatibility problem in advanced scenarios (see [the answer](http://stackoverflow.com/a/30687097/315935) as an example). One can use `navOptions: { hideEmptyPagerParts: false }` of jqGrid or set `hideEmptyPagerParts: false` option of `navGrid` in such cases. +* The plugin `grid.odata.js`, developed by Mark Babayev (https://github.com/mirik123, markolog@gmail.com), is updated. It provides `odataGenColModel` and `odataInit` methods allows easy usage of free jqGrid with OData services. +* The new methods `createContexMenuFromNavigatorButtons` and `showHideColumnMenu` are added as plugins `jquery.createcontexmenufromnavigatorbuttons.js` and `jquery.jqgrid.showhidecolumnmenu.js`. There will be moved later in the main code of free jqGrid. +* The formatting of the source code of free jqGrid is changed to improve reading and debugging of the code. + +[The document](https://github.com/free-jqgrid/jqGrid/blob/master/README48.md) contains the readme of free jqGrid 4.8. + +Many thanks to all, who sent bug reports and suggestions to improve free jqGrid! diff --git a/bower.json b/bower.json index 055c550fb..b8730ce52 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "free-jqgrid", "description": "grid as jQuery plugin - fork of jqGrid before licensing change", - "version": "4.9.0", + "version": "4.9.1", "main": [ "js/jquery.jqgrid.min.js", "js/jquery.jqgrid.src.js", diff --git a/js/grid.base.js b/js/grid.base.js index ffb8d927e..f536329d7 100644 --- a/js/grid.base.js +++ b/js/grid.base.js @@ -2,13 +2,13 @@ // @compilation_level SIMPLE_OPTIMIZATIONS /** - * @license jqGrid 4.9.0-post - free jqGrid: https://github.com/free-jqgrid/jqGrid + * @license jqGrid 4.9.1 - free jqGrid: https://github.com/free-jqgrid/jqGrid * Copyright (c) 2008-2014, Tony Tomov, tony@trirand.com * Copyright (c) 2014-2015, Oleg Kiriljuk, oleg.kiriljuk@ok-soft-gmbh.com * Dual licensed under the MIT and GPL licenses * http://www.opensource.org/licenses/mit-license.php * http://www.gnu.org/licenses/gpl-2.0.html - * Date: 2015-06-27 + * Date: 2015-07-23 */ //jsHint options /*jshint evil:true, eqeqeq:false, eqnull:true, devel:true */ diff --git a/js/i18n/min/grid.locale-fr.js b/js/i18n/min/grid.locale-fr.js index 18fc474d2..ede294556 100644 --- a/js/i18n/min/grid.locale-fr.js +++ b/js/i18n/min/grid.locale-fr.js @@ -1,4 +1,4 @@ -(function(a){var b={isRTL:!1,defaults:{recordtext:"Enregistrements {0} - {1} sur {2}",emptyrecords:"Aucun enregistrement \u00e0 afficher",loadtext:"Chargement...",pgtext:"Page {0} sur {1}",pgfirst:"Premi\u00e8re Page",pglast:"Derni\u00e8re Page",pgnext:"Page Suivante",pgprev:"Page Pr\u00e9c\u00e9dente",pgrecs:"Enregistrements par page",showhide:"Toggle Expand Collapse Grid",savetext:"Enregistrement..."},search:{caption:"Recherche...",Find:"Chercher",Reset:"R\u00e9initialiser",odata:[{oper:"eq",text:"\u00e9gal"}, +(function(a){var b={isRTL:!1,defaults:{recordtext:"Enregistrements {0} - {1} sur {2}",emptyrecords:"Aucun enregistrement \u00e0 afficher",loadtext:"Chargement...",pgtext:"Page {0} sur {1}",pgfirst:"Premi\u00e8re Page",pglast:"Derni\u00e8re Page",pgnext:"Page Suivante",pgprev:"Page Pr\u00e9c\u00e9dente",pgrecs:"Enregistrements par page",showhide:"Afficher/Masquer le tableau",savetext:"Enregistrement..."},search:{caption:"Recherche...",Find:"Chercher",Reset:"R\u00e9initialiser",odata:[{oper:"eq",text:"\u00e9gal"}, {oper:"ne",text:"diff\u00e9rent"},{oper:"lt",text:"inf\u00e9rieur"},{oper:"le",text:"inf\u00e9rieur ou \u00e9gal"},{oper:"gt",text:"sup\u00e9rieur"},{oper:"ge",text:"sup\u00e9rieur ou \u00e9gal"},{oper:"bw",text:"commence par"},{oper:"bn",text:"ne commence pas par"},{oper:"in",text:"est dans"},{oper:"ni",text:"n'est pas dans"},{oper:"ew",text:"finit par"},{oper:"en",text:"ne finit pas par"},{oper:"cn",text:"contient"},{oper:"nc",text:"ne contient pas"},{oper:"nu",text:"est null"},{oper:"nn",text:"n'est pas null"}], groupOps:[{op:"AND",text:"tous"},{op:"OR",text:"au moins un"}],operandTitle:"Cliquer pour s\u00e9lectionner l'op\u00e9rateur de recherche.",resetTitle:"Vider la valeur de recherche"},edit:{addCaption:"Ajouter",editCaption:"Editer",bSubmit:"Valider",bCancel:"Annuler",bClose:"Fermer",saveData:"Les donn\u00e9es ont chang\u00e9 ! Enregistrer les modifications ?",bYes:"Oui",bNo:"Non",bExit:"Annuler",msg:{required:"Champ obligatoire",number:"Saisissez un nombre correct",minValue:"La valeur doit \u00eatre sup\u00e9rieure ou \u00e9gale \u00e0", maxValue:"La valeur doit \u00eatre inf\u00e9rieure ou \u00e9gale \u00e0",email:"n'est pas un email correct",integer:"Saisissez un entier correct",url:"n'est pas une adresse correcte. Pr\u00e9fixe requis ('http://' or 'https://')",nodefined:" n'est pas d\u00e9fini!",novalue:" la valeur de retour est requise!",customarray:"Une fonction personnalis\u00e9e devrait retourner un tableau (array)!",customfcheck:"Une fonction personnalis\u00e9e devrait \u00eatre pr\u00e9sente dans le cas d'une v\u00e9rification personnalis\u00e9e!"}}, diff --git a/js/jquery.jqgrid.min.js b/js/jquery.jqgrid.min.js index de85021a8..f6f6e5d22 100644 --- a/js/jquery.jqgrid.min.js +++ b/js/jquery.jqgrid.min.js @@ -1,11 +1,11 @@ /* - jqGrid 4.9.0-post - free jqGrid: https://github.com/free-jqgrid/jqGrid + jqGrid 4.9.1 - free jqGrid: https://github.com/free-jqgrid/jqGrid Copyright (c) 2008-2014, Tony Tomov, tony@trirand.com Copyright (c) 2014-2015, Oleg Kiriljuk, oleg.kiriljuk@ok-soft-gmbh.com Dual licensed under the MIT and GPL licenses http://www.opensource.org/licenses/mit-license.php http://www.gnu.org/licenses/gpl-2.0.html - Date: 2015-06-27 + Date: 2015-07-23 */ (function(a){var p={name:"English (United States)",nameEnglish:"English (United States)",isRTL:!1,defaults:{recordtext:"View {0} - {1} of {2}",emptyrecords:"No records to view",loadtext:"Loading...",pgtext:"Page {0} of {1}",pgfirst:"First Page",pglast:"Last Page",pgnext:"Next Page",pgprev:"Previous Page",pgrecs:"Records per Page",showhide:"Toggle Expand Collapse Grid",savetext:"Saving..."},search:{caption:"Search...",Find:"Find",Reset:"Reset",odata:[{oper:"eq",text:"equal"},{oper:"ne",text:"not equal"}, {oper:"lt",text:"less"},{oper:"le",text:"less or equal"},{oper:"gt",text:"greater"},{oper:"ge",text:"greater or equal"},{oper:"bw",text:"begins with"},{oper:"bn",text:"does not begin with"},{oper:"in",text:"is in"},{oper:"ni",text:"is not in"},{oper:"ew",text:"ends with"},{oper:"en",text:"does not end with"},{oper:"cn",text:"contains"},{oper:"nc",text:"does not contain"},{oper:"nu",text:"is null"},{oper:"nn",text:"is not null"}],groupOps:[{op:"AND",text:"all"},{op:"OR",text:"any"}],operandTitle:"Click to select search operation.", diff --git a/js/jquery.jqgrid.src.js b/js/jquery.jqgrid.src.js index 09979f148..b78e829de 100644 --- a/js/jquery.jqgrid.src.js +++ b/js/jquery.jqgrid.src.js @@ -2,13 +2,13 @@ // @compilation_level SIMPLE_OPTIMIZATIONS /** - * @license jqGrid 4.9.0-post - free jqGrid: https://github.com/free-jqgrid/jqGrid + * @license jqGrid 4.9.1 - free jqGrid: https://github.com/free-jqgrid/jqGrid * Copyright (c) 2008-2014, Tony Tomov, tony@trirand.com * Copyright (c) 2014-2015, Oleg Kiriljuk, oleg.kiriljuk@ok-soft-gmbh.com * Dual licensed under the MIT and GPL licenses * http://www.opensource.org/licenses/mit-license.php * http://www.gnu.org/licenses/gpl-2.0.html - * Date: 2015-06-27 + * Date: 2015-07-23 */ //jsHint options /*jshint evil:true, eqeqeq:false, eqnull:true, devel:true */ diff --git a/package.json b/package.json index e5bd2778d..7b117dd41 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ } ], "title": "free jqGrid", - "version": "4.9.0", + "version": "4.9.1", "description": "grid as jQuery plugin - fork of jqGrid before licensing change", "main": "js/jquery.jqgrid.src.js", "filename": "js/jquery.jqgrid.src.js",