forked from vitmalina/w2ui
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
43 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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"> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
||
|
@@ -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; | ||
} | ||
|
||
})(); | ||
|
@@ -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; | ||
|
@@ -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; | ||
|
@@ -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') { | ||
|
@@ -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; | ||
|
@@ -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 | ||
* | ||
************************************************************************/ | ||
|
||
|
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.