v2.2.0

paramquery · Jan 24, 2017 · 205a6e8 · 205a6e8
1 parent dcf2fa0
commit 205a6e8
Show file tree

Hide file tree

Showing 20 changed files with 15,840 additions and 14,485 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,24 @@
+Version 2.2.0 (01/24/2017)
+==========================
+
+Addditions:
+
+options: pasteModel, column.copy, historyModel
+Methods: history, getInstance
+Events: beforeValidate, change, history, selectChange
+
+Changes:
+
+options: editModel, validations.type:'nonEmpty', track replaced by trackModel, toolbar.items.listener 
+methods: isValid, addRow, updateRow, deleteRow, isDirty
+
+Fixes:
+
+DnD columns with use of columTemplate and array data
+numberCell resize fix
+last row selection with grouping
+
+
 Version 2.1.0 (11/06/2016)
 ==========================
 

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ jQuery grid plugin, supports 100,000+ records.
 
 [Angularjs Grid](http://angularjsgrid.com) (for Angularjs)
 
-Copyright (c) 2012-2016 Paramvir Dhindsa 
+Copyright (c) 2012-2017 Paramvir Dhindsa 
 
 [Released under GPL v3 license](http://paramquery.com/license)
 
@@ -31,12 +31,15 @@ Angularjs binding is also supported now. More bindings with other MVC/MVVM frame
 ### Features:
 
 ```
+Copy paste to and from Excel.
 
-Local, remote and custom sorting for common data formats like Integer, real numbers, Strings, etc.
+Edit history and tracking: undo and redo.
+
+Local, remote and custom sorting for common data formats like Integer, real numbers, Strings, dates, etc.
 
 Local and remote filtering with header filtering row interface.
 
-Paging with local (Browser) or remote (Ajax) data in any format.
+Paging with local or remote data.
 
 Column and row grouping and fixed summary row.
 
@@ -58,7 +61,7 @@ i18n.
 
 Consistent look and functionality across all major browsers IE(8+), Firefox, Chrome, Opera, etc
 
-Display any data source format like HTML, Array, XML, JSON, etc locally or remotely through Ajax.
+Displays data source formats like HTML, Array, XML, JSON, etc.
 
 Can be used with any server side framework e.g. ASP.NET, MVC3, JSP, JSF, PHP, etc.
 

diff --git a/array.htm b/array.htm
@@ -9,6 +9,10 @@
 <!--PQ Grid files-->
     <link rel="stylesheet" href="pqgrid.min.css" />
     <script src="pqgrid.min.js"></script>
+
+<!--jqueryui touch punch for touch devices-->
+    <script src="touch-punch/touch-punch.min.js"></script>
+
 <!--PQ Grid Office theme-->
     <link rel="stylesheet" href="themes/office/pqgrid.css" />
 
@@ -36,14 +40,11 @@
             [20, 'American Intl. Group', '108905.0', '10477.0']];
 
         var obj = { 
-            width: 700, 
-            height: 400, 
             numberCell:{resizable:true,title:"#",width:30,minWidth:30},
             editor: {type: 'textbox'},
             title: "ParamQuery Grid with Array data",
             resizable:true,
-            scrollModel:{autoFit:true, theme:true},
-            draggable:true 
+            scrollModel:{autoFit:true, theme:true}
         };
         obj.colModel = [
             { title: "Rank", width: 100, dataType: "integer" },

diff --git a/bower.json b/bower.json
@@ -1,36 +1,36 @@
-{
-	"name": "pqGrid",
-	"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.",
-	"version": "2.0.4",
-	"author": {
-    "name": "Paramvir Singh Dhindsa",
-    "email": "[email protected]",
-    "url": "http://www.paramquery.com/"
-  },
-	"main": [
-		"pqgrid.dev.js",
-		"pqgrid.dev.css"
-	],
-	"keywords": [
-    "grid",
-    "excel",    
-    "datagrid",
-    "table",
-    "ajax",
-    "ui",
-    "sort",
-    "i18n",
-    "summary",
-    "themeRoller",
-    "freeze",
-    "group",
-    "search",
-    "crud",
-    "paging"
-  ],
-  "bugs": "https://github.com/paramquery/grid/issues",
-  "dependencies": {
-    "jquery": ">=1.7.0",
-    "jqueryui": ">=1.9.2"
-  }
-}
+{
+	"name": "pqGrid",
+	"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.",
+	"version": "2.2.0",
+	"author": {
+    "name": "Paramvir Singh Dhindsa",
+    "email": "[email protected]",
+    "url": "http://www.paramquery.com/"
+  },
+	"main": [
+		"pqgrid.dev.js",
+		"pqgrid.dev.css"
+	],
+	"keywords": [
+    "grid",
+    "excel",    
+    "datagrid",
+    "table",
+    "ajax",
+    "ui",
+    "sort",
+    "i18n",
+    "summary",
+    "themeRoller",
+    "freeze",
+    "group",
+    "search",
+    "crud",
+    "paging"
+  ],
+  "bugs": "https://github.com/paramquery/grid/issues",
+  "dependencies": {
+    "jquery": ">=1.7.0",
+    "jqueryui": ">=1.9.2"
+  }
+}
diff --git a/json.htm b/json.htm
@@ -9,6 +9,10 @@
 <!--PQ Grid files-->
     <link rel="stylesheet" href="pqgrid.min.css" />
     <script src="pqgrid.min.js"></script>
+
+<!--jqueryui touch punch for touch devices-->
+    <script src="touch-punch/touch-punch.min.js"></script>
+
 <!--PQ Grid Office theme-->
     <link rel="stylesheet" href="themes/office/pqgrid.css" />
 
@@ -37,14 +41,11 @@
         { rank: 20, company: 'American Intl. Group', revenues: '108905.0', profits: '10477.0' }
     ];
     var obj = { 
-        width: 700, 
-        height: 400, 
         numberCell:{resizable:true,title:"#",width:30,minWidth:30},
 	editor: {type: 'textbox'},
         title: "ParamQuery Grid with JSON Data",
         resizable:true,
-        scrollModel:{autoFit:true, theme:true},
-        draggable:true 
+        scrollModel:{autoFit:true, theme:true}
     };
     obj.colModel = [
         { title: "Rank", width: 100, dataType: "integer", dataIndx: "rank" },

diff --git a/localize/pq-localize-de.js b/localize/pq-localize-de.js
@@ -19,6 +19,6 @@ $.paramquery.pqPager.regional['de'] = {
 	strNextPage:"Nächste Seite",
 	strLastPage:"Letzte Seite",
 	strRefresh:"Neu laden",	
-	strRpp:"Ergebnisse pro Seite:",
+	strRpp:"Ergebnisse pro Seite: {0}",
 	strDisplay:"Ergebnis {0} bis {1} von {2}."
 }
diff --git a/localize/pq-localize-en.js b/localize/pq-localize-en.js
@@ -3,23 +3,27 @@
  */
 jQuery.paramquery.pqGrid.regional['en'] = {
     strAdd: "Add",
-    strDelete: "Delete",        
+    strDelete: "Delete",
     strEdit: "Edit",
+    strGroup_header: "Drag a column here to group by that column",
+    strGroup_merge: 'Merge cells',
+    strGroup_fixCols: 'Fix columns',
+    strGroup_grandSummary: 'Grand summary',
     strLoading: "Loading",
-    strNextResult: "Next Result",        
-    strNoRows: "No rows to display.",        
+    strNextResult: "Next Result",
+    strNoRows: "No rows to display.",
     strNothingFound: "Nothing found",
     strPrevResult: "Previous Result",
     strSearch: "Search",
-    strSelectedmatches: "Selected {0} of {1} match(es)"    
+    strSelectedmatches: "Selected {0} of {1} match(es)"
 };
 jQuery.paramquery.pqPager.regional['en']={
-    strDisplay:"Displaying {0} to {1} of {2} items.",		
+    strDisplay:"Displaying {0} to {1} of {2} items.",
     strFirstPage:"First Page",
     strLastPage:"Last Page",
-    strNextPage:"Next Page",        
+    strNextPage:"Next Page",
     strPage:"Page {0} of {1}",
-    strPrevPage:"Previous Page",	
-    strRefresh:"Refresh",	
-    strRpp:"Records per page: {0}"	
-};
+    strPrevPage:"Previous Page",
+    strRefresh:"Refresh",
+    strRpp:"Records per page: {0}"
+};
diff --git a/localize/pq-localize-es.js b/localize/pq-localize-es.js
@@ -19,6 +19,6 @@ $.paramquery.pqPager.regional['es']={
 	strNextPage:"Página siguiente",
 	strLastPage:"Última página",
 	strRefresh:"refrescar",	
-	strRpp:"Registros por página:",
+	strRpp:"Registros por página: {0}",
 	strDisplay:"Mostrando {0} a {1} de {2} elementos."	
 }
diff --git a/localize/pq-localize-fr.js b/localize/pq-localize-fr.js
@@ -19,6 +19,6 @@ $.paramquery.pqPager.regional ['fr'] = {
     strNextPage: "Page suivante", 
     strLastPage: "Dernière page", 
     strRefresh: "Actualiser", 
-    strRpp: "Résultats par page:", 
+    strRpp: "Résultats par page: {0}",
     strDisplay: "Voir {0} à {1} sur {2} résultats." 
 }
diff --git a/localize/pq-localize-hu.js b/localize/pq-localize-hu.js
@@ -19,6 +19,6 @@ $.paramquery.pqPager.regional ['hu'] = {
     strNextPage: "Következõ oldal", 
     strLastPage: "Utolsó oldal", 
     strRefresh: "Frissítés", 
-    strRpp: "Találatok az oldalon:", 
+    strRpp: "Találatok az oldalon: {0}",
     strDisplay: "{2} találatból megjelenítve {0} - {1}." 
 };
diff --git a/localize/pq-localize-it.js b/localize/pq-localize-it.js
@@ -19,6 +19,6 @@ $.paramquery.pqPager.regional['it'] = {
     strNextPage: "Pagina successiva",
     strLastPage: "Ultima pagina",
     strRefresh: "Aggiorna",
-    strRpp: "Risultati per pagina:",
+    strRpp: "Risultati per pagina: {0}",
     strDisplay: "Visualizzazione {0} a {1} di {2} risultati."
 }
diff --git a/localize/pq-localize-nl.js b/localize/pq-localize-nl.js
@@ -17,6 +17,6 @@ $.paramquery.pqPager.regional['nl'] = {
     strNextPage: "Volgende pagina",
     strLastPage: "Laatste pagina",
     strRefresh: "Verfrissen",
-    strRpp: "Notulen per pagina:",
+    strRpp: "Notulen per pagina: {0}",
     strDisplay: "Weergeven {0} t&m {1} van {2} artikelen."
 };
diff --git a/localize/pq-localize-pt-br.js b/localize/pq-localize-pt-br.js
@@ -20,6 +20,6 @@ $.paramquery.pqPager.regional['pt-br']={
     strNextPage: "Próxima Página",
     strLastPage: "Última Página",
     strRefresh: "Atualizar",
-    strRpp: "Registros por página:",
+    strRpp: "Registros por página: {0}",
     strDisplay: "Mostrando {0} a {1} de {2} itens."
 }
diff --git a/localize/pq-localize-ru.js b/localize/pq-localize-ru.js
@@ -19,6 +19,6 @@ $.paramquery.pqPager.regional['ru'] = {
 	strNextPage : "Следующая страница",
 	strLastPage : "Последняя страница",
 	strRefresh  : "Обновить",	
-	strRpp      : "Строк на странице:",
+	strRpp      : "Строк на странице: {0}",
 	strDisplay  : "Строки с {0} по {1} из {2}."
 }