Skip to content

Commit ef8b078

Browse files
committed
Added EditorWebViewAbstract and replaced EditorWebView usage in EditorFragment
1 parent 6195fe0 commit ef8b078

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed

WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class EditorFragment extends EditorFragmentAbstract implements View.OnCli
4040
private String mParamContent;
4141

4242
private Activity mActivity;
43-
private EditorWebView mWebView;
43+
private EditorWebViewAbstract mWebView;
4444

4545
private final Map<String, ToggleButton> mTagToggleButtonMap = new HashMap<>();
4646

@@ -69,7 +69,7 @@ public void onCreate(Bundle savedInstanceState) {
6969
@Override
7070
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
7171
View view = inflater.inflate(R.layout.fragment_editor, container, false);
72-
mWebView = (EditorWebView) view.findViewById(R.id.webview);
72+
mWebView = (EditorWebViewAbstract) view.findViewById(R.id.webview);
7373
initWebView();
7474

7575
ToggleButton boldButton = (ToggleButton) view.findViewById(R.id.bold);

WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebView.java

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,13 @@
22

33
import android.content.Context;
44
import android.util.AttributeSet;
5-
import android.webkit.WebView;
65

7-
public class EditorWebView extends WebView {
8-
9-
public EditorWebView(Context context) {
10-
super(context);
11-
}
6+
public class EditorWebView extends EditorWebViewAbstract {
127

138
public EditorWebView(Context context, AttributeSet attrs) {
149
super(context, attrs);
1510
}
1611

17-
public EditorWebView(Context context, AttributeSet attrs, int defStyle) {
18-
super(context, attrs, defStyle);
19-
}
20-
21-
@Override
22-
public boolean onCheckIsTextEditor() {
23-
return true;
24-
}
25-
2612
public void execJavaScriptFromString(String javaScript) {
2713
this.loadUrl("javascript:" + javaScript);
2814
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package org.wordpress.android.editor;
2+
3+
import android.content.Context;
4+
import android.util.AttributeSet;
5+
import android.webkit.WebView;
6+
7+
public abstract class EditorWebViewAbstract extends WebView {
8+
public abstract void execJavaScriptFromString(String javaScript);
9+
10+
public EditorWebViewAbstract(Context context, AttributeSet attrs) {
11+
super(context, attrs);
12+
}
13+
14+
@Override
15+
public boolean onCheckIsTextEditor() {
16+
return true;
17+
}
18+
}

0 commit comments

Comments
 (0)