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

v5.4.2

Browse source
This commit is contained in:
Alexey Golubev 2019-11-27 12:23:13 +03:00
parent 562b462fec a6d4dc6ff7
commit ea1d0b9198
16 changed files with 45 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/common/main/lib/controller/History.js
View file

@ -81,6 +81,7 @@ define([
},
setMode: function(mode) {
this.mode = mode;
if (!mode.canHistoryClose) {
this.panelHistory.$el.find('#history-header').hide();
this.panelHistory.$el.find('#history-list').css('padding-top', 0);
@ -163,6 +164,8 @@ define([
},
onSetHistoryData: function(opts) {
if (!this.mode.canUseHistory) return;
if (opts.data.error) {
var config = {
title: this.notcriticalErrorTitle,

5
apps/common/main/lib/extend/Bootstrap.js
View file

@ -205,10 +205,15 @@ function clearMenus(isFromInputControl) {
})
}
function toggle() {
$('.dropdown-backdrop').remove();
}
$(document)
.off('keydown.bs.dropdown.data-api')
.on('keydown.bs.dropdown.data-api', '[data-toggle=dropdown], [role=menu]' , onDropDownKeyDown);
('ontouchstart' in document.documentElement) && $(document).on('click.bs.dropdown.data-api', '[data-toggle=dropdown]', toggle);
/*
* workaround closing menu by right click
* */

11
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -115,8 +115,6 @@ DE.ApplicationController = new(function(){
}
embedConfig.docTitle = docConfig.title;
if ( !embedConfig.saveUrl && permissions.print === false)
$('#idt-copy').hide();
}
}
@ -221,6 +219,9 @@ DE.ApplicationController = new(function(){
var zf = (config.customization && config.customization.zoom ? parseInt(config.customization.zoom) : -2);
(zf == -1) ? api.zoomFitToPage() : ((zf == -2) ? api.zoomFitToWidth() : api.zoom(zf>0 ? zf : 100));
if ( !embedConfig.saveUrl && permissions.print === false)
$('#idt-download').hide();
if ( !embedConfig.shareUrl )
$('#idt-share').hide();
@ -230,6 +231,9 @@ DE.ApplicationController = new(function(){
if ( !embedConfig.fullscreenUrl )
$('#idt-fullscreen').hide();
if ( !embedConfig.saveUrl && permissions.print === false && !embedConfig.shareUrl && !embedConfig.embedUrl && !embedConfig.fullscreenUrl)
$('#box-tools').addClass('hidden');
common.controller.modals.attach({
share: '#idt-share',
embed: '#idt-embed'
@ -513,7 +517,8 @@ DE.ApplicationController = new(function(){
window["flat_desine"] = true;
api = new Asc.asc_docs_api({
'id-view' : 'editor_sdk'
'id-view' : 'editor_sdk',
'embedded' : true
});
if (api){

2
apps/documenteditor/main/app/controller/LeftMenu.js
View file

@ -875,7 +875,7 @@ define([
requestEditRightsText : 'Requesting editing rights...',
textReplaceSuccess : 'Search has been done. {0} occurrences have been replaced',
textReplaceSkipped : 'The replacement has been made. {0} occurrences were skipped.',
textLoadHistory : 'Loading versions history...',
textLoadHistory : 'Loading version history...',
notcriticalErrorTitle: 'Warning',
leavePageText: 'All unsaved changes in this document will be lost.<br> Click \'Cancel\' then \'Save\' to save them. Click \'OK\' to discard all the unsaved changes.',
warnDownloadAs : 'If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?',

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

@ -487,6 +487,8 @@ define([
},
onRefreshHistory: function(opts) {
if (!this.appOptions.canUseHistory) return;
this.loadMask && this.loadMask.hide();
if (opts.data.error || !opts.data.history) {
var historyStore = this.getApplication().getCollection('Common.Collections.HistoryVersions');

3
apps/documenteditor/main/app/view/FileMenu.js
View file

@ -251,7 +251,8 @@ define([
applyMode: function() {
this.miDownload[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide']();
this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && (this.mode.canRequestSaveAs || this.mode.saveAsUrl) ?'show':'hide']();
var isBCSupport = window["AscDesktopEditor"] ? window["AscDesktopEditor"]["isBlockchainSupport"]() : false;
this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && (this.mode.canRequestSaveAs || this.mode.saveAsUrl) && !isBCSupport ?'show':'hide']();
this.miSaveAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && this.mode.isDesktopApp && this.mode.isOffline)?'show':'hide']();
this.miSave[this.mode.isEdit?'show':'hide']();
this.miEdit[!this.mode.isEdit && this.mode.canEdit && this.mode.canRequestEditRights ?'show':'hide']();

2
apps/documenteditor/main/locale/en.json
View file

@ -322,7 +322,7 @@
"DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document",
"DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
"DE.Controllers.LeftMenu.requestEditRightsText": "Requesting editing rights...",
"DE.Controllers.LeftMenu.textLoadHistory": "Loading versions history...",
"DE.Controllers.LeftMenu.textLoadHistory": "Loading version history...",
"DE.Controllers.LeftMenu.textNoTextFound": "The data you have been searching for could not be found. Please adjust your search options.",
"DE.Controllers.LeftMenu.textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
"DE.Controllers.LeftMenu.textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",

2
apps/documenteditor/main/locale/it.json
View file

@ -322,7 +322,7 @@
"DE.Controllers.LeftMenu.newDocumentTitle": "Documento senza nome",
"DE.Controllers.LeftMenu.notcriticalErrorTitle": "Avviso",
"DE.Controllers.LeftMenu.requestEditRightsText": "Richiesta di autorizzazione di modifica...",
"DE.Controllers.LeftMenu.textLoadHistory": "Loading versions history...",
"DE.Controllers.LeftMenu.textLoadHistory": "Loading version history...",
"DE.Controllers.LeftMenu.textNoTextFound": "I dati da cercare non sono stati trovati. Modifica i parametri di ricerca.",
"DE.Controllers.LeftMenu.textReplaceSkipped": "La sostituzione è stata effettuata. {0} occorrenze sono state saltate.",
"DE.Controllers.LeftMenu.textReplaceSuccess": "La ricerca è stata effettuata. Occorrenze sostituite: {0}",

2
apps/documenteditor/main/locale/lv.json
View file

@ -296,7 +296,7 @@
"DE.Controllers.LeftMenu.newDocumentTitle": "Dokuments bez nosaukuma",
"DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
"DE.Controllers.LeftMenu.requestEditRightsText": "Pieprasa rediģēšanas tiesības...",
"DE.Controllers.LeftMenu.textLoadHistory": "Loading versions history...",
"DE.Controllers.LeftMenu.textLoadHistory": "Loading version history...",
"DE.Controllers.LeftMenu.textNoTextFound": "Text not found",
"DE.Controllers.LeftMenu.textReplaceSkipped": "Replace was done. Some occurrences was skipped.",
"DE.Controllers.LeftMenu.textReplaceSuccess": "All occurrences was replaced",

2
apps/documenteditor/main/locale/sl.json
View file

@ -163,7 +163,7 @@
"DE.Controllers.LeftMenu.newDocumentTitle": "Neimenovan dokument",
"DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
"DE.Controllers.LeftMenu.requestEditRightsText": "Zahtevanje urejevalnih pravic...",
"DE.Controllers.LeftMenu.textLoadHistory": "Loading versions history...",
"DE.Controllers.LeftMenu.textLoadHistory": "Loading version history...",
"DE.Controllers.LeftMenu.textNoTextFound": "Podatkov, katere iščete, ni bilo mogoče najti. Prosim nastavite svoje možnosti iskanja.",
"DE.Controllers.LeftMenu.textReplaceSkipped": "Nadomestek je bil izdelan. {0} dogodki so bili preskočeni.",
"DE.Controllers.LeftMenu.textReplaceSuccess": "Iskanje je bilo storjeno. Dogodki nadomeščeni: {0}",

2
apps/documenteditor/main/locale/tr.json
View file

@ -252,7 +252,7 @@
"DE.Controllers.LeftMenu.newDocumentTitle": "İsimlendirilmemiş döküman",
"DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
"DE.Controllers.LeftMenu.requestEditRightsText": "Düzenleme hakları isteniyor...",
"DE.Controllers.LeftMenu.textLoadHistory": "Loading versions history...",
"DE.Controllers.LeftMenu.textLoadHistory": "Loading version history...",
"DE.Controllers.LeftMenu.textNoTextFound": "Aradığınız veri bulunamadı. Lütfen arama seçeneklerinizi ayarlayınız.",
"DE.Controllers.LeftMenu.textReplaceSkipped": "Değiştirme yapıldı. {0} olay atlandı.",
"DE.Controllers.LeftMenu.textReplaceSuccess": "Arama yapıldı. {0} olay değiştirildi.",

8
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -111,8 +111,6 @@ PE.ApplicationController = new(function(){
}
embedConfig.docTitle = docConfig.title;
if (!embedConfig.saveUrl && permissions.print === false)
$('#idt-copy').hide();
}
}
@ -225,6 +223,9 @@ PE.ApplicationController = new(function(){
var zf = (config.customization && config.customization.zoom ? parseInt(config.customization.zoom) : -1);
(zf == -1) ? api.zoomFitToPage() : ((zf == -2) ? api.zoomFitToWidth() : api.zoom(zf>0 ? zf : 100));
if (!embedConfig.saveUrl && permissions.print === false)
$('#idt-download').hide();
if ( !embedConfig.shareUrl )
$('#idt-share').hide();
@ -234,6 +235,9 @@ PE.ApplicationController = new(function(){
if ( !embedConfig.fullscreenUrl )
$('#idt-fullscreen').hide();
if ( !embedConfig.saveUrl && permissions.print === false && !embedConfig.shareUrl && !embedConfig.embedUrl && !embedConfig.fullscreenUrl)
$('#box-tools').addClass('hidden');
common.controller.modals.attach({
share: '#idt-share',
embed: '#idt-embed'

3
apps/presentationeditor/main/app/view/FileMenu.js
View file

@ -246,7 +246,8 @@ define([
applyMode: function() {
this.miDownload[(this.mode.canDownload && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide']();
this.miSaveCopyAs[(this.mode.canDownload && (!this.mode.isDesktopApp || !this.mode.isOffline)) && (this.mode.canRequestSaveAs || this.mode.saveAsUrl) ?'show':'hide']();
var isBCSupport = window["AscDesktopEditor"] ? window["AscDesktopEditor"]["isBlockchainSupport"]() : false;
this.miSaveCopyAs[(this.mode.canDownload && (!this.mode.isDesktopApp || !this.mode.isOffline)) && (this.mode.canRequestSaveAs || this.mode.saveAsUrl) && !isBCSupport ?'show':'hide']();
this.miSaveAs[(this.mode.canDownload && this.mode.isDesktopApp && this.mode.isOffline)?'show':'hide']();
this.miSave[this.mode.isEdit?'show':'hide']();
this.miEdit[!this.mode.isEdit && this.mode.canEdit && this.mode.canRequestEditRights ?'show':'hide']();

11
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file

@ -109,8 +109,6 @@ SSE.ApplicationController = new(function(){
}
embedConfig.docTitle = docConfig.title;
if ( !embedConfig.saveUrl && permissions.print === false)
$('#idt-copy').hide();
}
}
@ -170,6 +168,9 @@ SSE.ApplicationController = new(function(){
function onDocumentContentReady() {
hidePreloader();
if ( !embedConfig.saveUrl && permissions.print === false)
$('#idt-download').hide();
if ( !embedConfig.shareUrl )
$('#idt-share').hide();
@ -179,6 +180,9 @@ SSE.ApplicationController = new(function(){
if ( !embedConfig.fullscreenUrl )
$('#idt-fullscreen').hide();
if ( !embedConfig.saveUrl && permissions.print === false && !embedConfig.shareUrl && !embedConfig.embedUrl && !embedConfig.fullscreenUrl)
$('#box-tools').addClass('hidden');
common.controller.modals.attach({
share: '#idt-share',
embed: '#idt-embed'
@ -532,7 +536,8 @@ SSE.ApplicationController = new(function(){
});
api = new Asc.spreadsheet_api({
'id-view': 'editor_sdk'
'id-view': 'editor_sdk',
'embedded' : true
});
if (api){

2
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -873,7 +873,7 @@ define([
}
});
}
} else if (!this.appOptions.isDesktopApp && !this.appOptions.canBrandingExt &&
} else if (!this.appOptions.isDesktopApp && !this.appOptions.isEditDiagram && !this.appOptions.isEditMailMerge && !this.appOptions.canBrandingExt &&
this.editorConfig && this.editorConfig.customization && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)) {
Common.UI.warning({
title: this.textPaidFeature,

3
apps/spreadsheeteditor/main/app/view/FileMenu.js
View file

@ -235,7 +235,8 @@ define([
applyMode: function() {
this.miDownload[(this.mode.canDownload && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide']();
this.miSaveCopyAs[(this.mode.canDownload && (!this.mode.isDesktopApp || !this.mode.isOffline)) && (this.mode.canRequestSaveAs || this.mode.saveAsUrl) ?'show':'hide']();
var isBCSupport = window["AscDesktopEditor"] ? window["AscDesktopEditor"]["isBlockchainSupport"]() : false;
this.miSaveCopyAs[(this.mode.canDownload && (!this.mode.isDesktopApp || !this.mode.isOffline)) && (this.mode.canRequestSaveAs || this.mode.saveAsUrl) && !isBCSupport ?'show':'hide']();
this.miSaveAs[(this.mode.canDownload && this.mode.isDesktopApp && this.mode.isOffline)?'show':'hide']();
this.miSave[this.mode.isEdit?'show':'hide']();
this.miEdit[!this.mode.isEdit && this.mode.canEdit && this.mode.canRequestEditRights ?'show':'hide']();