From 878351a2aff2633f1e833ad13e6c9242b658f5dd Mon Sep 17 00:00:00 2001 From: Chupurnov Valeriy Date: Fri, 9 Feb 2018 13:23:40 +0500 Subject: [PATCH] Fix buttons bug, when in buttons you set string it could throw error --- examples/app.js | 1 + examples/arabic.lang.html | 2 + examples/custom-toolbar.html | 78 +++++++++++++++++++++++++++++ examples/example.default.html | 2 + examples/index.html | 2 + src/Config.ts | 17 ++++--- src/Jodit.ts | 4 +- src/modules/Helpers.ts | 4 ++ src/modules/ToolbarCollection.ts | 2 +- src/modules/Widget.ts | 16 +++--- src/plugins/mobile.ts | 15 +++--- src/styles/jodit.less | 6 +-- src/styles/modules/icon.less | 3 ++ src/styles/plugins/popupInline.less | 8 +-- src/styles/plugins/resizer.less | 4 +- src/styles/plugins/texticons.less | 19 +++---- src/styles/variables.less | 11 ++-- src/styles/widgets/colorpicker.less | 7 ++- src/styles/widgets/form.less | 2 +- src/styles/widgets/tabs.less | 2 +- test/tests/interfaceTest.js | 67 ++++++++++++++++++++++++- test/tests/mobileTest.js | 29 +++++++++++ 22 files changed, 251 insertions(+), 50 deletions(-) create mode 100644 examples/custom-toolbar.html diff --git a/examples/app.js b/examples/app.js index f7d274f42..5e11d183f 100644 --- a/examples/app.js +++ b/examples/app.js @@ -3,6 +3,7 @@ var main_container = document.getElementById('main_container'); var links = { 'index.html': 'All options', 'arabic.lang.html': 'Arabic Language', + 'custom-toolbar.html': 'Custom toolbar', }; if (examples) { diff --git a/examples/arabic.lang.html b/examples/arabic.lang.html index 0e553cc73..070719f3f 100644 --- a/examples/arabic.lang.html +++ b/examples/arabic.lang.html @@ -16,6 +16,7 @@