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

Merge pull request #2391 from ONLYOFFICE/fix/bugfix

Browse Source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova
2023-05-15 21:29:22 +03:00
committed by GitHub
parent b577752f23 941edff7fb
commit 1ab27eabfa
16 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/common/main/lib/view/ReviewChanges.js
View File

@ -592,6 +592,8 @@ define([
]
}));
me.btnCompare.menu.items[2].setVisible(me.appConfig.canRequestCompareFile || me.appConfig.fileChoiceUrl && me.appConfig.fileChoiceUrl.indexOf("{documentType}")>-1);
me.btnCompare.menu.items[1].setDisabled(me.appConfig.disableNetworkFunctionality);
me.btnCompare.menu.items[2].setDisabled(me.appConfig.disableNetworkFunctionality);
me.btnCompare.updateHint(me.tipCompare);
@ -601,6 +603,7 @@ define([
{caption: me.mniFromUrl, value: 'url'},
]
}));
me.btnCombine.menu.items[1].setDisabled(me.appConfig.disableNetworkFunctionality);
me.btnCombine.updateHint(me.tipCombine);
}

2
apps/documenteditor/embed/index.html
View File

@ -216,7 +216,7 @@
<p id="id-critical-error-message"></p>
</div>
<div class="modal-footer">
<button id="id-critical-error-close" class="btn btn-sm btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="id-critical-error-close" class="btn btn-sm" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</div>

2
apps/documenteditor/embed/index.html.deploy
View File

@ -208,7 +208,7 @@
<p id="id-critical-error-message"></p>
</div>
<div class="modal-footer">
<button id="id-critical-error-close" class="btn btn-sm btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="id-critical-error-close" class="btn btn-sm" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</div>

2
apps/documenteditor/embed/index_loader.html
View File

@ -316,7 +316,7 @@
<p id="id-critical-error-message"></p>
</div>
<div class="modal-footer">
<button id="id-critical-error-close" class="btn btn-sm btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="id-critical-error-close" class="btn btn-sm" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</div>

2
apps/documenteditor/embed/index_loader.html.deploy
View File

@ -308,7 +308,7 @@
<p id="id-critical-error-message"></p>
</div>
<div class="modal-footer">
<button id="id-critical-error-close" class="btn btn-sm btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="id-critical-error-close" class="btn btn-sm" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</div>

2
apps/documenteditor/main/app/controller/Main.js
View File

@ -452,7 +452,7 @@ define([
this.appOptions.canFeatureContentControl = true;
this.appOptions.canFeatureForms = !!this.api.asc_isSupportFeature("forms");
this.appOptions.uiRtl = Common.localStorage.getBool("ui-rtl");
this.appOptions.disableNetworkFunctionality = !!(window["AscDesktopEditor"] && window["AscDesktopEditor"]["isSupportNetworkFunctionality"] && false === window["AscDesktopEditor"]["isSupportNetworkFunctionality"]());
this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false));
this.appOptions.user.guest && this.appOptions.canRenameAnonymous && Common.NotificationCenter.on('user:rename', _.bind(this.showRenameUserDialog, this));

1
apps/documenteditor/main/app/controller/Toolbar.js
View File

@ -2407,6 +2407,7 @@ define([
props: me.api.asc_GetWatermarkProps(),
api: me.api,
lang: me.mode.lang,
disableNetworkFunctionality: me.mode.disableNetworkFunctionality,
storage: me.mode.canRequestInsertImage || me.mode.fileChoiceUrl && me.mode.fileChoiceUrl.indexOf("{documentType}")>-1,
fontStore: me.fontstore,
handler: function(result, value) {

2
apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
View File

@ -187,6 +187,8 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
this.imageControls.push(this.btnSelectImage);
this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this));
this.btnSelectImage.menu.items[2].setVisible(this.storage);
this.btnSelectImage.menu.items[1].setDisabled(this.options.disableNetworkFunctionality);
this.btnSelectImage.menu.items[2].setDisabled(this.options.disableNetworkFunctionality);
this._arrScale = [
{displayValue: this.textAuto, value: -1},

2
apps/presentationeditor/embed/index.html
View File

@ -267,7 +267,7 @@
<p id="id-critical-error-message"></p>
</div>
<div class="modal-footer">
<button id="id-critical-error-close" class="btn btn-sm btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="id-critical-error-close" class="btn btn-sm" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</div>

2
apps/presentationeditor/embed/index.html.deploy
View File

@ -261,7 +261,7 @@
<p id="id-critical-error-message"></p>
</div>
<div class="modal-footer">
<button id="id-critical-error-close" class="btn btn-sm btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="id-critical-error-close" class="btn btn-sm" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</div>

2
apps/presentationeditor/embed/index_loader.html
View File

@ -315,7 +315,7 @@
<p id="id-critical-error-message"></p>
</div>
<div class="modal-footer">
<button id="id-critical-error-close" class="btn btn-sm btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="id-critical-error-close" class="btn btn-sm" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</div>

2
apps/presentationeditor/embed/index_loader.html.deploy
View File

@ -308,7 +308,7 @@
<p id="id-critical-error-message"></p>
</div>
<div class="modal-footer">
<button id="id-critical-error-close" class="btn btn-sm btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="id-critical-error-close" class="btn btn-sm" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</div>

2
apps/spreadsheeteditor/embed/index.html
View File

@ -240,7 +240,7 @@
<p id="id-critical-error-message"></p>
</div>
<div class="modal-footer">
<button id="id-critical-error-close" class="btn btn-sm btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="id-critical-error-close" class="btn btn-sm" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</div>

2
apps/spreadsheeteditor/embed/index.html.deploy
View File

@ -232,7 +232,7 @@
<p id="id-critical-error-message"></p>
</div>
<div class="modal-footer">
<button id="id-critical-error-close" class="btn btn-sm btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="id-critical-error-close" class="btn btn-sm" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</div>

2
apps/spreadsheeteditor/embed/index_loader.html
View File

@ -314,7 +314,7 @@
<p id="id-critical-error-message"></p>
</div>
<div class="modal-footer">
<button id="id-critical-error-close" class="btn btn-sm btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="id-critical-error-close" class="btn btn-sm" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</div>

2
apps/spreadsheeteditor/embed/index_loader.html.deploy
View File

@ -306,7 +306,7 @@
<p id="id-critical-error-message"></p>
</div>
<div class="modal-footer">
<button id="id-critical-error-close" class="btn btn-sm btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="id-critical-error-close" class="btn btn-sm" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</div>