Skip to content

Commit dcf2fa0

Browse files
committed
v2.1.0
1 parent e6cd3cb commit dcf2fa0

File tree

6 files changed

+13769
-12224
lines changed

6 files changed

+13769
-12224
lines changed

ChangeLog.txt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,42 @@
1+
Version 2.1.0 (11/06/2016)
2+
==========================
3+
4+
Additions:
5+
6+
options: virtualY, swipeModel, columnTemplate, column.maxWidth, editModel.onBlur
7+
height, width of grid can be in px, % or %+-px
8+
column width, minWidth, maxWidth can be in px or %
9+
Methods: collapse, expand, getCellsByClass
10+
Events: editorBegin, editorBlur, editorEnd, editorFocus, editorKeyDown, editorKeyPress, editorKeyUp, refreshCell, refreshColumn, refreshRow.
11+
12+
Changes:
13+
14+
Non virtual mode (virtualX = false, virtualY = false) by default.
15+
saveEditCell can return null when no cell is being edited.
16+
editModel.onBlur replaces quitEditMode event way to save blurred cells.
17+
Event refresh {type:'row'} changed to refreshRow
18+
collapsible is an object instead of boolean.
19+
cells, editors vertical middle align
20+
divs removed from cell layout
21+
22+
Deprecated:
23+
24+
Events: cellEditKeyDown, quitEditMode
25+
26+
Fixes:
27+
28+
updateRow, refreshRow for rows in master grid.
29+
dataModel.location = local in master grid
30+
empty row grouped data when no data.
31+
32+
133
Version 2.0.5 (08/15/2016)
234
==========================
335

436
Addition:
537

638
Angularjs bindings.
39+
740
User contributed translations.
841

942

pqgrid.dev.css

