Skip to content

Escape quotes on translated strings when calling execJavaScriptFromString #3931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aforcier merged 1 commit into from
Apr 9, 2016
Merged

Escape quotes on translated strings when calling execJavaScriptFromString #3931

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,17 +972,17 @@ public void run() {

// Set title and content placeholder text
mWebView.execJavaScriptFromString("ZSSEditor.getField('zss_field_title').setPlaceholderText('" +
mTitlePlaceholder + "');");
Utils.escapeQuotes(mTitlePlaceholder) + "');");
mWebView.execJavaScriptFromString("ZSSEditor.getField('zss_field_content').setPlaceholderText('" +
mContentPlaceholder + "');");
Utils.escapeQuotes(mContentPlaceholder) + "');");

// Load title and content into ZSSEditor
updateVisualEditorFields();

// If there are images that are still in progress (because the editor exited before they completed),
// set them to failed, so the user can restart them (otherwise they will stay stuck in 'uploading' mode)
mWebView.execJavaScriptFromString("ZSSEditor.markAllUploadingMediaAsFailed('"
+ getString(R.string.tap_to_try_again) + "');");
+ Utils.escapeQuotes(getString(R.string.tap_to_try_again)) + "');");

// Update the list of failed media uploads
mWebView.execJavaScriptFromString("ZSSEditor.getFailedMedia();");
Expand Down