Merge pull request #3438 from DiemenDesign/develop

Add forgotten bs3/bs4 Toolbar position elements.
summernote · Oct 16, 2019 · 574ce4f · 574ce4f
2 parents 9403192 + 839ca6e
commit 574ce4f
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 17 deletions.
diff --git a/src/js/base/module/AirPopover.js b/src/js/base/module/AirPopover.js
@@ -12,7 +12,7 @@ export default class AirPopover {
     this.ui = $.summernote.ui;
     this.options = context.options;
     this.events = {
-      'summernote.keyup summernote.mouseup summernote.scroll': () => {
+      'summernote.keyup summernote.mousedown summernote.scroll': () => {
         if (this.options.editing == true) {
           this.update();
         }

diff --git a/src/js/bs3/ui.js b/src/js/bs3/ui.js
@@ -203,14 +203,26 @@ const ui = {
       ui.editingArea([
         ui.airEditable(),
       ]),
-    ]) : ui.editor([
-      ui.toolbar(),
-      ui.editingArea([
-        ui.codable(),
-        ui.editable(),
-      ]),
-      ui.statusbar(),
-    ])).render();
+    ]) : (options.toolbarPosition == 'bottom' ?
+        ui.editor([
+          ui.editingArea([
+            ui.codable(),
+            ui.editable(),
+          ]),
+          ui.toolbar(),
+          ui.statusbar(),
+        ])
+      :
+        ui.editor([
+          ui.toolbar(),
+          ui.editingArea([
+            ui.codable(),
+            ui.editable(),
+          ]),
+          ui.statusbar(),
+        ])
+      )
+    ).render();
 
     $editor.insertAfter($note);
 

diff --git a/src/js/bs4/ui.js b/src/js/bs4/ui.js
@@ -206,14 +206,26 @@ const ui = {
       ui.editingArea([
         ui.airEditable(),
       ]),
-    ]) : ui.editor([
-      ui.toolbar(),
-      ui.editingArea([
-        ui.codable(),
-        ui.editable(),
-      ]),
-      ui.statusbar(),
-    ])).render();
+    ]) : (options.toolbarPosition == 'bottom' ?
+        ui.editor([
+          ui.editingArea([
+            ui.codable(),
+            ui.editable(),
+          ]),
+          ui.toolbar(),
+          ui.statusbar(),
+        ])
+      :
+        ui.editor([
+          ui.toolbar(),
+          ui.editingArea([
+            ui.codable(),
+            ui.editable(),
+          ]),
+          ui.statusbar(),
+        ])
+      )
+    ).render();
 
     $editor.insertAfter($note);