From 36913e0627883dbb804355de8a42f2a9bc88eef2 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 28 Nov 2019 17:54:01 +0100 Subject: [PATCH] Fix htmlarea issue with prefs rte_toolbar values --- api/js/etemplate/et2_widget_htmlarea.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/api/js/etemplate/et2_widget_htmlarea.js b/api/js/etemplate/et2_widget_htmlarea.js index bbaa84b7ad..865c6ab425 100644 --- a/api/js/etemplate/et2_widget_htmlarea.js +++ b/api/js/etemplate/et2_widget_htmlarea.js @@ -334,6 +334,11 @@ var et2_htmlarea = (function(){ "use strict"; return et2_editableWidget.extend([ var rte_menubar = egw.preference('rte_menubar', 'common'); var rte_toolbar = egw.preference('rte_toolbar', 'common'); + // we need to have rte_toolbar values as an array + if (rte_toolbar && typeof rte_toolbar == "object") + { + rte_toolbar = Object.values(rte_toolbar); + } var settings = { fontsize_formats: et2_htmlarea.FONT_SIZE_FORMATS[egw.preference('rte_font_unit', 'common')], menubar: parseInt(rte_menubar) && this.menubar ? true : typeof rte_menubar != 'undefined' ? false : this.menubar