Update inline toolbar and remove underline

zhang-weizhen · Aug 30, 2017 · a879e1d · a879e1d
1 parent 4d86296
commit a879e1d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/codex-editor.js b/codex-editor.js
diff --git a/codex-editor.js.map b/codex-editor.js.map
diff --git a/modules/toolbar/toolbar.js b/modules/toolbar/toolbar.js
@@ -40,6 +40,18 @@ module.exports = (function (toolbar) {
 
         }
 
+        let toolType = editor.content.currentNode.dataset.tool;
+
+        if (!editor.tools[toolType] || !editor.tools[toolType].makeSettings ) {
+
+            editor.nodes.showSettingsButton.classList.add('hide');
+
+        } else {
+
+            editor.nodes.showSettingsButton.classList.remove('hide');
+
+        }
+
         editor.nodes.toolbar.classList.add('opened');
         this.opened = true;
 
@@ -118,4 +130,4 @@ module.exports = (function (toolbar) {
 
     return toolbar;
 
-})({});
+})({});
diff --git a/modules/ui.js b/modules/ui.js
@@ -258,11 +258,6 @@ module.exports = (function (ui) {
                 command : 'italic'
             },
 
-            underline: {
-                icon    : 'ce-icon-underline',
-                command : 'underline'
-            },
-
             link: {
                 icon    : 'ce-icon-link',
                 command : 'createLink'