Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE][PE] Debug view mode.

Browse source
This commit is contained in:
Julia Radzhabova 2017-04-26 16:51:23 +03:00
parent 8f027e886d
commit 03abcc2d8b
3 changed files with 41 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1988,7 +1988,9 @@ define([
onToolbarAfterRender: function(toolbar) { onToolbarAfterRender: function(toolbar) {
// DataView and pickers // DataView and pickers
// //
var colorVal = $('<div class="btn-color-value-line"></div>'); var colorVal;
if (this.btnHighlightColor.cmpEl) {
colorVal = $('<div class="btn-color-value-line"></div>');
$('button:first-child', this.btnHighlightColor.cmpEl).append(colorVal); $('button:first-child', this.btnHighlightColor.cmpEl).append(colorVal);
this.btnHighlightColor.currentColor = 'FFFF00'; this.btnHighlightColor.currentColor = 'FFFF00';
colorVal.css('background-color', '#' + this.btnHighlightColor.currentColor); colorVal.css('background-color', '#' + this.btnHighlightColor.currentColor);
@ -2000,14 +2002,18 @@ define([
] ]
}); });
this.mnuHighlightColorPicker.select('FFFF00'); this.mnuHighlightColorPicker.select('FFFF00');
}
if (this.btnFontColor.cmpEl) {
colorVal = $('<div class="btn-color-value-line"></div>'); colorVal = $('<div class="btn-color-value-line"></div>');
$('button:first-child', this.btnFontColor.cmpEl).append(colorVal); $('button:first-child', this.btnFontColor.cmpEl).append(colorVal);
colorVal.css('background-color', this.btnFontColor.currentColor || 'transparent'); colorVal.css('background-color', this.btnFontColor.currentColor || 'transparent');
this.mnuFontColorPicker = new Common.UI.ThemeColorPalette({ this.mnuFontColorPicker = new Common.UI.ThemeColorPalette({
el: $('#id-toolbar-menu-fontcolor') el: $('#id-toolbar-menu-fontcolor')
}); });
}
if (this.btnParagraphColor.cmpEl) {
colorVal = $('<div class="btn-color-value-line"></div>'); colorVal = $('<div class="btn-color-value-line"></div>');
$('button:first-child', this.btnParagraphColor.cmpEl).append(colorVal); $('button:first-child', this.btnParagraphColor.cmpEl).append(colorVal);
colorVal.css('background-color', this.btnParagraphColor.currentColor || 'transparent'); colorVal.css('background-color', this.btnParagraphColor.currentColor || 'transparent');
@ -2015,6 +2021,7 @@ define([
el: $('#id-toolbar-menu-paracolor'), el: $('#id-toolbar-menu-paracolor'),
transparent: true transparent: true
}); });
}
}, },
updateMetricUnit: function () { updateMetricUnit: function () {

2
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -1403,12 +1403,14 @@ define([
onToolbarAfterRender: function(toolbar) { onToolbarAfterRender: function(toolbar) {
// DataView and pickers // DataView and pickers
// //
if (this.btnFontColor.cmpEl) {
var colorVal = $('<div class="btn-color-value-line"></div>'); var colorVal = $('<div class="btn-color-value-line"></div>');
$('button:first-child', this.btnFontColor.cmpEl).append(colorVal); $('button:first-child', this.btnFontColor.cmpEl).append(colorVal);
colorVal.css('background-color', this.btnFontColor.currentColor || 'transparent'); colorVal.css('background-color', this.btnFontColor.currentColor || 'transparent');
this.mnuFontColorPicker = new Common.UI.ThemeColorPalette({ this.mnuFontColorPicker = new Common.UI.ThemeColorPalette({
el: $('#id-toolbar-menu-fontcolor') el: $('#id-toolbar-menu-fontcolor')
}); });
}
}, },
setApi: function (api) { setApi: function (api) {

1
apps/presentationeditor/main/resources/less/statusbar.less
View file

@ -41,6 +41,7 @@
#btn-zoom-topage { #btn-zoom-topage {
.btn-tpl(-1160px); .btn-tpl(-1160px);
margin-right: 9px; margin-right: 9px;
margin-left: 6px;
} }
#btn-zoom-towidth { #btn-zoom-towidth {