Menu
▾
▴
andro-hacker
|
From: <ken...@us...> - 2009-02-18 14:41:07
|
Revision: 1256
http://andro.svn.sourceforge.net/andro/?rev=1256&view=rev
Author: kendowns
Date: 2009-02-18 14:41:03 +0000 (Wed, 18 Feb 2009)
Log Message:
-----------
Sourceforge Bug 2612788. Child table heights not correct.
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-02-18 14:37:42 UTC (rev 1255)
+++ trunk/andro/clib/x6.js 2009-02-18 14:41:03 UTC (rev 1256)
@@ -6184,7 +6184,7 @@
function() {
$(ui.panel).animate({height: newHeightT},spd,null
,function() {
- x6tabs.slideUpData(tabsUl,newChild,newHeight);
+ x6tabs.slideUpData(tabsUl,newChild,newHeightT);
x6.byId(topPane).currentChild = newChild;
}
);
@@ -6204,7 +6204,7 @@
,function() {
$(ui.panel).animate({height: newHeightT},400,null
,function() {
- x6tabs.slideUpData(tabsUl,newChild,newHeight);
+ x6tabs.slideUpData(tabsUl,newChild,newHeightT);
x6.byId(topPane).currentChild = newChild;
}
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-20 13:28:11
|
Revision: 1275
http://andro.svn.sourceforge.net/andro/?rev=1275&view=rev
Author: kendowns
Date: 2009-02-20 13:26:44 +0000 (Fri, 20 Feb 2009)
Log Message:
-----------
Sourceforge Bug 2616779
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-02-20 13:26:09 UTC (rev 1274)
+++ trunk/andro/clib/x6.js 2009-02-20 13:26:44 UTC (rev 1275)
@@ -5468,7 +5468,7 @@
var col = info.column_id;
if(col=='') continue;
if(row[col]==null) row[col] = '';
- html+='<div class="cell_'+col+'"'
+ html+='<div class="'+this.id+'_'+col+'"'
+' gcolumn = "'+idx+'">'
+row[col].htmlDisplay()
+'</div>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-20 14:23:11
|
Revision: 1278
http://andro.svn.sourceforge.net/andro/?rev=1278&view=rev
Author: kendowns
Date: 2009-02-20 14:23:09 +0000 (Fri, 20 Feb 2009)
Log Message:
-----------
Sourceforge bug 2616798
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-02-20 13:56:24 UTC (rev 1277)
+++ trunk/andro/clib/x6.js 2009-02-20 14:23:09 UTC (rev 1278)
@@ -3960,7 +3960,13 @@
var colCount = $(this.tbody).find('div.x6selrow:last div').length;
for(var x = 0; x<= colCount; x++) {
if(x==colCount) {
- maxWidth=15;
+ // KFD 2/20/09 Sourceforge 2616798
+ if(navigator.userAgent.indexOf('MSIE 6.0')>0) {
+ maxWidth=17;
+ }
+ else {
+ maxWidth=15;
+ }
}
else {
var maxWidth=$(this.div).find('#x6head'+x).width();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-20 14:59:58
|
Revision: 1279
http://andro.svn.sourceforge.net/andro/?rev=1279&view=rev
Author: kendowns
Date: 2009-02-20 14:59:54 +0000 (Fri, 20 Feb 2009)
Log Message:
-----------
Sourceforge 2616785.
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-02-20 14:23:09 UTC (rev 1278)
+++ trunk/andro/clib/x6.js 2009-02-20 14:59:54 UTC (rev 1279)
@@ -102,76 +102,38 @@
/* **************************************************************** *\
- NOTE: This is not actually referenced yet. If we get
- IE working w/o it, remove. KFD 1/16/09
-
- Cross Browser selectionStart/selectionEnd
- Version 0.2
- Copyright (c) 2005-2007 KOSEKI Kengo
-
- This script is distributed under the MIT licence.
- http://www.opensource.org/licenses/mit-license.php
+ A SelectionStart/End replacement that works in IE & FF
- Notes from KFD:
- Explained at: http://www.teria.com/~koseki/memo/xbselection/
- Download : http://www.teria.com/~koseki/memo/xbselection/Selection.js
+ Copied from:
+ http://stackoverflow.com/questions/235411/is-there-an-internet-explorer-approved-substitute-for-selectionstart-and-selectio/235582
\* **************************************************************** */
-
-function Selection(textareaElement) {
- this.element = textareaElement;
-}
-
-Selection.prototype.create = function() {
- if (document.selection != null && this.element.selectionStart == null) {
- return this._ieGetSelection();
- } else {
- return this._mozillaGetSelection();
+function getSelection(inputBox) {
+ if ("selectionStart" in inputBox) {
+ return {
+ start: inputBox.selectionStart,
+ end: inputBox.selectionEnd
+ }
}
-}
-Selection.prototype._mozillaGetSelection = function() {
- return {
- start: this.element.selectionStart,
- end: this.element.selectionEnd
- };
-}
+ //and now, the blinkered IE way
+ var bookmark = document.selection.createRange().getBookmark()
+ var selection = inputBox.createTextRange()
+ selection.moveToBookmark(bookmark)
-Selection.prototype._ieGetSelection = function() {
- this.element.focus();
+ var before = inputBox.createTextRange()
+ before.collapse(true)
+ before.setEndPoint("EndToStart", selection)
- var range = document.selection.createRange();
- var bookmark = range.getBookmark();
+ var beforeLength = before.text.length
+ var selLength = selection.text.length
- var contents = this.element.value;
- var originalContents = contents;
- var marker = this._createSelectionMarker();
- while(contents.indexOf(marker) != -1) {
- marker = this._createSelectionMarker();
+ return {
+ start: beforeLength,
+ end: beforeLength + selLength
}
-
- var parent = range.parentElement();
- if (parent == null || parent.type != "textarea") {
- return { start: 0, end: 0 };
- }
- range.text = marker + range.text + marker;
- contents = this.element.value;
-
- var result = {};
- result.start = contents.indexOf(marker);
- contents = contents.replace(marker, "");
- result.end = contents.indexOf(marker);
-
- this.element.value = originalContents;
- range.moveToBookmark(bookmark);
- range.select();
-
- return result;
}
-Selection.prototype._createSelectionMarker = function() {
- return "##SELECTION_MARKER_" + Math.random() + "##";
-}
/* **************************************************************** *\
@@ -3293,12 +3255,13 @@
// Generate the value to send back
x6.console.group("An x6select, fetching from Server");
var val = $(inp).val();
- var val = val.slice(0,inp.selectionStart)
+ var s = getSelection(inp);
+ var val = val.slice(0,s.start)
+keyLabel
- +val.slice(inp.selectionEnd);
+ +val.slice(s.end);
x6.console.log("current value: ",$(inp).val())
- x6.console.log("sel start: ",inp.selectionStart)
- x6.console.log("sel end: ",inp.selectionEnd)
+ x6.console.log("sel start: ",s.start)
+ x6.console.log("sel end: ",s.end)
x6.console.log("computed value:",val);
json = new x6JSON('x6page',x6.p(inp,'x6seltab'));
json.addParm('x6select','Y');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-20 15:38:53
|
Revision: 1282
http://andro.svn.sourceforge.net/andro/?rev=1282&view=rev
Author: kendowns
Date: 2009-02-20 15:38:48 +0000 (Fri, 20 Feb 2009)
Log Message:
-----------
Sourceforge 2616777.
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-02-20 15:33:17 UTC (rev 1281)
+++ trunk/andro/clib/x6.js 2009-02-20 15:38:48 UTC (rev 1282)
@@ -3215,6 +3215,33 @@
// Type validation for some types, only if not TAB or ENTER
if(!isNav ) {
x6.console.log("Not nav key, doing type validation");
+
+ // KFD 2/20/09. Originally this came AFTER type validation,
+ // but that did not allow for alpha chars in
+ // numeric lookups, so I moved it before.
+ // Next possibility is a lookup that requires a
+ // fetch from the server.
+ if(x6.p(inp,'x6select','N')=='Y' && x6.p(inp,'xValues',null)==null) {
+ // Generate the value to send back
+ x6.console.group("An x6select, fetching from Server");
+ var val = $(inp).val();
+ var s = getSelection(inp);
+ var val = val.slice(0,s.start)
+ +keyLabel
+ +val.slice(s.end);
+ x6.console.log("current value: ",$(inp).val())
+ x6.console.log("sel start: ",s.start)
+ x6.console.log("sel end: ",s.end)
+ x6.console.log("computed value:",val);
+ json = new x6JSON('x6page',x6.p(inp,'x6seltab'));
+ json.addParm('x6select','Y');
+ json.addParm('gpletters',val);
+ json.execute(true);
+ x6inputs.x6select.display(inp,null,x6.data.x6select);
+ x6.console.groupEnd();
+ return;
+ }
+
if(x6.p(inp,'xLookup','N')=='Y') {
x6.console.log("This is a lookup input, allowing everything");
x6.console.groupEnd();
@@ -3249,27 +3276,6 @@
break;
}
- // Next possibility is a lookup that requires a
- // fetch from the server.
- if(x6.p(inp,'x6select','N')=='Y' && x6.p(inp,'xValues',null)==null) {
- // Generate the value to send back
- x6.console.group("An x6select, fetching from Server");
- var val = $(inp).val();
- var s = getSelection(inp);
- var val = val.slice(0,s.start)
- +keyLabel
- +val.slice(s.end);
- x6.console.log("current value: ",$(inp).val())
- x6.console.log("sel start: ",s.start)
- x6.console.log("sel end: ",s.end)
- x6.console.log("computed value:",val);
- json = new x6JSON('x6page',x6.p(inp,'x6seltab'));
- json.addParm('x6select','Y');
- json.addParm('gpletters',val);
- json.execute(true);
- x6inputs.x6select.display(inp,null,x6.data.x6select);
- x6.console.groupEnd();
- }
// Yet another possibility is a lookup on a set
// of fixed values.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-02-20 16:21:41
|
Revision: 1283
http://andro.svn.sourceforge.net/andro/?rev=1283&view=rev
Author: kendowns
Date: 2009-02-20 16:21:31 +0000 (Fri, 20 Feb 2009)
Log Message:
-----------
Sourceforge 2616792
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-02-20 15:38:48 UTC (rev 1282)
+++ trunk/andro/clib/x6.js 2009-02-20 16:21:31 UTC (rev 1283)
@@ -3132,7 +3132,7 @@
x6.console.log(inp);
x6.console.log(e);
var keyLabel=x6.keyLabel(e);
-
+
// KFD 1/15/09. Inputs never deal with Ctrl or Alt
if(keyLabel.slice(0,4)=='Ctrl' || keyLabel.slice(0,3)=='Alt') {
x6.console.log('Ctrl or alt, input keydown returning true');
@@ -3151,7 +3151,7 @@
x6.console.log('isNav: ' ,isNav );
// All meta keys return true immediately except TAB and ENTER
- if(isMeta && !isNav) {
+ if(isMeta && !isNav && keyLabel!='BackSpace') {
var handUpList = ['UpArrow','DownArrow','PageUp','PageDown'];
if(handUpList.indexOf(keyLabel)>=0) {
// If we are passing it up or not, it should not be
@@ -3226,9 +3226,15 @@
x6.console.group("An x6select, fetching from Server");
var val = $(inp).val();
var s = getSelection(inp);
- var val = val.slice(0,s.start)
- +keyLabel
- +val.slice(s.end);
+ if(keyLabel=='BackSpace') {
+ var val = val.slice(0,s.start-1)
+ +val.slice(s.end+1);
+ }
+ else {
+ var val = val.slice(0,s.start)
+ +keyLabel
+ +val.slice(s.end);
+ }
x6.console.log("current value: ",$(inp).val())
x6.console.log("sel start: ",s.start)
x6.console.log("sel end: ",s.end)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-03-07 14:00:52
|
Revision: 1309
http://andro.svn.sourceforge.net/andro/?rev=1309&view=rev
Author: kendowns
Date: 2009-03-07 14:00:46 +0000 (Sat, 07 Mar 2009)
Log Message:
-----------
Sourceforge 2668116, allow backspace on all fields unconditionally.
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-03-07 13:49:59 UTC (rev 1308)
+++ trunk/andro/clib/x6.js 2009-03-07 14:00:46 UTC (rev 1309)
@@ -3150,6 +3150,12 @@
x6.console.log('isMeta: ' ,isMeta );
x6.console.log('isNav: ' ,isNav );
+ // KFD Sourceforge 2668116 Allow backspace!
+ if(keyLabel=='BackSpace') {
+ x6.console.groupEnd();
+ return true;
+ }
+
// All meta keys return true immediately except TAB and ENTER
if(isMeta && !isNav && keyLabel!='BackSpace') {
var handUpList = ['UpArrow','DownArrow','PageUp','PageDown'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-03-07 14:36:36
|
Revision: 1310
http://andro.svn.sourceforge.net/andro/?rev=1310&view=rev
Author: kendowns
Date: 2009-03-07 14:36:28 +0000 (Sat, 07 Mar 2009)
Log Message:
-----------
Sourceforge 2668115, clicking new,cancel, then new doesn't work anymore. fixed.
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-03-07 14:00:46 UTC (rev 1309)
+++ trunk/andro/clib/x6.js 2009-03-07 14:36:28 UTC (rev 1310)
@@ -4519,6 +4519,10 @@
self['receiveEvent_reqUndoRow_'+table] = function() {
x6.console.group("tableController reqUndoRow");
x6events.fireEvent('uiUndoRow_'+this.zTable,this.zSkey);
+ // Sourceforge 2668115, new,cancel,new wouldn't work because
+ // tablecontroller still thought it was
+ // on a new row.
+ this.zSkey = -1;
x6.console.groupEnd();
return true;
}
@@ -4690,7 +4694,12 @@
self.receiveEvent_objectFocus = function(id) {
x6.console.group("Object Focus for: "+id+", we are "+this.id);
if(id!=this.id) {
- x6events.fireEvent('buttonsNew_'+this.zTable,false);
+ var x6profile = $(this).attr('x6profile');
+ // Sourceforge 2668115, (tag-along), don't disable
+ // new buttons when losing focus
+ if(x6profile!='twosides') {
+ x6events.fireEvent('buttonsNew_'+this.zTable,false);
+ }
x6events.fireEvent('buttonsEdit_'+this.zTable,false);
x6inputs.objectFocusBlur(this.id);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-03-07 15:12:30
|
Revision: 1311
http://andro.svn.sourceforge.net/andro/?rev=1311&view=rev
Author: kendowns
Date: 2009-03-07 15:12:25 +0000 (Sat, 07 Mar 2009)
Log Message:
-----------
Sourceforge 2671574, auto-complete fields were not visible on modals.
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-03-07 14:36:28 UTC (rev 1310)
+++ trunk/andro/clib/x6.js 2009-03-07 15:12:25 UTC (rev 1311)
@@ -3756,7 +3756,9 @@
overflow: 'hidden',
border: '1px solid black',
cursor: 'pointer',
- zIndex: 1000
+ // KFD Sourceforge 2671574 make zIndex
+ // on top of modal
+ zIndex: 11000
});
$(this.div).addClass('x6select');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-03-20 14:07:48
|
Revision: 1319
http://andro.svn.sourceforge.net/andro/?rev=1319&view=rev
Author: kendowns
Date: 2009-03-20 14:07:40 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
Sourceforge 2697442, Child detail tables must size according to window height.
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-03-07 16:27:08 UTC (rev 1318)
+++ trunk/andro/clib/x6.js 2009-03-20 14:07:40 UTC (rev 1319)
@@ -6566,6 +6566,10 @@
/*
* Core function: display myself
*/
+
+ // KFD 3/20/09 Sourceforge 2697442
+ // STRAY CODE, EARLIER VERSION
+ /*
self.display = function(title) {
if(title==null) title = '';
@@ -6660,7 +6664,7 @@
}
);
}
-
+ */
}
@@ -6669,7 +6673,7 @@
* Core function: display one of them
*/
display: function(id) {
- x6.console.group("x6modals.display: "+id);
+ x6.console.group("x6modals.display: "+id);
// start by making everybody inside the modal
// invisible, then make the one we are interested
// in visible later on
@@ -6703,6 +6707,19 @@
var mw = $('#x6modal').width();
var ww = $(window).width();
var wh = $(window).height();
+
+ // KFD 3/20/09 Sourceforge 2697442
+ // Must set height by window, shrink it
+ // down if necessary
+ // Prefix "con" means "content"
+ // Inr = Inner, Otr = Outer, Ht = Height
+ var conInrHt = $('#'+id).attr('xInnerHeight');
+ var conOtrHt = $('#'+id).attr('xHeight');
+ var delta = conOtrHt - conInrHt;
+ var conOtrHtNew = wh-100;
+ var conInrHtNew = conOtrHtNew - delta;
+ $('#'+id).height(conOtrHtNew);
+ $('#'+id+"_inner").height(conInrHtNew);
// now center this guy.
var left = Math.floor( (ww-mw)/2 );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-04-04 13:16:13
|
Revision: 1334
http://andro.svn.sourceforge.net/andro/?rev=1334&view=rev
Author: kendowns
Date: 2009-04-04 13:16:11 +0000 (Sat, 04 Apr 2009)
Log Message:
-----------
Sourceforge 2706257
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-04-04 13:11:28 UTC (rev 1333)
+++ trunk/andro/clib/x6.js 2009-04-04 13:16:11 UTC (rev 1334)
@@ -6736,12 +6736,16 @@
$('#'+id).height(conOtrHtNew);
$('#'+id+"_inner").height(conInrHtNew);
+ // KFD 4/4/09 Sourceforge 2706257
+ // get scrolltop of window
+ var windowScrollTop = $(window).scrollTop();
+
// now center this guy.
var left = Math.floor( (ww-mw)/2 );
$('#x6modal')
.css('display','none')
.css('left',left)
- .css('top',50)
+ .css('top',windowScrollTop + 50)
.fadeIn('fast',
function() {
x6events.fireEvent('objectFocus',id);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ken...@us...> - 2009-04-16 19:12:35
|
Revision: 1352
http://andro.svn.sourceforge.net/andro/?rev=1352&view=rev
Author: kendowns
Date: 2009-04-16 19:12:26 +0000 (Thu, 16 Apr 2009)
Log Message:
-----------
1) Sourceforge 2769228, + and - keys inc/dec values of numeric fields
2) No sourceforge #, a routine named <table>_<column>_afterBlur(inp), if exists, will be called when a control loses focus.
Modified Paths:
--------------
trunk/andro/clib/x6.js
Modified: trunk/andro/clib/x6.js
===================================================================
--- trunk/andro/clib/x6.js 2009-04-15 22:35:08 UTC (rev 1351)
+++ trunk/andro/clib/x6.js 2009-04-16 19:12:26 UTC (rev 1352)
@@ -3290,11 +3290,26 @@
switch(type) {
case 'int':
x6.console.log("type validation for int");
+ // KFD 4/16/09 Sourceforge 2769228
+ if(keyLabel=='+' || keyLabel=='-') {
+ var val=Number($(inp).val());
+ if(keyLabel=='+') val++; else val--;
+ $(inp).val(val);
+ return false;
+ break;
+ }
if(!x6.keyIsNumeric(e)) return false;
break;
case 'numb':
case 'money':
x6.console.log("type validation for numb/money");
+ // KFD 4/16/09 Sourceforge 2769228
+ if(keyLabel=='+' || keyLabel=='-') {
+ var val=Number($(inp).val());
+ if(keyLabel=='+') val++; else val--;
+ $(inp).val(val);
+ break;
+ }
if(!x6.keyIsNumeric(e) && x6.keyLabel(e)!='.') return false;
break;
case 'date':
@@ -3519,8 +3534,12 @@
return false;
}
inp.inblur = true;
+ // Get possible name of global function to handle afterBlur
+ var fBlur = 'afterBlur_'
+ + x6.p(inp,'xTableId')
+ + '_' + x6.p(inp,'xColumnId')
// If method does not exist forget it
- if(!inp.afterBlur) {
+ if(!inp.afterBlur && eval("typeof("+fBlur+")") !='function') {
x6.console.log("No afterBlur(), leaving flag set and returning");
x6.console.groupEnd();
return true;
@@ -3537,7 +3556,11 @@
// not be fired again for this value. It does not mean there
// is anything particularly "valid" or correct about the
// value.
- if(inp.afterBlur()) {
+ var afterBlurResult
+ = inp.afterBlur
+ ? inp.afterBlur()
+ : eval(fBlur+"(inp)");
+ if(afterBlurResult) {
x6.console.log("Afterblurner setting flag false, return true");
x6.console.groupEnd();
inp.inblur = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X