Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consistently capitalize "JavaScript"

Browse Source 
This is the proper name of the language, not "Javascript".
This commit is contained in:
Vadim Zeitlin
2017-10-21 23:26:42 +02:00
parent ec54ddb66b
commit ee9615b9ac
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
interface/wx/webview.h
View File

@@ -478,12 +478,12 @@ public:
outputs are supported on wxWEBVIEW_WEBKIT2 (GTK3). outputs are supported on wxWEBVIEW_WEBKIT2 (GTK3).
When using wxWEBVIEW_WEBKIT (OSX), there are two limits: When using wxWEBVIEW_WEBKIT (OSX), there are two limits:
1) Javascript allocations greater than 10MB. 1) JavaScript allocations greater than 10MB.
2) Javascript that takes longer than 10 seconds to execute. 2) JavaScript that takes longer than 10 seconds to execute.
When using wxWEBVIEW_BACKEND_IE you must wait for the current When using wxWEBVIEW_BACKEND_IE you must wait for the current
page to finish loading before calling RunScript(). page to finish loading before calling RunScript().
It is compulsory to have a script tag inside HTML to run Javascript, on MSW. It is compulsory to have a script tag inside HTML to run JavaScript, on MSW.
When using wxWEBVIEW_BACKEND_IE, JSON is not available in Quirks or When using wxWEBVIEW_BACKEND_IE, JSON is not available in Quirks or
IE6/7 standards mode, which is unfortunately the default one for the embedded browser control, see IE6/7 standards mode, which is unfortunately the default one for the embedded browser control, see
@@ -499,7 +499,7 @@ public:
@endcode @endcode
2) There is an implementation of JSON.stringify on RunScript that helps to return objects. 2) There is an implementation of JSON.stringify on RunScript that helps to return objects.
You don't need to change IE emulation level but it could not work for some cases. You don't need to change IE emulation level but it could not work for some cases.
@param javascript A wxString containing the Javascript. @param javascript A wxString containing the JavaScript.
@param output wxString result pointer. It can be NULL and it is new in wxWidgets 3.1.1. @param output wxString result pointer. It can be NULL and it is new in wxWidgets 3.1.1.
@return @true if there is a result, @false if there is an error. @return @true if there is a result, @false if there is an error.
*/ */

6
src/gtk/webview_webkit2.cpp
View File

@@ -1141,7 +1141,7 @@ bool wxWebViewWebKit::RunScriptSync(const wxString& javascript, wxString* output
if ( !js_result ) if ( !js_result )
{ {
wxLogWarning(_("Error running Javascript: %s"), error.GetMessage()); wxLogWarning(_("Error running JavaScript: %s"), error.GetMessage());
return false; return false;
} }
@@ -1159,7 +1159,7 @@ bool wxWebViewWebKit::RunScriptSync(const wxString& javascript, wxString* output
if ( exception ) if ( exception )
{ {
wxJSStringRef ex_value(JSValueToStringCopy(context, exception, NULL)); wxJSStringRef ex_value(JSValueToStringCopy(context, exception, NULL));
wxLogWarning(_("Exception running Javascript: %s"), ex_value.ToWxString()); wxLogWarning(_("Exception running JavaScript: %s"), ex_value.ToWxString());
return false; return false;
} }
@@ -1184,7 +1184,7 @@ bool wxWebViewWebKit::RunScript(const wxString& javascript, wxString* output)
return true; return true;
} }
wxLogWarning(_("Javascript error: %s"), result); wxLogWarning(_("JavaScript error: %s"), result);
return false; return false;
} }

8
src/msw/webview_ie.cpp
View File

@@ -885,7 +885,7 @@ bool wxWebViewIE::RunScriptInternal(wxVariant varJavascript, wxAutomationObject*
{ {
if ( !scriptAO->Invoke("eval", DISPATCH_METHOD, *varResult, 1, &varJavascript) ) if ( !scriptAO->Invoke("eval", DISPATCH_METHOD, *varResult, 1, &varJavascript) )
{ {
wxLogWarning(_("Can't run Javascript")); wxLogWarning(_("Can't run JavaScript"));
return false; return false;
} }
@@ -899,13 +899,13 @@ bool wxWebViewIE::RunScript(const wxString& javascript, wxString* output)
if ( !document ) if ( !document )
{ {
wxLogWarning(_("Can't run Javascript script without a valid HTML document")); wxLogWarning(_("Can't run JavaScript script without a valid HTML document"));
return false; return false;
} }
if ( FAILED(document->get_Script(&scriptDispatch)) ) if ( FAILED(document->get_Script(&scriptDispatch)) )
{ {
wxLogWarning(_("Can't get the Javascript")); wxLogWarning(_("Can't get the JavaScript"));
return false; return false;
} }
@@ -933,7 +933,7 @@ bool wxWebViewIE::RunScript(const wxString& javascript, wxString* output)
return true; return true;
} }
wxLogWarning(_("Javascript error: %s"), varResult.MakeString()); wxLogWarning(_("JavaScript error: %s"), varResult.MakeString());
return false; return false;
} }

2
src/osx/webview_webkit.mm
View File

@@ -439,7 +439,7 @@ bool wxWebViewWebKit::RunScript(const wxString& javascript, wxString* output)
else else
{ {
if ( result != nil ) if ( result != nil )
wxLogWarning(_("Javascript error: %s"), wxCFStringRef::AsString(result)); wxLogWarning(_("JavaScript error: %s"), wxCFStringRef::AsString(result));
return false; return false;
} }
return true; return true;