Lines changed: 56 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/**
2-
* ParamQuery Pro v2.0.4
1+
/*!
2+
* ParamQuery Pro v2.1.0
33
*
4-
* Copyright (c) 2012-2015 Paramvir Dhindsa (http://paramquery.com)
4+
* Copyright (c) 2012-2016 Paramvir Dhindsa (http://paramquery.com)
55
* Released under GPL v3 license
66
* http://paramquery.com/license
77
*
@@ -111,7 +111,7 @@ div.pq-toolbar .pq-separator
111111
.pq-dialog-buttonset button{
112112
padding:0.5em 0em;margin:5px;
113113
}
114-
div.pq-grid div.draggable{
114+
div.pq-grid div.pq-draggable{
115115
cursor:move;
116116
}
117117
div.pq-grid-bottom{
@@ -130,10 +130,6 @@ div.pq-grid-inner{
130130
overflow-x:hidden;
131131
overflow-y:hidden;
132132
}
133-
div.pq-grid-right{
134-
position:relative;overflow:hidden;
135-
display:block;
136-
}
137133
div.pq-header-outer{
138134
position:relative;
139135
border-width:0px;
@@ -145,11 +141,12 @@ div.pq-header-outer{
145141
top:-2px;
146142
cursor:default;
147143
display:inline-block;
148-
overflow:hidden;
149144
border-width:0px;
150145
}
151-
.pq-grid .pq-cont div.pq-cont-inner{
152-
position:relative;
146+
.pq-grid span.pq-grid-header-left{
147+
overflow:hidden;
148+
}
149+
.pq-grid div.pq-cont-inner{
153150
left:0px;
154151
top:0px;
155152
cursor:default;
@@ -210,6 +207,7 @@ table.pq-grid-table{
210207
table-layout:fixed;width:0px;
211208
position:relative;
212209
top:0px;
210+
left:0px;
213211
margin-top:-1px;
214212
}
215213
table.pq-grid-header-table{
@@ -265,7 +263,9 @@ div.pq-grid tr{
265263
td.pq-grid-cell{
266264
overflow:hidden;
267265
padding:0px;
268-
vertical-align:top;
266+
padding: 4px 5px;
267+
vertical-align:middle;
268+
word-wrap:break-word;
269269
}
270270
.pq-grid td.pq-cell-dirty
271271
{
@@ -274,35 +274,49 @@ td.pq-grid-cell{
274274
background-position: left top;
275275
}
276276
td div.pq-td-div{
277-
padding:4px 5px;
277+
padding: 0px;
278+
}
279+
table.pq-td-border-right > tbody > tr > td.pq-grid-cell{
280+
border-right:1px solid #d0d0d0;
281+
}
282+
table.pq-td-border-bottom > tbody > tr > td.pq-grid-cell{
283+
border-bottom:1px solid #ededed;
278284
}
279-
.pq-wrap-text{
285+
table.pq-wrap > tbody > tr > td.pq-grid-cell,
286+
table.pq-wrap > tbody > tr > td.pq-grid-col
287+
{
288+
word-wrap:break-word;
289+
white-space: normal;
290+
}
291+
table.pq-no-wrap > tbody > tr > td.pq-grid-cell,
292+
table.pq-no-wrap > tbody > tr > td.pq-grid-col
293+
{
294+
word-wrap:normal;
295+
white-space: nowrap;
280296
overflow:hidden;
281-
text-overflow:ellipsis;
282-
white-space:nowrap;
283-
}
284-
table.pq-grid-td-border-right td.pq-grid-cell{
285-
border-right:1px solid #d0d0d0;
297+
text-overflow:ellipsis;
286298
}
287-
table.pq-grid-td-border-bottom td.pq-grid-cell{
288-
border-bottom:1px solid #ededed;
299+
div.pq-editor-outer {
300+
border:2px solid #666;
301+
position:absolute;
302+
left:0;top:0;
303+
padding:0px;
304+
z-index:5;
305+
display:table;
306+
color:#333;
289307
}
290-
tr td.pq-grid-td-border-right div{
291-
}
292-
div.pq-editor-border{
293-
border:2px solid #666;position:absolute;padding:0px;
294-
z-index:2;
308+
div.pq-editor-inner{
309+
display: table-cell;
310+
vertical-align: middle;
311+
width:100%;
295312
}
296-
div.pq-editor-border-edit{
313+
div.pq-editor-inner > div[contenteditable='true']{
314+
overflow: auto;
297315
background:#fff;
298-
color:#333;
299-
}
300-
div.pq-grid-editor-default{
301-
background:#fff;padding:2px;
316+
padding:2px;
302317
}
303-
.pq-grid .pq-cell-editor{
304-
border:1px solid #999;
305-
padding:2px 3px;
318+
div.pq-editor-inner > .pq-cell-editor{
319+
padding:2px 3px;
306320
}
307321
div.pq-tooltip{
308322
padding:3px 10px;
@@ -321,6 +335,7 @@ tr td.pq-grid-number-cell{
321335
.pq-grid td.pq-grid-number-cell{
322336
border-top:0px;
323337
border-left:0px;
338+
padding: 4px 5px;
324339
}
325340
.pq-grid table.pq-grid-table td.pq-last-freeze-col{
326341
border-right:1px solid #333;
@@ -331,7 +346,7 @@ tr td.pq-grid-number-cell{
331346
border-right:1px solid #333;
332347
top:0px;
333348
}
334-
.pq-grid tr.pq-last-freeze-row > td{
349+
table.pq-grid-table > tbody > tr.pq-last-freeze-row > td.pq-grid-cell{
335350
border-bottom:1px solid #333;
336351
}
337352
.pq-grid tr.pq-detail-master > td{
@@ -390,8 +405,9 @@ div.pq-hvscroll-square{
390405
width:17px;
391406
border:0px solid blue;
392407
position:absolute;
393-
right:0px;
408+
right:0px;
394409
bottom:0px;
410+
z-index:1;
395411
}
396412
.pq-tree-icon-container{
397413
position:relative;float:left;height:16px;
@@ -402,22 +418,19 @@ div.pq-hvscroll-square{
402418
tr.pq-grid-row-hover td
403419
{
404420
}
405-
tr.pq-row-select{
421+
div.pq-grid tr.pq-row-select{
422+
border-width:0px;
406423
}
407-
tr.pq-row-select td
424+
tr.pq-row-select > td
408425
{
409426
}
410427
div.pq-grid tr td.pq-grid-cell-hover
411428
{
412429
border-width:0px;
413430
}
414-
tr td.pq-grid-number-cell
415-
{
416-
}
417431
div.pq-grid tr td.pq-cell-select
418432
{
419-
border-top-width:0px;
420-
border-left-width:0px;
433+
border-width:0px;
421434
}
422435
span.ui-sortable-placeholder{
423436
}

0 commit comments

Comments
 (0)