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)

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]);