Improved the command emiting and handling utils.

rapidoid · Nov 1, 2015 · fc956d6 · fc956d6
1 parent 154f8f3
commit fc956d6
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 16 deletions.
diff --git a/assets-ng/emit.js b/assets-ng/emit.js
@@ -36,12 +36,21 @@ Rapidoid.initializer(function($scope) {
             }
         }
 
-        $.post(window.location.href, {
+        inputs._cmd = eventId;
-            _event : eventId,
+        inputs._state = window.__state;
-            _args : eventArgs,
+
-            _inputs : JSON.stringify(inputs),
+        for (var i = 0; i < eventArgs.length; i++) {
-            __state : window.__state
+            inputs['_' + i] = eventArgs[i];
-        }).done(function(data) {
+        }
+
+        $.post(window.location.href, inputs).done(function(data) {
+
+            if (typeof data === 'string' || data instanceof String) {
+                $scope.ajaxBodyContent = data;
+                $scope.$apply();
+                return;
+            }
+
             if (data._redirect_) {
                 _goAt(data._redirect_);
                 return;

diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractCommandWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractCommandWidget.java
@@ -21,21 +21,20 @@
  */
 
 import java.util.Arrays;
-import java.util.List;
+import java.util.Map;
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.ctx.Ctx;
 import org.rapidoid.u.U;
-import org.rapidoid.util.D;
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.2.0")
 public abstract class AbstractCommandWidget<W extends AbstractCommandWidget<?>> extends AbstractWidget {
 
 	private String command;
 
-	private Object[] cmdArgs;
+	private String[] cmdArgs;
 
 	private Runnable handler;
 
@@ -44,28 +43,39 @@ public abstract class AbstractCommandWidget<W extends AbstractCommandWidget<?>>
 	@SuppressWarnings("unchecked")
 	public W command(String cmd, Object... cmdArgs) {
 		this.command = cmd;
-		this.cmdArgs = cmdArgs;
+		this.cmdArgs = strArgs(cmdArgs);
 
 		handleEventIfReady();
 
 		return (W) this;
 	}
 
+	private String[] strArgs(Object[] args) {
+		String[] strs = new String[args.length];
+
+		for (int i = 0; i < args.length; i++) {
+			strs[i] = U.str(args[i]).replace("'", "`");
+		}
+
+		return strs;
+	}
+
 	protected void handleEventIfReady() {
 		if (!handled && handler != null && command != null) {
 			Ctx ctx = ctx();
+			Map<String, Object> data = ctx.data();
 
 			if ("POST".equalsIgnoreCase(ctx.verb())) {
-				String event = U.str(ctx.data().get("_event"));
+				String event = U.str(data.get("_cmd"));
 
 				if (!U.isEmpty(event) && U.eq(event, command)) {
-					List<Object> argList = U.cast(ctx.data().get("_args"));
+
-					Object[] args = argList != null ? U.array(argList) : new Object[0];
+					Object[] args = new Object[cmdArgs.length];
-					D.print(args);
+					for (int i = 0; i < args.length; i++) {
-					D.print(cmdArgs);
+						args[i] = U.get(data, "_" + i, "");
+					}
 
 					if (Arrays.equals(args, cmdArgs)) {
-						System.out.println("EQ");
 						handled = true;
 						handler.run();
 					}