From 03abcc2d8bd988d4b95f4a1dae7157ffc301dac4 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Wed, 26 Apr 2017 16:51:23 +0300
Subject: [PATCH] [DE][PE] Debug view mode.

---
 apps/documenteditor/main/app/view/Toolbar.js  | 57 +++++++++++--------
 .../main/app/view/Toolbar.js                  | 14 +++--
 .../main/resources/less/statusbar.less        |  1 +
 3 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index 2282c0f28..f1fb84350 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -1988,33 +1988,40 @@ define([
             onToolbarAfterRender: function(toolbar) {
                 // DataView and pickers
                 //
-                var colorVal = $('<div class="btn-color-value-line"></div>');
-                $('button:first-child', this.btnHighlightColor.cmpEl).append(colorVal);
-                this.btnHighlightColor.currentColor = 'FFFF00';
-                colorVal.css('background-color', '#' + this.btnHighlightColor.currentColor);
-                this.mnuHighlightColorPicker = new Common.UI.ColorPalette({
-                    el: $('#id-toolbar-menu-highlight'),
-                    colors: [
-                        'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B',
-                        '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000'
-                    ]
-                });
-                this.mnuHighlightColorPicker.select('FFFF00');
+                var colorVal;
+                if (this.btnHighlightColor.cmpEl) {
+                    colorVal = $('<div class="btn-color-value-line"></div>');
+                    $('button:first-child', this.btnHighlightColor.cmpEl).append(colorVal);
+                    this.btnHighlightColor.currentColor = 'FFFF00';
+                    colorVal.css('background-color', '#' + this.btnHighlightColor.currentColor);
+                    this.mnuHighlightColorPicker = new Common.UI.ColorPalette({
+                        el: $('#id-toolbar-menu-highlight'),
+                        colors: [
+                            'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B',
+                            '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000'
+                        ]
+                    });
+                    this.mnuHighlightColorPicker.select('FFFF00');
+                }
 
-                colorVal = $('<div class="btn-color-value-line"></div>');
-                $('button:first-child', this.btnFontColor.cmpEl).append(colorVal);
-                colorVal.css('background-color', this.btnFontColor.currentColor || 'transparent');
-                this.mnuFontColorPicker = new Common.UI.ThemeColorPalette({
-                    el: $('#id-toolbar-menu-fontcolor')
-                });
+                if (this.btnFontColor.cmpEl) {
+                    colorVal = $('<div class="btn-color-value-line"></div>');
+                    $('button:first-child', this.btnFontColor.cmpEl).append(colorVal);
+                    colorVal.css('background-color', this.btnFontColor.currentColor || 'transparent');
+                    this.mnuFontColorPicker = new Common.UI.ThemeColorPalette({
+                        el: $('#id-toolbar-menu-fontcolor')
+                    });
+                }
 
-                colorVal = $('<div class="btn-color-value-line"></div>');
-                $('button:first-child', this.btnParagraphColor.cmpEl).append(colorVal);
-                colorVal.css('background-color', this.btnParagraphColor.currentColor || 'transparent');
-                this.mnuParagraphColorPicker = new Common.UI.ThemeColorPalette({
-                    el: $('#id-toolbar-menu-paracolor'),
-                    transparent: true
-                });
+                if (this.btnParagraphColor.cmpEl) {
+                    colorVal = $('<div class="btn-color-value-line"></div>');
+                    $('button:first-child', this.btnParagraphColor.cmpEl).append(colorVal);
+                    colorVal.css('background-color', this.btnParagraphColor.currentColor || 'transparent');
+                    this.mnuParagraphColorPicker = new Common.UI.ThemeColorPalette({
+                        el: $('#id-toolbar-menu-paracolor'),
+                        transparent: true
+                    });
+                }
             },
 
             updateMetricUnit: function () {
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index 9134f15bb..3cba576b2 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -1403,12 +1403,14 @@ define([
             onToolbarAfterRender: function(toolbar) {
                 // DataView and pickers
                 //
-                var colorVal = $('<div class="btn-color-value-line"></div>');
-                $('button:first-child', this.btnFontColor.cmpEl).append(colorVal);
-                colorVal.css('background-color', this.btnFontColor.currentColor || 'transparent');
-                this.mnuFontColorPicker = new Common.UI.ThemeColorPalette({
-                    el: $('#id-toolbar-menu-fontcolor')
-                });
+                if (this.btnFontColor.cmpEl) {
+                    var colorVal = $('<div class="btn-color-value-line"></div>');
+                    $('button:first-child', this.btnFontColor.cmpEl).append(colorVal);
+                    colorVal.css('background-color', this.btnFontColor.currentColor || 'transparent');
+                    this.mnuFontColorPicker = new Common.UI.ThemeColorPalette({
+                        el: $('#id-toolbar-menu-fontcolor')
+                    });
+                }
             },
 
             setApi: function (api) {
diff --git a/apps/presentationeditor/main/resources/less/statusbar.less b/apps/presentationeditor/main/resources/less/statusbar.less
index bb7282dfc..ee7a26786 100644
--- a/apps/presentationeditor/main/resources/less/statusbar.less
+++ b/apps/presentationeditor/main/resources/less/statusbar.less
@@ -41,6 +41,7 @@
     #btn-zoom-topage {
         .btn-tpl(-1160px);
         margin-right: 9px;
+        margin-left: 6px;
     }
 
     #btn-zoom-towidth {