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

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

@ -1988,33 +1988,40 @@ define([
onToolbarAfterRender: function(toolbar) { onToolbarAfterRender: function(toolbar) {
// DataView and pickers // DataView and pickers
// //
var colorVal = $('<div class="btn-color-value-line"></div>'); var colorVal;
$('button:first-child', this.btnHighlightColor.cmpEl).append(colorVal); if (this.btnHighlightColor.cmpEl) {
this.btnHighlightColor.currentColor = 'FFFF00'; colorVal = $('<div class="btn-color-value-line"></div>');
colorVal.css('background-color', '#' + this.btnHighlightColor.currentColor); $('button:first-child', this.btnHighlightColor.cmpEl).append(colorVal);
this.mnuHighlightColorPicker = new Common.UI.ColorPalette({ this.btnHighlightColor.currentColor = 'FFFF00';
el: $('#id-toolbar-menu-highlight'), colorVal.css('background-color', '#' + this.btnHighlightColor.currentColor);
colors: [ this.mnuHighlightColorPicker = new Common.UI.ColorPalette({
'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B', el: $('#id-toolbar-menu-highlight'),
'006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000' colors: [
] 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B',
}); '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000'
this.mnuHighlightColorPicker.select('FFFF00'); ]
});
this.mnuHighlightColorPicker.select('FFFF00');
}
colorVal = $('<div class="btn-color-value-line"></div>'); if (this.btnFontColor.cmpEl) {
$('button:first-child', this.btnFontColor.cmpEl).append(colorVal); colorVal = $('<div class="btn-color-value-line"></div>');
colorVal.css('background-color', this.btnFontColor.currentColor || 'transparent'); $('button:first-child', this.btnFontColor.cmpEl).append(colorVal);
this.mnuFontColorPicker = new Common.UI.ThemeColorPalette({ colorVal.css('background-color', this.btnFontColor.currentColor || 'transparent');
el: $('#id-toolbar-menu-fontcolor') this.mnuFontColorPicker = new Common.UI.ThemeColorPalette({
}); el: $('#id-toolbar-menu-fontcolor')
});
}
colorVal = $('<div class="btn-color-value-line"></div>'); if (this.btnParagraphColor.cmpEl) {
$('button:first-child', this.btnParagraphColor.cmpEl).append(colorVal); colorVal = $('<div class="btn-color-value-line"></div>');
colorVal.css('background-color', this.btnParagraphColor.currentColor || 'transparent'); $('button:first-child', this.btnParagraphColor.cmpEl).append(colorVal);
this.mnuParagraphColorPicker = new Common.UI.ThemeColorPalette({ colorVal.css('background-color', this.btnParagraphColor.currentColor || 'transparent');
el: $('#id-toolbar-menu-paracolor'), this.mnuParagraphColorPicker = new Common.UI.ThemeColorPalette({
transparent: true el: $('#id-toolbar-menu-paracolor'),
}); transparent: true
});
}
}, },
updateMetricUnit: function () { updateMetricUnit: function () {

14
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
// //
var colorVal = $('<div class="btn-color-value-line"></div>'); if (this.btnFontColor.cmpEl) {
$('button:first-child', this.btnFontColor.cmpEl).append(colorVal); var colorVal = $('<div class="btn-color-value-line"></div>');
colorVal.css('background-color', this.btnFontColor.currentColor || 'transparent'); $('button:first-child', this.btnFontColor.cmpEl).append(colorVal);
this.mnuFontColorPicker = new Common.UI.ThemeColorPalette({ colorVal.css('background-color', this.btnFontColor.currentColor || 'transparent');
el: $('#id-toolbar-menu-fontcolor') this.mnuFontColorPicker = new Common.UI.ThemeColorPalette({
}); 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 {