added resultPromise variable to generated staticCommand

riganti · Jul 13, 2016 · 6b169b4 · 6b169b4
1 parent 84b0234
commit 6b169b4
Showing 1 changed file with 46 additions and 45 deletions.
diff --git a/src/DotVVM.Framework/Compilation/StaticCommandBindingCompilationAttribute.cs b/src/DotVVM.Framework/Compilation/StaticCommandBindingCompilationAttribute.cs
@@ -9,55 +9,56 @@
 
 namespace DotVVM.Framework.Compilation
 {
-    public class StaticCommandBindingCompilationAttribute : CommandBindingCompilationAttribute
-    {
-        public override string CompileToJavascript(ResolvedBinding binding, CompiledBindingExpression compiledExpression)
-        {
-            var expression = binding.GetExpression();
+	public class StaticCommandBindingCompilationAttribute : CommandBindingCompilationAttribute
+	{
+		public override string CompileToJavascript(ResolvedBinding binding, CompiledBindingExpression compiledExpression)
+		{
+			var expression = binding.GetExpression();
 
-            var visitor = new ExtractExpressionVisitor(ex => ex.NodeType == ExpressionType.Call);
-            var rootCallback = visitor.Visit(expression);
-            var js = SouldCompileCallback(rootCallback) ? JavascriptTranslator.CompileToJavascript(rootCallback, binding.DataContextTypeStack) : null;
-            foreach (var param in visitor.ParameterOrder.Reverse<ParameterExpression>())
-            {
-                var callback = js == null ? null : $"function({param.Name}){{{js}}}";
-                var method = visitor.Replaced[param] as MethodCallExpression;
-                js = CompileMethodCall(method, binding.DataContextTypeStack, callback);
-            }
-            return "var $context = ko.contextFor(this);var sender = this;(function(i_pageArea){with($context){" + js + "}})";
-        }
+			var visitor = new ExtractExpressionVisitor(ex => ex.NodeType == ExpressionType.Call);
+			var rootCallback = visitor.Visit(expression);
+			var js = SouldCompileCallback(rootCallback) ? "resultPromise.resolve(" + JavascriptTranslator.CompileToJavascript(rootCallback, binding.DataContextTypeStack) + ")" : null;
+			foreach (var param in visitor.ParameterOrder.Reverse<ParameterExpression>())
+			{
+				if (js == null) js = $"resultPromise.resolve({param.Name})";
+				var callback = $"function({param.Name}){{{js}}}";
+				var method = visitor.Replaced[param] as MethodCallExpression;
+				js = CompileMethodCall(method, binding.DataContextTypeStack, callback);
+			}
+			return "var $context = ko.contextFor(this);var sender = this;var resultPromise = new DotvvmPromise();(function(i_pageArea){with($context){" + js + "}})";
+		}
 
-        protected virtual bool SouldCompileCallback(Expression c)
-        {
-            if (c.NodeType == ExpressionType.Parameter) return false;
-            return true;
-        }
+		protected virtual bool SouldCompileCallback(Expression c)
+		{
+			if (c.NodeType == ExpressionType.Parameter) return false;
+			return true;
+		}
 
-        protected virtual string CompileMethodCall(MethodCallExpression methodExpression, DataContextStack dataContext, string callbackFunction = null)
-        {
-            if (!Attribute.IsDefined(methodExpression.Method, typeof(AllowStaticCommandAttribute)))
-                throw new Exception($"Method '{methodExpression.Method.DeclaringType.Name}.{methodExpression.Method.Name}' used in static command has to be marked with [AllowStaticCommand] attribute.");
+		protected virtual string CompileMethodCall(MethodCallExpression methodExpression, DataContextStack dataContext, string callbackFunction = null)
+		{
+			if (!Attribute.IsDefined(methodExpression.Method, typeof(AllowStaticCommandAttribute)))
+				throw new Exception($"Method '{methodExpression.Method.DeclaringType.Name}.{methodExpression.Method.Name}' used in static command has to be marked with [AllowStaticCommand] attribute.");
 
-            if (callbackFunction == null) callbackFunction = "null";
-            if (methodExpression == null)
-            {
-                throw new NotSupportedException("Static command binding must be a method call!");
-            }
-            var argsScript = GetArgsScript(methodExpression, dataContext);
-            return $"dotvvm.staticCommandPostback(i_pageArea, sender, '{GetMethodName(methodExpression)}', { argsScript }, {callbackFunction})";
-        }
+			if (callbackFunction == null) callbackFunction = "null";
+			if (methodExpression == null)
+			{
+				throw new NotSupportedException("Static command binding must be a method call!");
+			}
+			var argsScript = GetArgsScript(methodExpression, dataContext);
+			return $"dotvvm.staticCommandPostback(i_pageArea, sender, '{GetMethodName(methodExpression)}', { argsScript }, {callbackFunction})";
+		}
 
-        public static string GetArgsScript(MethodCallExpression expression, DataContextStack dataContext)
-        {
-            var target = expression.Object == null ? null : JavascriptTranslator.CompileToJavascript(expression.Object, dataContext);
-            var arguments = (target == null ? new string[0] : new[] { target })
-                .Concat(expression.Arguments.Select(a => JavascriptTranslator.CompileToJavascript(a, dataContext)));
-            return "[" + String.Join(", ", arguments) + "]";
-        }
+		public static string GetArgsScript(MethodCallExpression expression, DataContextStack dataContext)
+		{
+			var target = expression.Object == null ? null : JavascriptTranslator.CompileToJavascript(expression.Object, dataContext);
+			var arguments = (target == null ? new string[0] : new[] { target })
+				.Concat(expression.Arguments.Select(a => JavascriptTranslator.CompileToJavascript(a, dataContext)));
+			return "[" + String.Join(", ", arguments) + "]";
+		}
 
-        public static string GetMethodName(MethodCallExpression methodInvocation)
-        {
-            return methodInvocation.Method.DeclaringType.AssemblyQualifiedName + "." + methodInvocation.Method.Name;
-        }
-    }
+		public static string GetMethodName(MethodCallExpression methodInvocation)
+		{
+			return methodInvocation.Method.DeclaringType.AssemblyQualifiedName + "." + methodInvocation.Method.Name;
+		}
+	}
 }