diff --git a/app/src/main/assets/RichTextEditor/editor.html b/app/src/main/assets/RichTextEditor/editor.html index a35d9de..2d1746e 100644 --- a/app/src/main/assets/RichTextEditor/editor.html +++ b/app/src/main/assets/RichTextEditor/editor.html @@ -5,68 +5,26 @@ Markdown Editor - -
-
-
- - -
+
- + diff --git a/app/src/main/assets/RichTextEditor/quill.js b/app/src/main/assets/RichTextEditor/quill.js index 965bc82..a70e5eb 100644 --- a/app/src/main/assets/RichTextEditor/quill.js +++ b/app/src/main/assets/RichTextEditor/quill.js @@ -8782,7 +8782,7 @@ return /******/ (function(modules) { // webpackBootstrap }, { key: 'sanitize', value: function sanitize(url) { - return (0, _link.sanitize)(url, ['http', 'https', 'data']) ? url : '//:0'; + return (0, _link.sanitize)(url, ['http', 'https', 'data', 'file']) ? url : '//:0'; } }, { key: 'value', diff --git a/app/src/main/java/org/houxg/leamonax/editor/Editor.java b/app/src/main/java/org/houxg/leamonax/editor/Editor.java index dd05c78..6aa5abc 100644 --- a/app/src/main/java/org/houxg/leamonax/editor/Editor.java +++ b/app/src/main/java/org/houxg/leamonax/editor/Editor.java @@ -20,9 +20,8 @@ public abstract class Editor { BOLD, ITALIC, ORDER_LIST, - UNORDER_LIST; - - public boolean isEnabled; + UNORDER_LIST, + BLOCK_QUOTE; } protected EditorListener mListener; diff --git a/app/src/main/java/org/houxg/leamonax/editor/QuillCallbackHandler.java b/app/src/main/java/org/houxg/leamonax/editor/QuillCallbackHandler.java index 2fccc12..5287487 100644 --- a/app/src/main/java/org/houxg/leamonax/editor/QuillCallbackHandler.java +++ b/app/src/main/java/org/houxg/leamonax/editor/QuillCallbackHandler.java @@ -2,16 +2,12 @@ package org.houxg.leamonax.editor; import android.support.annotation.NonNull; -import android.text.TextUtils; import android.util.Log; import android.webkit.JavascriptInterface; import com.google.gson.Gson; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; -import java.util.Locale; import java.util.Map; public class QuillCallbackHandler { @@ -79,6 +75,9 @@ public class QuillCallbackHandler { case "italic": formatStatusMap.put(Editor.Style.ITALIC, getBoolean((Boolean) format.getValue())); break; + case "blockquote": + formatStatusMap.put(Editor.Style.BLOCK_QUOTE, getBoolean((Boolean) format.getValue())); + break; } } return formatStatusMap; diff --git a/app/src/main/java/org/houxg/leamonax/editor/RichTextEditor.java b/app/src/main/java/org/houxg/leamonax/editor/RichTextEditor.java index 8ad0d9f..65f2181 100644 --- a/app/src/main/java/org/houxg/leamonax/editor/RichTextEditor.java +++ b/app/src/main/java/org/houxg/leamonax/editor/RichTextEditor.java @@ -4,7 +4,6 @@ package org.houxg.leamonax.editor; import android.annotation.SuppressLint; import android.text.TextUtils; import android.util.Log; -import android.webkit.WebChromeClient; import android.webkit.WebView; import com.google.gson.Gson; @@ -52,9 +51,9 @@ public class RichTextEditor extends Editor implements OnJsEditorStateChangedList @Override public void setEditingEnabled(boolean enabled) { if (enabled) { - execJs("quill.enable();"); + execJs("enable();"); } else { - execJs("quill.disable();"); + execJs("disable();"); } } @@ -125,7 +124,6 @@ public class RichTextEditor extends Editor implements OnJsEditorStateChangedList @Override public void toggleItalic() { execJs("toggleItalic();"); -// execJs("quill.format('list', false);"); } @Override diff --git a/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java b/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java index b951c45..fb777e8 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java +++ b/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java @@ -7,7 +7,6 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.BoolRes; import android.support.annotation.Nullable; import android.util.Log; import android.view.LayoutInflater; @@ -290,6 +289,9 @@ public class EditorFragment extends Fragment implements Editor.EditorListener { case UNORDER_LIST: mUnorderListBtn.setChecked(enabled); break; + case BLOCK_QUOTE: + mQuoteBtn.setChecked(enabled); + break; } } }); @@ -326,6 +328,9 @@ public class EditorFragment extends Fragment implements Editor.EditorListener { case UNORDER_LIST: mUnorderListBtn.setChecked(enabled); break; + case BLOCK_QUOTE: + mQuoteBtn.setChecked(enabled); + break; } } }