pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 00:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Julia Radzhabova
2023-09-13 13:11:40 +03:00
parent 22fec40bd0
commit 8dcaaa0e5a
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/pdfeditor/main/app/controller/DocumentHolder.js
View File

@ -319,7 +319,7 @@ define([
event.preventDefault();
event.stopPropagation();
return false;
} else if (key === 48 || key === 96) {// 0
} else if (key === Common.UI.Keys.ZERO || key === Common.UI.Keys.NUM_ZERO) {// 0
me.api.zoom(100);
event.preventDefault();
event.stopPropagation();

5
apps/pdfeditor/main/app/controller/LeftMenu.js
View File

@ -62,6 +62,11 @@ define([
'Common.Views.Chat': {
'hide': _.bind(this.onHideChat, this)
},
'Common.Views.Header': {
'rename': _.bind(function (value) {
this.mode && this.mode.wopi && this.api ? this.api.asc_wopi_renameFile(value) : Common.Gateway.requestRename(value);
}, this)
},
'Common.Views.About': {
'show': _.bind(this.aboutShowHide, this, false),
'hide': _.bind(this.aboutShowHide, this, true)

1
apps/pdfeditor/main/app/controller/Main.js
View File

@ -411,6 +411,7 @@ define([
Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
this.appOptions.wopi = this.editorConfig.wopi;
appHeader.setWopi(this.appOptions.wopi);
Common.Controllers.Desktop.init(this.appOptions);
Common.UI.HintManager.setMode(this.appOptions);

8
apps/pdfeditor/main/app/controller/Statusbar.js
View File

@ -100,7 +100,7 @@ define([
onAppReady: function (config) {
var me = this;
me._isDocReady = true;
(new Promise(function(resolve) {
resolve();
})).then(function () {
@ -166,12 +166,12 @@ define([
* api events
* */
_onZoomChange: function(percent, type) {
_onZoomChange: function(percent, type) {
this.statusbar.btnZoomToPage.toggle(type == 2, true);
this.statusbar.btnZoomToWidth.toggle(type == 1, true);
$('.statusbar #label-zoom').text(Common.Utils.String.format(this.zoomText, percent));
Common.localStorage.setItem('pdfe-last-zoom', percent);
if(!this._isDocReady) return;
Common.localStorage.setItem('pdfe-last-zoom', percent);
},
setStatusCaption: function(text, force, delay, callback) {

4
apps/pdfeditor/main/app/view/FileMenuPanels.js
View File

@ -375,7 +375,7 @@ define([
'</div>',
'<div class="fms-flex-apply hidden">',
'<table style="margin: 10px 14px;"><tbody>',
'<table style="margin: 10px 20px;"><tbody>',
'<tr>',
'<td><button class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
'<td></td>',
@ -635,7 +635,7 @@ define([
updateScroller: function() {
if (this.scroller) {
Common.UI.Menu.Manager.hideAll();
var scrolled = this.$el.height()< this.pnlTable.parent().height() + 25 + this.pnlApply.height() + this.$el.find('.header').outerHeight(true);
var scrolled = this.$el.height()< this.pnlTable.parent().height() + 25 + this.pnlApply.height();
this.pnlApply.toggleClass('hidden', !scrolled);
this.trApply.toggleClass('hidden', scrolled);
this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');