Merge pull request #5442 from livecodepanos/bugfix-19666

livecodepanos · web-flow · commit b06b0b1e805b · 2017-05-09T15:57:56.000+01:00
[Bug 19666] Make sure the delimiter in javascriptHandlers is '\n'
diff --git a/docs/notes/bugfix-19666.md b/docs/notes/bugfix-19666.md
@@ -0,0 +1 @@
+# Make sure you can set more than one javascriptHandlers on CEF Browser
diff --git a/libbrowser/src/libbrowser_cef.cpp b/libbrowser/src/libbrowser_cef.cpp
@@ -1597,7 +1597,7 @@ bool MCCefBrowserBase::SetJavaScriptHandlers(const char *p_handlers)
 	if (!MCCStringIsEmpty(t_new_handlers))
 	{
 		if (t_success)
-			t_success = MCCStringSplit(t_new_handlers, ',', t_handlers, t_handler_count);
+			t_success = MCCStringSplit(t_new_handlers, '\n', t_handlers, t_handler_count);
 		
 		if (t_success)
 			t_success = t_handler_list->SetSize(t_handler_count);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Make sure you can set more than one javascriptHandlers on CEF Browser`
Original file line number	Diff line number	Diff line change
`@@ -1597,7 +1597,7 @@ bool MCCefBrowserBase::SetJavaScriptHandlers(const char *p_handlers)`
`1597`	`1597`	`if (!MCCStringIsEmpty(t_new_handlers))`
`1598`	`1598`	`{`
`1599`	`1599`	`if (t_success)`
`1600`		`- t_success = MCCStringSplit(t_new_handlers, ',', t_handlers, t_handler_count);`
	`1600`	`+ t_success = MCCStringSplit(t_new_handlers, '\n', t_handlers, t_handler_count);`
`1601`	`1601`
`1602`	`1602`	`if (t_success)`
`1603`	`1603`	`t_success = t_handler_list->SetSize(t_handler_count);`