Revision: 3179
http://vexi.svn.sourceforge.net/vexi/?rev=3179&view=rev
Author: clrg
Date: 2008-11-06 02:01:40 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
Clean up and fixes
Modified Paths:
--------------
trunk/widgets/org.vexi.guide/.vexipath
trunk/widgets/org.vexi.guide/src/org/vexi/guide/board.t
trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/scriptid.t
Modified: trunk/widgets/org.vexi.guide/.vexipath
===================================================================
--- trunk/widgets/org.vexi.guide/.vexipath 2008-11-06 01:16:17 UTC (rev
3178)
+++ trunk/widgets/org.vexi.guide/.vexipath 2008-11-06 02:01:40 UTC (rev
3179)
@@ -2,5 +2,9 @@
"source" : [
"F/org.vexi.guide/src"
],
- "projects" : [ ]
+ "projects" : [
+ "P/org.vexi.vunit",
+ "P/org.vexi.widgets",
+ "P/vexi.font"
+ ]
}
\ No newline at end of file
Modified: trunk/widgets/org.vexi.guide/src/org/vexi/guide/board.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/board.t 2008-11-06
01:16:17 UTC (rev 3178)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/board.t 2008-11-06
02:01:40 UTC (rev 3179)
@@ -129,7 +129,7 @@
if (i.object.visible) {
i.object.overlay.display = true;
i.object.active = false;
- surf.selected = i.object;
+ surface.selected = i.object;
} else {
if (i.object.overlay)
i.object.overlay.thisbox = null;
@@ -142,22 +142,22 @@
/** set selected state on selected uiobject */
var surfaceSelectWrite = function(v) {
if (v == selected) return;
- if (surf.selected) surf.selected.selected = false;
+ var s = surface;
+ if (s and s.selected) s.selected.selected = false;
cascade = v;
- if (surf.selected) surf.selected.selected = true;
+ if (s and s.selected) s.selected.selected = true;
}
- var surf;
- surface ++= function(v) {
- if (surf) {
- surf.insert --= surfaceInsertWrite;
- surf.selected --= surfaceSelectWrite;
+ thisbox.visible ++= function(v) {
+ var s = surface;
+ if (!v and s) {
+ s.insert --= surfaceInsertWrite;
+ s.selected --= surfaceSelectWrite;
}
cascade = v;
- surf = surface;
- if (surf) {
- surf.insert ++= surfaceInsertWrite;
- surf.selected ++= surfaceSelectWrite;
+ if (v and s) {
+ s.insert ++= surfaceInsertWrite;
+ s.selected ++= surfaceSelectWrite;
}
}
@@ -186,7 +186,7 @@
var selectObject = function(v) {
cascade = v;
- if (selectreq == trapee) surf.selected = trapee.object;
+ if (selectreq == trapee) surface.selected = trapee.object;
trapee.Leave --= dragObject;
trapee.Release1 --= callee;
}
@@ -204,7 +204,7 @@
/** deselect if clicking on the background */
Press1 ++= function(v) {
if (insert) surface.insert = null;
- else surf.selected = null;
+ else surface.selected = null;
return;
}
@@ -302,7 +302,7 @@
switch (v) {
// remove selected object, protecting canvas[0]
case "delete":
- var s = surf.selected;
+ var s = surface.selected;
if (s and s != $canvas[0]) {
s.overlay.thisbox = null;
s.thisbox = null;
@@ -312,7 +312,7 @@
// cancel an insert request, otherwise deselect
case "escape":
if (insert) surface.insert = null;
- else surf.selected = null;
+ else surface.selected = null;
break;
}
}
Modified: trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/scriptid.t
===================================================================
--- trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/scriptid.t
2008-11-06 01:16:17 UTC (rev 3178)
+++ trunk/widgets/org.vexi.guide/src/org/vexi/guide/property/scriptid.t
2008-11-06 02:01:40 UTC (rev 3179)
@@ -29,7 +29,7 @@
$scriptid.focused ++= function(v) {
cascade = v;
- if (!v and scriptid!=$scriptid.text) {
+ if (target and !v and scriptid!=$scriptid.text) {
var s = surface;
var id = $scriptid.text;
if (id!="" and s.scriptids[id]) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
