]> git.sesse.net Git - casparcg/commitdiff
[html] support CG INVOKE with parameter list formatted according to javascript syntax
authorHelge Norberg <helge.norberg@svt.se>
Mon, 1 Sep 2014 14:52:59 +0000 (16:52 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Mon, 1 Sep 2014 14:52:59 +0000 (16:52 +0200)
modules/html/producer/html_producer.cpp

index 1f7321eab2ec10aa4f5bf0f7b6871ed2b1672e72..9d651ea872ca60c3b91520abb211e25aeaa4751e 100644 (file)
@@ -539,7 +539,10 @@ namespace caspar {
                                }
                                else if (boost::regex_match(param, what, invoke_exp))
                                {
-                                       javascript = (boost::wformat(L"%1%()") % boost::algorithm::trim_copy_if(what["VALUE"].str(), boost::is_any_of(" \""))).str();
+                                       auto function_call = boost::algorithm::trim_copy_if(what["VALUE"].str(), boost::is_any_of(" \""));
+
+                                       // Append empty () if no parameter list has been given
+                                       javascript = boost::ends_with(function_call, ")") ? function_call : function_call + L"()";
                                }
 
                                client_->execute_javascript(javascript);