fix protocol checkbox to 'false' when url already exists

hibratt · Aug 16, 2019 · 8f72620 · 8f72620
1 parent 646c85c
commit 8f72620
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/js/base/module/Editor.js b/src/js/base/module/Editor.js
@@ -208,7 +208,7 @@ export default class Editor {
       } else if (checkProtocol) {
         // if url doesn't have any protocol and not even a relative or a label, use http:// as default
         linkUrl = /^([A-Za-z][A-Za-z0-9+-.]*\:|#|\/)/.test(linkUrl)
-          ? linkUrl : 'http://' + linkUrl;
+          ? linkUrl : this.options.defaultProtocol + linkUrl;
       }
 
       let anchors = [];

diff --git a/src/js/base/module/LinkDialog.js b/src/js/base/module/LinkDialog.js
@@ -128,8 +128,8 @@ export default class LinkDialog {
 
         $openInNewWindow.prop('checked', isNewWindowChecked);
 
-        const useProtocolChecked = linkInfo.checkProtocol !== undefined
-          ? linkInfo.checkProtocol : this.context.options.useProtocol;
+        const useProtocolChecked = linkInfo.url
+          ? false : this.context.options.useProtocol;
 
         $useProtocol.prop('checked', useProtocolChecked);
 

diff --git a/src/js/base/settings.js b/src/js/base/settings.js
@@ -114,6 +114,7 @@ $.summernote = $.extend($.summernote, {
     height: null,
     linkTargetBlank: true,
     useProtocol: true,
+    defaultProtocol: 'http://',
 
     focus: false,
     tabSize: 4,