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

Don't use dollar sign in the JavaScript variable name neither

Browse Source 
While it is allowed there, it is confusing and unnecessary.

Also improve the comment explaining why do we need this output variable
name at all and why does it need to be unique.
This commit is contained in:
Vadim Zeitlin 2017-10-22 17:30:30 +02:00
parent 71522731c6
commit 1b7bb46568
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/private/jsscriptwrapper.h
View File

@ -21,9 +21,14 @@ class wxJSScriptWrapper
public:
wxJSScriptWrapper(const wxString& js, int* runScriptCount) : m_jsscript(js)
{
// __outputVarName is used to have a different variable on every
// RunScript call, to not lose variable values between calls
m_outputVarName = wxString::Format("__wx$%i", (*runScriptCount)++);
// We assign the return value of JavaScript snippet we execute to the
// variable with this name in order to be able to access it later if
// needed.
//
// Note that we use a different name for it for each call to
// RunScript() (which creates a new wxJSScriptWrapper every time) to
// avoid any possible conflict between different calls.
m_outputVarName = wxString::Format("__wxOut%i", (*runScriptCount)++);
}
// This method is used to add a double quote level into a JavaScript code