suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding some more error trapping on the tree navigation primitives

Browse Source
This commit is contained in:
Danny Yoo 2011-11-21 18:34:50 -05:00
parent 2c44867618
commit c91e2f2dbb
2 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
web-world/js-impl.js
View File

@ -1562,6 +1562,11 @@
var checkMockView = plt.baselib.check.makeCheckArgumentType(
isMockView, 'view');
var checkMockViewOnElement = plt.baselib.check.makeCheckArgumentType(
function(x) {
return isMockView(x) && (!(x.cursor.isOnAtomicElement()));
},
'element-focused view');
var checkSelector = plt.baselib.check.makeCheckArgumentType(
@ -1719,7 +1724,13 @@
1,
function(MACHINE) {
var view = checkMockView(MACHINE, 'view-left', 0);
return view.left();
try {
return view.left();
} catch (e) {
plt.baselib.exceptions.raise(
MACHINE,
new Error("unable to focus left"));
}
});
EXPORTS['view-right'] = makePrimitiveProcedure(
@ -1727,7 +1738,13 @@
1,
function(MACHINE) {
var view = checkMockView(MACHINE, 'view-right', 0);
return view.right();
try {
return view.right();
} catch (e) {
plt.baselib.exceptions.raise(
MACHINE,
new Error("unable to focus right"));
}
});
EXPORTS['view-up'] = makePrimitiveProcedure(
@ -1735,7 +1752,13 @@
1,
function(MACHINE) {
var view = checkMockView(MACHINE, 'view-up', 0);
return view.up();
try {
return view.up();
} catch (e) {
plt.baselib.exceptions.raise(
MACHINE,
new Error("unable to focus up"));
}
});
EXPORTS['view-down'] = makePrimitiveProcedure(
@ -1743,7 +1766,13 @@
1,
function(MACHINE) {
var view = checkMockView(MACHINE, 'view-down', 0);
return view.down();
try {
return view.down();
} catch(e) {
plt.baselib.exceptions.raise(
MACHINE,
new Error("unable to focus down"));
}
});
EXPORTS['view-forward'] = makePrimitiveProcedure(
@ -1751,7 +1780,13 @@
1,
function(MACHINE) {
var view = checkMockView(MACHINE, 'view-forward', 0);
return view.forward();
try {
return view.forward();
} catch(e) {
plt.baselib.exceptions.raise(
MACHINE,
new Error("unable to focus forward"));
}
});
EXPORTS['view-backward'] = makePrimitiveProcedure(
@ -1759,7 +1794,13 @@
1,
function(MACHINE) {
var view = checkMockView(MACHINE, 'view-backward', 0);
return view.backward();
try {
return view.backward();
} catch(e) {
plt.baselib.exceptions.raise(
MACHINE,
new Error("unable to focus backward"));
}
});
@ -1946,7 +1987,7 @@
'view-append-child',
2,
function(MACHINE) {
var view = checkMockView(MACHINE, 'view-append-child', 0);
var view = checkMockViewOnElement(MACHINE, 'view-append-child', 0);
var x = MACHINE.e[MACHINE.e.length - 2];
PAUSE(function(restart) {
coerseToDomNode(x,

4
web-world/js-tree-cursor.js
View File

@ -28,6 +28,10 @@ var TreeCursor = (function() {
this.atomicF = atomicF;
};
TreeCursor.prototype.isOnAtomicElement = function() {
return this.atomicF(this.node);
};
TreeCursor.prototype.canDown = function() {
return (!(this.atomicF(this.node)) &&
this.openF(this.node).length !== 0);