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

[DE] for bug 54348, 53936

Browse source
This commit is contained in:
Maxim Kadushkin 2021-12-10 16:38:15 +03:00
parent 1d2a85f662
commit 7680c381b0
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/documenteditor/main/app/controller/Viewport.js
View file

@ -325,8 +325,7 @@ define([
})).on('click', _on_btn_zoom.bind(me, 'up')); })).on('click', _on_btn_zoom.bind(me, 'up'));
me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this)); me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
var document = DE.getController('Main').document; if ( !Common.UI.Themes.isDarkTheme() ) {
if ( !Common.UI.Themes.isDarkTheme() || /^pdf|djvu|xps|oxps$/.test(document.fileType) ) {
me.header.menuItemsDarkMode.hide(); me.header.menuItemsDarkMode.hide();
me.header.menuItemsDarkMode.$el.prev('.divider').hide(); me.header.menuItemsDarkMode.$el.prev('.divider').hide();
} }
@ -371,8 +370,6 @@ define([
}, },
onThemeChanged: function (id) { onThemeChanged: function (id) {
var document = DE.getController('Main').document;
if ( !/^pdf|djvu|xps|oxps$/.test(document.fileType) ) {
if ( this.header.menuItemsDarkMode ) { if ( this.header.menuItemsDarkMode ) {
var current_dark = Common.UI.Themes.isDarkTheme(); var current_dark = Common.UI.Themes.isDarkTheme();
var menuItem = this.header.menuItemsDarkMode; var menuItem = this.header.menuItemsDarkMode;
@ -381,7 +378,6 @@ define([
menuItem.setChecked(Common.UI.Themes.isContentThemeDark()); menuItem.setChecked(Common.UI.Themes.isContentThemeDark());
} }
}
}, },
onContentThemeChangedToDark: function (isdark) { onContentThemeChangedToDark: function (isdark) {

1
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -648,7 +648,6 @@ define([
if ( !Common.UI.Themes.available() ) { if ( !Common.UI.Themes.available() ) {
$('tr.themes, tr.themes + tr.divider', this.el).hide(); $('tr.themes, tr.themes + tr.divider', this.el).hide();
} }
this.chDarkMode.setVisible(!/^pdf|djvu|xps|oxps$/.test(DE.getController('Main').document.fileType));
}, },
setApi: function(o) { setApi: function(o) {