Skip to content

Commit

Permalink
Recompiled JS and CSS
Browse files Browse the repository at this point in the history
  • Loading branch information
vitmalina committed Oct 29, 2013
1 parent c3cf1b6 commit 2d750dc
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 31 deletions.
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<project name="w2ui" basedir="." default="build">
<property name="w2ui.version" value="/* w2ui 1.3.RC2 (c) http://w2ui.com, [email protected] */"/>
<property name="w2ui.version" value="/* w2ui 1.3 (c) http://w2ui.com, [email protected] */"/>
<property name="kickstart.version" value="/* kicstart 0.x (c) http://w2ui.com/kickstart, [email protected] */"/>

<target name="clean">
Expand Down
2 changes: 1 addition & 1 deletion dist/w2ui-dark.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* w2ui 1.3.RC2 (c) http://w2ui.com, [email protected] */
/* w2ui 1.3 (c) http://w2ui.com, [email protected] */
/*************************************************
* --- Reset (used for all w2ui wdigetes)
* --- The reset is needed to coexist with other CSS
Expand Down
2 changes: 1 addition & 1 deletion dist/w2ui-dark.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/w2ui.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* w2ui 1.3.RC2 (c) http://w2ui.com, [email protected] */
/* w2ui 1.3 (c) http://w2ui.com, [email protected] */
/*************************************************
* --- Reset (used for all w2ui wdigetes)
* --- The reset is needed to coexist with other CSS
Expand Down
46 changes: 29 additions & 17 deletions dist/w2ui.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* w2ui 1.3.RC2 (c) http://w2ui.com, [email protected] */
/* w2ui 1.3 (c) http://w2ui.com, [email protected] */
var w2ui = w2ui || {};
var w2obj = w2obj || {}; // expose object to be able to overwrite default functions

Expand Down Expand Up @@ -752,14 +752,15 @@ var w2utils = (function () {
}

function scrollBarSize () {
if (tmp.scollBarSize) return tmp.scollBarSize;
if (tmp.scrollBarSize) return tmp.scrollBarSize;
var html = '<div id="_scrollbar_width" style="position: absolute; top: -300px; width: 100px; height: 100px; overflow-y: scroll;">'+
' <div style="height: 120px">1</div>'+
'</div>';
$('body').append(html);
tmp.scollBarSize = 100 - $('#_scrollbar_width > div').width();
tmp.scrollBarSize = 100 - $('#_scrollbar_width > div').width();
$('#_scrollbar_width').remove();
return tmp.scollBarSize;
if (String(navigator.userAgent).indexOf('MSIE') >= 0) tmp.scrollBarSize = tmp.scrollBarSize / 2; // need this for IE9+
return tmp.scrollBarSize;
}

})();
Expand Down Expand Up @@ -3221,12 +3222,6 @@ w2utils.keyboard = (function (obj) {
for (var s=1; s<sel.length; s++) obj.unselect(sel[s]);
}
}
function prevCell (check) {
var newCheck = check - 1;
if (newCheck < 0) return check;
if (obj.columns[newCheck].hidden) return findPrev(newCheck);
return newCheck;
}
}
cancel = true;
break;
Expand Down Expand Up @@ -3266,12 +3261,6 @@ w2utils.keyboard = (function (obj) {
for (var s=0; s<sel.length-1; s++) obj.unselect(sel[s]);
}
}
function nextCell (check) {
var newCheck = check + 1;
if (obj.columns.length == newCheck) return check;
if (obj.columns[newCheck].hidden) return findNext(newCheck);
return newCheck;
}
}
cancel = true;
break;
Expand Down Expand Up @@ -3475,6 +3464,20 @@ w2utils.keyboard = (function (obj) {
}
}

function nextCell (check) {
var newCheck = check + 1;
if (obj.columns.length == newCheck) return check;
if (obj.columns[newCheck].hidden) return findNext(newCheck);
return newCheck;
}

function prevCell (check) {
var newCheck = check - 1;
if (newCheck < 0) return check;
if (obj.columns[newCheck].hidden) return findPrev(newCheck);
return newCheck;
}

function tmpUnselect () {
if (obj.last.sel_type != 'click') return false;
if (obj.selectType != 'row') {
Expand Down Expand Up @@ -4261,7 +4264,15 @@ w2utils.keyboard = (function (obj) {
case 'reload':
var eventData2 = obj.trigger({ phase: 'before', type: 'reload', target: obj.name });
if (eventData2.isCancelled === true) return false;
obj.clear(true);
var url = (typeof obj.url != 'object' ? obj.url : obj.url.get);
if (url) {
obj.clear(true);
} else {
obj.last.scrollTop = 0;
obj.last.scrollLeft = 0;
obj.last.range_start= null;
obj.last.range_end = null;
}
obj.reload();
obj.trigger($.extend(eventData2, { phase: 'after' }));
break;
Expand Down Expand Up @@ -8721,6 +8732,7 @@ var w2confirm = function (msg, title, callBack) {
* - BUG with prefix/postfix and arrows (test in different contexts)
* - multiple date selection
* - rewrire everythin in objects (w2ftext, w2fenum, w2fdate)
* - render calendar to the div
*
************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion dist/w2ui.min.css

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions dist/w2ui.min.js

Large diffs are not rendered by default.

0 comments on commit 2d750dc

Please sign in to comment.