Skip to content

Commit

Permalink
Complied 1.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
vitmalina committed Aug 10, 2014
1 parent cbc87f0 commit db3d44f
Show file tree
Hide file tree
Showing 13 changed files with 292 additions and 160 deletions.
5 changes: 4 additions & 1 deletion dist/w2ui-1.4.css → dist/w2ui-1.4.1.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* w2ui 1.4 (c) http://w2ui.com, [email protected] */
/* w2ui 1.4.1 (c) http://w2ui.com, [email protected] */
@font-face {
font-family: "w2ui-font";
src: url("data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAWIAAoAAAAACAgAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAAA9AAAAEMAAABWQLxMsmNtYXAAAAE4AAAAOgAAAUriGRC2Z2x5ZgAAAXQAAAH9AAACgLu4vTRoZWFkAAADdAAAADAAAAA2AOYXBGhoZWEAAAOkAAAAIAAAACQD8wHHaG10eAAAA8QAAAAWAAAAIA7dAABsb2NhAAAD3AAAABIAAAASAngBuG1heHAAAAPwAAAAHwAAACABFQA2bmFtZQAABBAAAAEtAAACIsTQ/zJwb3N0AAAFQAAAAEgAAABi4/7ZEHicY2BkvMM4gYGVgYPRhTGNgYHBHUp/ZZBkaGFgYGJgZWbACgLSXFMYHD4yfmRnPPD/AIMe4wEGR6AwI0gOANHZC/IAeJxjYGBgZoBgGQZGBhBwAfIYwXwWBg0gzQakGRmYGBg+sv//D1LwkRFE8zNA1QMBIxvDiAcAddwGvgAAeJxFkLFv01AQxu97LrHdRImjpnaS1gnEia3IoqAktkkiEhaEOiCsDkEo8dyBDkytKpYKVWwssKKKAYmBREKMLJSFoRJ/AGJhY0NZGFgSzrUinvR+d++7T+/ePQLRci4IJ3SFCLIjG8CH+ZPwHHdwkkSS2PMXP3DGmUxpoo123lrt5nj8fjyejsc4W0zwNtl8FfHCKV5QnaOhF3IJUrUbkGPYnSGcGH6risBvGQhdVY0iVXXVkhJN1JL6/6xOIqWk4tRlJiVFiSJFSUrsZ+tkoqpEgt/6Hb/wjtZog2gonBx24AyFJUuNwMvha+/CvLi3vq1f785GsxGuTqfWc5O1N/r2+lNrOl38ZHnWpdUMr/CaLKLGZiHl4hI1+zasGB2/Dy9GSzfRbul4qaWPtHSQ0Y7SWpxmgnSc/mblMKNpmcOVEhfj+5d/8BGfqMl9bKuWFYWKaLf8YIAq9IKc5TY7ojNgTTcC7iEjaN4yPdswbM+81t8UimRLojq66YbdWq0bus375t21bwgcw/H6nmNUyhIkR/DsTasXPgx7VtV8oDx6XIxHE8vl8rMAzqlEDZ7QseUBPP6tLOQKDH5HqooKfLvB2gABa1lgflzI60VxsLd3IJj1YRn5/Wx9Syy++LvArn/JzH4e5WE98TCLer5wnBNb9WcrB5PoH084dg8AAAB4nGNgZGBgAOKMsPib8fw2Xxm4mRhA4PzjbBcY/f////1MjIwHgFwOBrA0AFcuDPF4nGNgZGBgPPD/AIMeEwMDw/9/TEwMQBEUwAEAe34EvHicY2JgYGCCYsbJCJpxO4QNABdTAesAAAAAAAAAEgAsAGgAjgC+AP4BQAAAeJxjYGRgYOBg0GJgZgABJiDmAkIGhv9gPgMADYEBTAB4nG2PTW7CMBCFXyBQFaQKtVKl7qwuuqkIPwsWHAD2LNiH4ARQEkeOQeICPUHP0DP0BF32DD1KX8IoixZbHn/z5o1/AAzwBQ/V8HBbx2q0cMPswm3SQNgnPwl30MezcJf6ULiHV8yE+3hAyBM8vzrtHk64hTu8Cbepvwv75A/hDh7xKdyl/i3cwxo/wn28eLN9ZPJhbHK30skxDW2TN7DWttybXE2CcaMtda5t6PRWbc6qPCVT52IVW5OpBas6TY0qrDnoyAU754r5aBSLHkQmwx4RDHL+Oq53hxU0EhyR8sf2Sv2/smaHRclKlStMEGB8xbekL6+9ITONLb0bnBlLnHjnlKqjW3FZ9mSkhfRqviclKxR17UAloh5gV3cVmGPEGf/xB/Ursl9uDmByAAAAeJxtwUEOgCAMBMAu0sI3SdMEIwKh8n8PXp2hQB+mf5kIAQciGIKEzFpNr6Sj7bs76xruMq3r2eJs22XZtPKIW1laiV6rCBDA") format("woff");
Expand Down Expand Up @@ -2239,6 +2239,9 @@ button.btn-red.clicked {
.w2ui-sidebar .w2ui-sidebar-div .w2ui-node .w2ui-node-image > span {
color: #516173 !important;
}
.w2ui-sidebar .w2ui-sidebar-div .w2ui-node input {
pointer-events: auto;
}
.w2ui-sidebar .w2ui-sidebar-div .w2ui-selected,
.w2ui-sidebar .w2ui-sidebar-div .w2ui-selected:hover {
background-image: -webkit-linear-gradient(#69b1e0, #4a96d3);
Expand Down
227 changes: 151 additions & 76 deletions dist/w2ui-1.4.js → dist/w2ui-1.4.1.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/w2ui-1.4.min.css → dist/w2ui-1.4.1.min.css

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions dist/w2ui-1.4.1.min.js

Large diffs are not rendered by default.

11 changes: 0 additions & 11 deletions dist/w2ui-1.4.min.js

This file was deleted.

2 changes: 1 addition & 1 deletion dist/w2ui-fields-1.4.css → dist/w2ui-fields-1.4.1.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* w2ui-fields.js 1.4, part of w2ui (c) http://w2ui.com, [email protected] */
/* w2ui-fields.js 1.4.1, part of w2ui (c) http://w2ui.com, [email protected] */
/*************************************************
* --- Reset (used for all w2ui wdigetes)
* --- The reset is needed to coexist with other CSS
Expand Down
152 changes: 102 additions & 50 deletions dist/w2ui-fields-1.4.js → dist/w2ui-fields-1.4.1.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions dist/w2ui-fields-1.4.1.min.js

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions dist/w2ui-fields-1.4.min.js

This file was deleted.

20 changes: 11 additions & 9 deletions dist/w2ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -2185,11 +2185,13 @@ w2utils.keyboard = (function (obj) {
for (var s in this.sortData) {
var column = this.getColumn(this.sortData[s].field);
if (!column) return;
if (column.render && ['date', 'age'].indexOf(column.render.split(':')[0]) != -1) {
this.sortData[s]['field_'] = column.field + '_';
}
if (column.render && ['time'].indexOf(column.render.split(':')[0]) != -1) {
this.sortData[s]['field_'] = column.field + '_';
if (typeof column.render == 'string') {
if (['date', 'age'].indexOf(column.render.split(':')[0]) != -1) {
this.sortData[s]['field_'] = column.field + '_';
}
if (['time'].indexOf(column.render.split(':')[0]) != -1) {
this.sortData[s]['field_'] = column.field + '_';
}
}
}
// process sort
Expand Down Expand Up @@ -4336,16 +4338,16 @@ w2utils.keyboard = (function (obj) {
var tmp = 1 + (this.show.selectColumn ? 1 : 0);
var addClass = ''; // ($('#grid_'+this.name +'_rec_'+ w2utils.escapeId(recid)).hasClass('w2ui-odd') ? 'w2ui-odd' : 'w2ui-even');
$('#grid_'+ this.name +'_rec_'+ id).after(
'<tr id="grid_'+ this.name +'_rec_'+ id +'_expanded_row" class="w2ui-expanded-row '+ addClass +'">'+
'<tr id="grid_'+ this.name +'_rec_'+ recid +'_expanded_row" class="w2ui-expanded-row '+ addClass +'">'+
(this.show.lineNumbers ? '<td class="w2ui-col-number"></td>' : '') +
' <td class="w2ui-grid-data w2ui-expanded1" colspan="'+ tmp +'"><div style="display: none"></div></td>'+
' <td colspan="100" class="w2ui-expanded2">'+
' <div id="grid_'+ this.name +'_rec_'+ id +'_expanded" style="opacity: 0"></div>'+
' <div id="grid_'+ this.name +'_rec_'+ recid +'_expanded" style="opacity: 0"></div>'+
' </td>'+
'</tr>');
// event before
var eventData = this.trigger({ phase: 'before', type: 'expand', target: this.name, recid: recid,
box_id: 'grid_'+ this.name +'_rec_'+ id +'_expanded', ready: ready });
box_id: 'grid_'+ this.name +'_rec_'+ recid +'_expanded', ready: ready });
if (eventData.isCancelled === true) {
$('#grid_'+ this.name +'_rec_'+ id +'_expanded_row').remove();
return;
Expand Down Expand Up @@ -5771,7 +5773,7 @@ w2utils.keyboard = (function (obj) {
this.initResize();
this.refreshRanges();
// apply last scroll if any
if (this.last.scrollTop != '' && records.length > 0) {
if ((this.last.scrollTop || this.last.scrollLeft) && records.length > 0) {
columns.prop('scrollLeft', this.last.scrollLeft);
records.prop('scrollTop', this.last.scrollTop);
records.prop('scrollLeft', this.last.scrollLeft);
Expand Down
6 changes: 3 additions & 3 deletions dist/w2ui.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions w2ui.jquery.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "w2ui",
"version": "1.4.0",
"version": "1.4.1",
"title": "W2UI: New JavaScript UI Library",
"description": "Complete set of JavaScript UI widget for development of data-driven web applications. Includes layout, grid, toolbar, sidebar, tabs, forms, fields, popup, overlay",
"keywords": [
Expand Down Expand Up @@ -44,7 +44,7 @@
"bugs" : "https://github.com/vitmalina/w2ui/issues",
"homepage" : "http://w2ui.com/web",
"docs" : "http://w2ui.com/web/docs",
"download" : "http://w2ui.com/web/downloads/w2ui-1.4.zip",
"download" : "http://w2ui.com/web/downloads/w2ui-1.4.1.zip",
"dependencies" : {
"jquery": ">=1.9"
}
Expand Down

0 comments on commit db3d44f

Please sign in to comment.