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

Don't prompt before running canned JavaScript in the sample

Browse Source 
This is more annoying than helpful, just run the script without
prompting and do remember the last snippet we ran to show it in the
interactive "Run Script" dialog later if necessary.
This commit is contained in:
Vadim Zeitlin
2017-10-22 03:23:40 +02:00
parent 9d6bd9a52d
commit 732cb97af3
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
samples/webview/webview.cpp
View File

@@ -136,7 +136,7 @@ public:
void OnScrollLineDown(wxCommandEvent&) { m_browser->LineDown(); } void OnScrollLineDown(wxCommandEvent&) { m_browser->LineDown(); }
void OnScrollPageUp(wxCommandEvent&) { m_browser->PageUp(); } void OnScrollPageUp(wxCommandEvent&) { m_browser->PageUp(); }
void OnScrollPageDown(wxCommandEvent&) { m_browser->PageDown(); } void OnScrollPageDown(wxCommandEvent&) { m_browser->PageDown(); }
void RunScript(const wxString& javascript = wxString()); void RunScript(const wxString& javascript);
void OnRunScriptString(wxCommandEvent& evt); void OnRunScriptString(wxCommandEvent& evt);
void OnRunScriptInteger(wxCommandEvent& evt); void OnRunScriptInteger(wxCommandEvent& evt);
void OnRunScriptDouble(wxCommandEvent& evt); void OnRunScriptDouble(wxCommandEvent& evt);
@@ -234,6 +234,9 @@ private:
wxMenuHistoryMap m_histMenuItems; wxMenuHistoryMap m_histMenuItems;
wxString m_findText; wxString m_findText;
int m_findFlags, m_findCount; int m_findFlags, m_findCount;
// Last executed JavaScript snippet, for convenience.
wxString m_javascript;
}; };
class SourceViewDialog : public wxDialog class SourceViewDialog : public wxDialog
@@ -1051,19 +1054,14 @@ void WebFrame::OnHistory(wxCommandEvent& evt)
void WebFrame::RunScript(const wxString& javascript) void WebFrame::RunScript(const wxString& javascript)
{ {
wxString message; // Remember the script we run in any case, so the next time the user opens
if ( javascript.empty() ) // the "Run Script" dialog box, it is shown there for convenient updating.
message = "Please enter JavaScript code to execute"; m_javascript = javascript;
else
message = "Click \"OK\" to accept running this JavaScript code";
wxTextEntryDialog dialog(this, message, wxGetTextFromUserPromptStr, javascript, wxLogMessage("Running JavaScript:\n%s\n", javascript);
wxOK | wxCANCEL | wxCENTRE | wxTE_MULTILINE);
if( dialog.ShowModal() != wxID_OK )
return;
wxString result; wxString result;
if ( m_browser->RunScript(dialog.GetValue(), &result) ) if ( m_browser->RunScript(javascript, &result) )
{ {
wxLogMessage("RunScript() returned \"%s\"", result); wxLogMessage("RunScript() returned \"%s\"", result);
} }
@@ -1154,7 +1152,18 @@ void WebFrame::OnRunScriptArrayWithEmulationLevel(wxCommandEvent& WXUNUSED(evt))
void WebFrame::OnRunScriptCustom(wxCommandEvent& WXUNUSED(evt)) void WebFrame::OnRunScriptCustom(wxCommandEvent& WXUNUSED(evt))
{ {
RunScript(); wxTextEntryDialog dialog
(
this,
"Please enter JavaScript code to execute",
wxGetTextFromUserPromptStr,
m_javascript,
wxOK | wxCANCEL | wxCENTRE | wxTE_MULTILINE
);
if( dialog.ShowModal() != wxID_OK )
return;
RunScript(dialog.GetValue());
} }
void WebFrame::OnClearSelection(wxCommandEvent& WXUNUSED(evt)) void WebFrame::OnClearSelection(wxCommandEvent& WXUNUSED(evt))