diff --git a/apps/common/main/lib/view/AdvancedSettingsWindow.js b/apps/common/main/lib/view/AdvancedSettingsWindow.js index 2ad8a0524..520e89a0e 100644 --- a/apps/common/main/lib/view/AdvancedSettingsWindow.js +++ b/apps/common/main/lib/view/AdvancedSettingsWindow.js @@ -104,7 +104,7 @@ define([ }); var cnt_panel = $window.find('.content-panel'); cnt_panel.width(this.contentWidth); - $window.width($window.find('.menu-panel').width() + cnt_panel.outerWidth() + 1); + $window.width($window.find('.menu-panel').width() + cnt_panel.outerWidth() + 2); this.content_panels = $window.find('.settings-panel'); if (this.btnsCategory.length>0) diff --git a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js index de19d810f..2c4543c7d 100644 --- a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js @@ -163,7 +163,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + me.textNewColor + '') } ] }) @@ -188,7 +188,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + me.textNewColor + '') } ] }) diff --git a/apps/documenteditor/main/app/view/ParagraphSettings.js b/apps/documenteditor/main/app/view/ParagraphSettings.js index c79b66775..ae517e060 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettings.js +++ b/apps/documenteditor/main/app/view/ParagraphSettings.js @@ -444,7 +444,7 @@ define([ if (!this.mnuColorPicker) { this.btnColor.setMenu( new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] })); diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js index eaec79147..641145f40 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -212,7 +212,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + me.textNewColor + '') } ] }) @@ -266,7 +266,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + me.textNewColor + '') } ] }) diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 0e13335b9..152b0c296 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1561,7 +1561,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1581,7 +1581,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1600,7 +1600,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1619,7 +1619,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1638,7 +1638,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index 826da4c1a..00e9e9b6a 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -642,7 +642,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -660,7 +660,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) diff --git a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js index 4221ed5b6..7ba24b0eb 100644 --- a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js @@ -881,7 +881,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + me.textNewColor + '') } ] }) @@ -901,7 +901,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + me.textNewColor + '') } ] }) @@ -921,7 +921,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + me.textNewColor + '') } ] }) diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js index 37d395a23..f00789a40 100644 --- a/apps/documenteditor/main/app/view/TextArtSettings.js +++ b/apps/documenteditor/main/app/view/TextArtSettings.js @@ -1054,7 +1054,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1073,7 +1073,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1092,7 +1092,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 30d071290..14d17c2ce 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -253,7 +253,7 @@ define([ template : _.template('<%= caption %>') }, {caption:'--'}, - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -267,7 +267,7 @@ define([ split : true, menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index dc2414d3d..5efee8b75 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1420,7 +1420,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1440,7 +1440,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1459,7 +1459,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1478,7 +1478,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1497,7 +1497,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index 30c70bfdf..6a9ee30af 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -985,7 +985,7 @@ define([ disabled: true, menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1005,7 +1005,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1024,7 +1024,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1043,7 +1043,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) diff --git a/apps/presentationeditor/main/app/view/TableSettings.js b/apps/presentationeditor/main/app/view/TableSettings.js index 01ff9c201..57e5bfcea 100644 --- a/apps/presentationeditor/main/app/view/TableSettings.js +++ b/apps/presentationeditor/main/app/view/TableSettings.js @@ -538,7 +538,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -556,7 +556,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index a957bec19..d62f28ed0 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -1456,7 +1456,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1476,7 +1476,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1495,7 +1495,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1514,7 +1514,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1533,7 +1533,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 671606671..46bcc4ddb 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -322,7 +322,7 @@ define([ split : true, menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + me.textNewColor + '') } ] }) diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js index 895065774..e78a3d268 100644 --- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js @@ -54,7 +54,7 @@ define([ var t = this, _options = {}; _.extend(_options, { - width : 500, + width : 501, height : 230, contentWidth : 180, header : true, @@ -478,7 +478,7 @@ define([ var t = this, _options = {}; _.extend(_options, { - width : 448, + width : 450, height : 265, contentWidth : 400, header : false, diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index a320fa70b..a422d2bb1 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -524,7 +524,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -543,7 +543,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -558,7 +558,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -573,7 +573,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -588,7 +588,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -603,7 +603,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -618,7 +618,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index 28ebe0db4..08a2d92bf 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1445,7 +1445,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1465,7 +1465,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1484,7 +1484,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1503,7 +1503,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1522,7 +1522,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index de2cb001d..d38298746 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -264,7 +264,7 @@ define([ menuAlign: 'tl-tr', cls: 'color-tab', items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + me.textNewColor + '') } ] }); diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index 914ed9caf..d7844c5f4 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -1461,7 +1461,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1480,7 +1480,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1500,7 +1500,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1519,7 +1519,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) @@ -1538,7 +1538,7 @@ define([ style: "width:45px;", menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + this.textNewColor + '') } ] }) diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 726b0b3b3..fc1f8abb1 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -283,7 +283,7 @@ define([ lock : [_set.selImage, _set.editFormula, _set.selRange, _set.coAuth, _set.coAuthText, _set.lostConnect], menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + me.textNewColor + '') } ] }) @@ -306,7 +306,7 @@ define([ lock : [_set.selImage, _set.editCell, _set.coAuth, _set.coAuthText, _set.lostConnect], menu : new Common.UI.Menu({ items: [ - { template: _.template('
') }, + { template: _.template('
') }, { template: _.template('' + me.textNewColor + '') } ] }) @@ -1523,7 +1523,7 @@ define([ menu : new Common.UI.Menu({ menuAlign : 'tl-tr', items : [ - { template: _.template('
'), stopPropagation: true }, + { template: _.template('
'), stopPropagation: true }, { template: _.template('' + this.textNewColor + ''), stopPropagation: true } ] })