New version 3.0.15. Read more https://github.com/xdan/jodit/releases/…

…tag/3.0.15
xdan · Aug 21, 2017 · bf80552 · bf80552
1 parent d40d697
commit bf80552
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 13 deletions.
diff --git a/build/jodit.min.css b/build/jodit.min.css
diff --git a/build/jodit.min.js b/build/jodit.min.js
diff --git a/index.html b/index.html
@@ -80,7 +80,7 @@
     }
     editor = new Jodit('#area_editor', {
 //        theme: 'dark',
-        toolbarButtonSize: 'large',
+//        textIcons: true,
 //        iframe: true,
 //        height: 100,
         observer: {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jodit",
-  "version": "3.0.14",
+  "version": "3.0.15",
   "description": "Jodit is awesome and usefully wysiwyg editor with filebrowser",
   "main": "index.js",
   "scripts": {

diff --git a/src/Config.ts b/src/Config.ts
@@ -435,7 +435,12 @@ export class Config {
     controls: {[key: string]: ControlType};
 
     events: {[key: string]: Function} = {};
-    textIcons: boolean = true;
+
+    /**
+     * Buttons in toolbat without SVG - only texts
+     * @type {boolean}
+     */
+    textIcons: boolean = false;
 };
 Config.prototype.controls = {
     about: {

diff --git a/src/Jodit.ts b/src/Jodit.ts
@@ -19,7 +19,7 @@ interface JoditPlugin{
 
 /** Class Jodit. Main class*/
 export default class Jodit extends Component{
-    version: string = appVersion;
+    version: string = appVersion; // from webpack.config.js
 
 
     static defaultOptions: Config;
@@ -173,6 +173,10 @@ export default class Jodit extends Component{
 
         this.container.classList.add('jodit_toolbar_size-' + (['middle', 'large', 'small'].indexOf(this.options.toolbarButtonSize.toLowerCase()) !== -1 ? this.options.toolbarButtonSize.toLowerCase() : 'middle'));
 
+        if (this.options.textIcons) {
+            this.container.classList.add('jodit_text_icons');
+        }
+
         this.__on(window, 'resize', () => {
             this.events.fire('resize');
         });
@@ -228,6 +232,7 @@ export default class Jodit extends Component{
 
 
     private __defaultStyleDisplayKey = 'data-jodit-default-style-display';
+
     /**
      * Create main DIV element and replace source textarea
      *

diff --git a/src/modules/Toolbar.ts b/src/modules/Toolbar.ts
@@ -61,7 +61,7 @@ export default class Toolbar extends Component{
      * @param {string|boolean} [defaultValue='<span></span>']
      * @return {string}
      */
-    static getIcon(name, defaultValue:string|false = '<span></span>') {
+    static getIcon(name: string, defaultValue:string|false = '<span></span>') {
         return Toolbar.icons[name] !== undefined ? Toolbar.icons[name] : defaultValue;
     }
 
@@ -224,12 +224,19 @@ export default class Toolbar extends Component{
             name: string = typeof item === 'string' ? item : (item.name || 'empty'),
             a: HTMLAnchorElement = btn.querySelector('a');
 
-        let iconSVG: string|false = Toolbar.getIcon(name, false);
+        let iconSVG: string|false;
 
-        if (iconSVG === false) {
-            iconSVG = Toolbar.getIcon(typeof control.name === 'string' ? control.name : 'empty');
+        if (!this.jodit.options.textIcons) {
+            iconSVG = Toolbar.getIcon(name, false);
+
+            if (iconSVG === false) {
+                iconSVG = Toolbar.getIcon(typeof control.name === 'string' ? control.name : 'empty');
+            }
+        } else {
+            iconSVG = `<span>${name}</span>`;
         }
 
+
         //btn.control =  control;
 
         const clearName = name.replace(/[^a-zA-Z0-9]/g, '_');
@@ -243,7 +250,11 @@ export default class Toolbar extends Component{
         });
 
         let icon =  dom(<string>iconSVG);
-        icon.classList.add('jodit_icon', 'jodit_icon_' + clearName);
+
+        if (icon && icon.nodeType !== Node.TEXT_NODE) {
+            icon.classList.add('jodit_icon', 'jodit_icon_' + clearName);
+        }
+
         a.appendChild(icon);
 
         if (control === undefined || typeof(control) !== 'object') {

diff --git a/src/styles/plugins/texticons.less b/src/styles/plugins/texticons.less
@@ -0,0 +1,42 @@
+@jodit_text_icons-font: Arial, "Helvetica Neue", Helvetica, Tahoma, sans-serif;
+@jodit_text_icons-color: rgba(0, 0, 0, 0.75);
+@jodit_text_icons-padding: 0 12px;
+
+.jodit_text_icons {
+    .jodit_icon {
+        width: auto;
+        font-size:13px;
+        &::first-letter {
+            text-transform: uppercase;
+        }
+    }
+    .jodit_tabs .jodit_tabs_buttons > a {
+        width: auto;
+        font-family: @jodit_text_icons-font;
+        width: auto;
+        i {
+            width: auto;
+        }
+    }
+    .jodit_toolbar > li{
+        width: auto;
+        > a {
+            padding: @jodit_text_icons-padding;
+            font-family: @jodit_text_icons-font;
+            width: auto;
+            text-decoration: none;
+            color: @jodit_text_icons-color;
+        }
+    }
+    &.jodit_dialog_box .jodit_dialog {
+        .jodit_dialog_header a, .jodit_button {
+            width: auto;
+            padding: @jodit_text_icons-padding;
+            font-family: @jodit_text_icons-font;
+            color: @jodit_text_icons-color;
+            .jodit_icon {
+                width: auto;
+            }
+        }
+    }
+}