summaryrefslogtreecommitdiff
path: root/webapps/qooxdoo-0.6.3-sdk/frontend
diff options
context:
space:
mode:
authorDerrell Lipman <derrell@samba.org>2007-01-05 21:20:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:37:02 -0500
commit21664e91abe0a06a9716e59076a0f3dcf638ded7 (patch)
treed15d2a331650fd66cb0f6f7635426d96b0f8dd99 /webapps/qooxdoo-0.6.3-sdk/frontend
parentd0e221c4e097b53184ad4a877a1d062eaa10390c (diff)
downloadsamba-21664e91abe0a06a9716e59076a0f3dcf638ded7.tar.gz
samba-21664e91abe0a06a9716e59076a0f3dcf638ded7.tar.bz2
samba-21664e91abe0a06a9716e59076a0f3dcf638ded7.zip
r20569: Web Application Framework
- Fix handling of predicates in finite state machine - Make use of predicates to handle a specific PermissionDenied failure, vs some other generic failure - Add JSON-RPC error constants (This used to be commit 38ae9658cb52149d66f910582d8b55fe954650fb)
Diffstat (limited to 'webapps/qooxdoo-0.6.3-sdk/frontend')
-rw-r--r--webapps/qooxdoo-0.6.3-sdk/frontend/framework/source/class/qx/util/fsm/State.js11
1 files changed, 7 insertions, 4 deletions
diff --git a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/source/class/qx/util/fsm/State.js b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/source/class/qx/util/fsm/State.js
index fc054e304a..718961d0b5 100644
--- a/webapps/qooxdoo-0.6.3-sdk/frontend/framework/source/class/qx/util/fsm/State.js
+++ b/webapps/qooxdoo-0.6.3-sdk/frontend/framework/source/class/qx/util/fsm/State.js
@@ -493,14 +493,17 @@ qx.Proto._checkEvents = function(propValue, propData)
for (action_e in action)
{
if (typeof(action[action_e]) == "number" &&
- action != qx.util.fsm.FiniteStateMachine.EventHandling.PREDICATE &&
- action != qx.util.fsm.FiniteStateMachine.EventHandling.BLOCKED)
+ action[action_e] !=
+ qx.util.fsm.FiniteStateMachine.EventHandling.PREDICATE &&
+ action[action_e] !=
+ qx.util.fsm.FiniteStateMachine.EventHandling.BLOCKED)
{
throw new Error("Invalid numeric value in events object " +
"(" + e + "): " +
action_e + ": " + action[action_e]);
}
- else if (typeof(action[action_e]) != "string")
+ else if (typeof(action[action_e]) != "string" &&
+ typeof(action[action_e]) != "number")
{
throw new Error("Invalid value in events object " +
"(" + e + "): " +
@@ -508,7 +511,7 @@ qx.Proto._checkEvents = function(propValue, propData)
}
}
}
- else if (typeof(action) != "string")
+ else if (typeof(action) != "string" && typeof(action) != "number")
{
throw new Error("Invalid value in events object: " +
e + ": " + propValue[e]);