Skip to content

Commit d095326

Browse files
paramqueryparamquery
committed
v2.2.0
1 parent dcf2fa0 commit d095326

20 files changed

+15838
-14483
lines changed

‎ChangeLog.txt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
Version 2.2.0 (01/24/2017)
2+
==========================
3+
4+
Addditions:
5+
6+
options: pasteModel, column.copy, historyModel
7+
Methods: history, getInstance
8+
Events: beforeValidate, change, history, selectChange
9+
10+
Changes:
11+
12+
options: editModel, validations.type:'nonEmpty', track replaced by trackModel, toolbar.items.listener
13+
methods: isValid, addRow, updateRow, deleteRow, isDirty
14+
15+
Fixes:
16+
17+
DnD columns with use of columTemplate and array data
18+
numberCell resize fix
19+
last row selection with grouping
20+
21+
122
Version 2.1.0 (11/06/2016)
223
==========================
324

‎README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jQuery grid plugin, supports 100,000+ records.
44

55
[Angularjs Grid](http://angularjsgrid.com) (for Angularjs)
66

7-
Copyright (c) 2012-2016 Paramvir Dhindsa
7+
Copyright (c) 2012-2017 Paramvir Dhindsa
88

99
[Released under GPL v3 license](http://paramquery.com/license)
1010

@@ -31,12 +31,15 @@ Angularjs binding is also supported now. More bindings with other MVC/MVVM frame
3131
### Features:
3232

3333
```
34+
Copy paste to and from Excel.
35+
36+
Edit history and tracking: undo and redo.
3437
3538
Local, remote and custom sorting for common data formats like Integer, real numbers, Strings, etc.
3639
3740
Local and remote filtering with header filtering row interface.
3841
39-
Paging with local (Browser) or remote (Ajax) data in any format.
42+
Paging with local (Browser) or remote data in any format.
4043
4144
Column and row grouping and fixed summary row.
4245

‎array.htm

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<!--PQ Grid files-->
1010
<link rel="stylesheet" href="pqgrid.min.css" />
1111
<script src="pqgrid.min.js"></script>
12+
13+
<!--jqueryui touch punch for touch devices-->
14+
<script src="touch-punch/touch-punch.min.js"></script>
15+
1216
<!--PQ Grid Office theme-->
1317
<link rel="stylesheet" href="themes/office/pqgrid.css" />
1418

@@ -36,14 +40,11 @@
3640
[20, 'American Intl. Group', '108905.0', '10477.0']];
3741

3842
var obj = {
39-
width: 700,
40-
height: 400,
4143
numberCell:{resizable:true,title:"#",width:30,minWidth:30},
4244
editor: {type: 'textbox'},
4345
title: "ParamQuery Grid with Array data",
4446
resizable:true,
45-
scrollModel:{autoFit:true, theme:true},
46-
draggable:true
47+
scrollModel:{autoFit:true, theme:true}
4748
};
4849
obj.colModel = [
4950
{ title: "Rank", width: 100, dataType: "integer" },

‎bower.json

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
{
2-
"name": "pqGrid",
3-
"description": "Data grid inspired by MS Excel, provides sorting, filtering, paging, grouping, nesting, rows and cell selections, frozen rows, frozen columns, Add, delete, update, search, can display HTML, JSON, Array, XML, inline editing, validations, virtual rendering, virtual scrolling, cross browser, cross platform, Themeroller ready with 24 ready to use themes.",
4-
"version": "2.0.4",
5-
"author": {
6-
"name": "Paramvir Singh Dhindsa",
7-
"email": "[email protected]",
8-
"url": "http://www.paramquery.com/"
9-
},
10-
"main": [
11-
"pqgrid.dev.js",
12-
"pqgrid.dev.css"
13-
],
14-
"keywords": [
15-
"grid",
16-
"excel",
17-
"datagrid",
18-
"table",
19-
"ajax",
20-
"ui",
21-
"sort",
22-
"i18n",
23-
"summary",
24-
"themeRoller",
25-
"freeze",
26-
"group",
27-
"search",
28-
"crud",
29-
"paging"
30-
],
31-
"bugs": "https://github.com/paramquery/grid/issues",
32-
"dependencies": {
33-
"jquery": ">=1.7.0",
34-
"jqueryui": ">=1.9.2"
35-
}
36-
}
1+
{
2+
"name": "pqGrid",
3+
"description": "Data grid inspired by MS Excel, provides sorting, filtering, paging, grouping, nesting, rows and cell selections, frozen rows, frozen columns, Add, delete, update, search, can display HTML, JSON, Array, XML, inline editing, validations, virtual rendering, virtual scrolling, cross browser, cross platform, Themeroller ready with 24 ready to use themes.",
4+
"version": "2.2.0",
5+
"author": {
6+
"name": "Paramvir Singh Dhindsa",
7+
"email": "[email protected]",
8+
"url": "http://www.paramquery.com/"
9+
},
10+
"main": [
11+
"pqgrid.dev.js",
12+
"pqgrid.dev.css"
13+
],
14+
"keywords": [
15+
"grid",
16+
"excel",
17+
"datagrid",
18+
"table",
19+
"ajax",
20+
"ui",
21+
"sort",
22+
"i18n",
23+
"summary",
24+
"themeRoller",
25+
"freeze",
26+
"group",
27+
"search",
28+
"crud",
29+
"paging"
30+
],
31+
"bugs": "https://github.com/paramquery/grid/issues",
32+
"dependencies": {
33+
"jquery": ">=1.7.0",
34+
"jqueryui": ">=1.9.2"
35+
}
36+
}

‎json.htm

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<!--PQ Grid files-->
1010
<link rel="stylesheet" href="pqgrid.min.css" />
1111
<script src="pqgrid.min.js"></script>
12+
13+
<!--jqueryui touch punch for touch devices-->
14+
<script src="touch-punch/touch-punch.min.js"></script>
15+
1216
<!--PQ Grid Office theme-->
1317
<link rel="stylesheet" href="themes/office/pqgrid.css" />
1418

@@ -37,14 +41,11 @@
3741
{ rank: 20, company: 'American Intl. Group', revenues: '108905.0', profits: '10477.0' }
3842
];
3943
var obj = {
40-
width: 700,
41-
height: 400,
4244
numberCell:{resizable:true,title:"#",width:30,minWidth:30},
4345
editor: {type: 'textbox'},
4446
title: "ParamQuery Grid with JSON Data",
4547
resizable:true,
46-
scrollModel:{autoFit:true, theme:true},
47-
draggable:true
48+
scrollModel:{autoFit:true, theme:true}
4849
};
4950
obj.colModel = [
5051
{ title: "Rank", width: 100, dataType: "integer", dataIndx: "rank" },

‎localize/pq-localize-de.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ $.paramquery.pqPager.regional['de'] = {
1919
strNextPage:"Nächste Seite",
2020
strLastPage:"Letzte Seite",
2121
strRefresh:"Neu laden",
22-
strRpp:"Ergebnisse pro Seite:",
22+
strRpp:"Ergebnisse pro Seite: {0}",
2323
strDisplay:"Ergebnis {0} bis {1} von {2}."
2424
}

‎localize/pq-localize-en.js

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,27 @@
33
*/
44
jQuery.paramquery.pqGrid.regional['en'] = {
55
strAdd: "Add",
6-
strDelete: "Delete",
6+
strDelete: "Delete",
77
strEdit: "Edit",
8+
strGroup_header: "Drag a column here to group by that column",
9+
strGroup_merge: 'Merge cells',
10+
strGroup_fixCols: 'Fix columns',
11+
strGroup_grandSummary: 'Grand summary',
812
strLoading: "Loading",
9-
strNextResult: "Next Result",
10-
strNoRows: "No rows to display.",
13+
strNextResult: "Next Result",
14+
strNoRows: "No rows to display.",
1115
strNothingFound: "Nothing found",
1216
strPrevResult: "Previous Result",
1317
strSearch: "Search",
14-
strSelectedmatches: "Selected {0} of {1} match(es)"
18+
strSelectedmatches: "Selected {0} of {1} match(es)"
1519
};
1620
jQuery.paramquery.pqPager.regional['en']={
17-
strDisplay:"Displaying {0} to {1} of {2} items.",
21+
strDisplay:"Displaying {0} to {1} of {2} items.",
1822
strFirstPage:"First Page",
1923
strLastPage:"Last Page",
20-
strNextPage:"Next Page",
24+
strNextPage:"Next Page",
2125
strPage:"Page {0} of {1}",
22-
strPrevPage:"Previous Page",
23-
strRefresh:"Refresh",
24-
strRpp:"Records per page: {0}"
25-
};
26+
strPrevPage:"Previous Page",
27+
strRefresh:"Refresh",
28+
strRpp:"Records per page: {0}"
29+
};

‎localize/pq-localize-es.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ $.paramquery.pqPager.regional['es']={
1919
strNextPage:"Página siguiente",
2020
strLastPage:"Última página",
2121
strRefresh:"refrescar",
22-
strRpp:"Registros por página:",
22+
strRpp:"Registros por página: {0}",
2323
strDisplay:"Mostrando {0} a {1} de {2} elementos."
2424
}

‎localize/pq-localize-fr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ $.paramquery.pqPager.regional ['fr'] = {
1919
strNextPage: "Page suivante",
2020
strLastPage: "Dernière page",
2121
strRefresh: "Actualiser",
22-
strRpp: "Résultats par page:",
22+
strRpp: "Résultats par page: {0}",
2323
strDisplay: "Voir {0} à {1} sur {2} résultats."
2424
}

‎localize/pq-localize-hu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ $.paramquery.pqPager.regional ['hu'] = {
1919
strNextPage: "Következõ oldal",
2020
strLastPage: "Utolsó oldal",
2121
strRefresh: "Frissítés",
22-
strRpp: "Találatok az oldalon:",
22+
strRpp: "Találatok az oldalon: {0}",
2323
strDisplay: "{2} találatból megjelenítve {0} - {1}."
2424
};

0 commit comments

Comments
 (0)