add: #603 options.mediaAuthSelect

JiHong88 · Jan 28, 2021 · 3b83f4e · 3b83f4e
1 parent 378f31b
commit 3b83f4e
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 16 deletions.
diff --git a/src/lib/constructor.js b/src/lib/constructor.js
@@ -538,6 +538,7 @@ export default {
         options.templates = !options.templates ? null : options.templates;
         /** ETC */
         options.placeholder = typeof options.placeholder === 'string' ? options.placeholder : null;
+        options.mediaAutoSelect = options.mediaAutoSelect === undefined ? true : !!options.mediaAutoSelect;
         /** Buttons */
         options.buttonList = !!options.buttonList ? options.buttonList : [
             ['undo', 'redo'],

diff --git a/src/options.d.ts b/src/options.d.ts
@@ -441,6 +441,22 @@ export interface SunEditorOptions {
      * Define position to the table cell controller. ('cell', 'top')
      */
     tableCellControllerPosition?: string;
+    /**
+     * Link
+     * =====
+     */
+    /**
+     * Protocol for the links (if link has been added without any protocol this one will be used).
+     */
+    linkProtocol?: string;
+    /**
+     * Defines "rel" attribute list of anchor tag.
+     */
+    linkRel?: string[];
+    /**
+     * Defines default "rel" attribute list of anchor tag.
+     */
+    linkRelDefault?: {default?: string; check_new_window?: string; check_bookmark?: string;};
     /**
      * Key actions
      * =====
@@ -476,17 +492,9 @@ export interface SunEditorOptions {
      */
     placeholder?: string;
     /**
-     * Protocol for the links (if link has been added without any protocol this one will be used).
-     */
-    linkProtocol?: string;
-    /**
-     * Defines "rel" attribute list of anchor tag.
-     */
-    linkRel?: string[];
-    /**
-     * Defines default "rel" attribute list of anchor tag.
+     * Choose whether to activate the media selection status immediately after inserting the media tag.  (default: true)
      */
-    linkRelDefault?: {default?: string; check_new_window?: string; check_bookmark?: string;};
+    mediaAutoSelect?: boolean;
     /**
      * You can redefine icons.
      */

diff --git a/src/plugins/dialog/audio.js b/src/plugins/dialog/audio.js
@@ -425,23 +425,27 @@ export default {
             element.src = src;
             const cover = this.plugins.component.set_cover.call(this, element);
             const container = this.plugins.component.set_container.call(this, cover, '');
-            if (!this.insertComponent(container, false, true, false)) {
+            if (!this.insertComponent(container, false, true, !this.options.mediaAutoSelect)) {
                 this.focus();
                 return;
             }
+            if (!this.options.mediaAutoSelect) {
+                const line = this.appendFormatTag(container, null);
+                this.setRange(line, 0, line, 0);
+            }
         } // update
         else {
             if (contextAudio._element) element = contextAudio._element;
             if (element && element.src !== src) {
                 element.src = src;
+                this.selectComponent(element, 'audio');
             } else {
                 this.selectComponent(element, 'audio');
                 return;
             }
         }
 
         this.plugins.fileManager.setInfo.call(this, 'audio', element, this.functions.onAudioUpload, file, false);
-        this.selectComponent(element, 'audio');
         if (isUpdate) this.history.push(false);
     },
 

diff --git a/src/plugins/dialog/image.js b/src/plugins/dialog/image.js
@@ -660,15 +660,20 @@ export default {
         // align
         imagePlugin.setAlign.call(this, align, oImg, cover, container);
 
-        oImg.onload = imagePlugin._image_create_onload.bind(this, oImg, contextImage.svgDefaultSize);
+        oImg.onload = imagePlugin._image_create_onload.bind(this, oImg, contextImage.svgDefaultSize, container);
         if (this.insertComponent(container, true, true, true)) this.plugins.fileManager.setInfo.call(this, 'image', oImg, this.functions.onImageUpload, file, true);
         this.context.resizing._resize_plugin = '';
     },
 
-    _image_create_onload: function (oImg, svgDefaultSize) {
+    _image_create_onload: function (oImg, svgDefaultSize, container) {
         // svg exception handling
         if (oImg.offsetWidth === 0) this.plugins.image.applySize.call(this, svgDefaultSize, '');
-        this.selectComponent.call(this, oImg, 'image');
+        if (this.options.mediaAutoSelect) {
+            this.selectComponent(oImg, 'image');
+        } else {
+            const line = this.appendFormatTag(container, null);
+            this.setRange(line, 0, line, 0);
+        }
     },
 
     update_image: function (init, openController, notHistoryPush) {

diff --git a/src/plugins/dialog/video.js b/src/plugins/dialog/video.js
@@ -614,7 +614,11 @@ export default {
 
         let changed = true;
         if (!isUpdate) {
-            changed = this.insertComponent(container, false, true, false);
+            changed = this.insertComponent(container, false, true, !this.options.mediaAutoSelect);
+            if (!this.options.mediaAutoSelect) {
+                const line = this.appendFormatTag(container, null);
+                this.setRange(line, 0, line, 0);
+            }
         } else if (contextVideo._resizing && this.context.resizing._rotateVertical && changeSize) {
             this.plugins.resizing.setTransformSize.call(this, oFrame, null, null);
         }

diff --git a/test/dev/suneditor_build_test.js b/test/dev/suneditor_build_test.js
@@ -379,6 +379,7 @@ let ss = window.ss = suneditor.create(document.getElementById('editor1'), {
     value: "aa",
     stickyToolbar: 50,
     fullScreenOffset: '10px',
+    mediaAutoSelect: false,
     // rtl: true,
     // fullPage: true,
     // pasteTagsWhitelist: 'p|a|strong|em|h3|h4|h5|ul|ol|li|blockquote|table|thead|tbody|tfoot|tr|td|sup|sub',