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

Merge pull request #1160 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-09-07 02:10:33 +03:00 committed by GitHub
parent 3c7358f0ad 3688ccec24
commit cc5fd21f00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 52 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/api/documents/api.js
View file

@ -868,18 +868,20 @@
check = function(regex){ return regex.test(userAgent); },
isIE = !check(/opera/) && (check(/msie/) || check(/trident/) || check(/edge/)),
isChrome = !isIE && check(/\bchrome\b/),
isSafari_mobile = !isIE && !isChrome && check(/safari/) && (navigator.maxTouchPoints>0);
isSafari_mobile = !isIE && !isChrome && check(/safari/) && (navigator.maxTouchPoints>0),
path_type = "main";
path += app + "/";
path += (config.type === "mobile" || isSafari_mobile)
path_type = (config.type === "mobile" || isSafari_mobile)
? "mobile"
: (config.type === "embedded" || (app=='documenteditor') && config.document && config.document.permissions && (config.document.permissions.fillForms===true) &&
(config.document.permissions.edit === false) && (config.document.permissions.review !== true) && (config.editorConfig.mode !== 'view'))
? "embed"
: "main";
: ((app=='documenteditor') && config.document && config.document.permissions && (config.document.permissions.fillForms===true) &&
(config.document.permissions.edit === false) && (config.document.permissions.review !== true) && (config.editorConfig.mode !== 'view'))
? "forms" : (config.type === "embedded") ? "embed"
: "main";
path += path_type;
var index = "/index.html";
if (config.editorConfig) {
if (config.editorConfig && path_type!=="forms") {
var customization = config.editorConfig.customization;
if ( typeof(customization) == 'object' && ( customization.toolbarNoTabs ||
(config.editorConfig.targetApp!=='desktop') && (customization.loaderName || customization.loaderLogo))) {

2
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -1017,7 +1017,7 @@ define([
var wbprotect = this.getApplication().getController('WBProtection');
props = wbprotect ? wbprotect.getWSProps() : null;
}
this._state.wsProps = props ? props.wsProps : {};
this._state.wsProps = props ? props.wsProps : [];
this._state.wsLock = props ? props.wsLock : false;
if (!this.view) return;

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

@ -610,6 +610,8 @@ DE.ApplicationController = new(function(){
if (config.customization.logo.url) {
logo.attr('href', config.customization.logo.url);
} else if (config.customization.logo.url!==undefined) {
logo.removeAttr('href');logo.removeAttr('target');
}
}
var licType = params.asc_getLicenseType();

2
apps/documenteditor/forms/app/controller/ApplicationController.js
View file

@ -438,6 +438,8 @@ define([
if (this.appOptions.customization.logo.url) {
logo.attr('href', this.appOptions.customization.logo.url);
} else if (this.appOptions.customization.logo.url!==undefined) {
logo.removeAttr('href');logo.removeAttr('target');
}
}

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

@ -322,7 +322,7 @@ define([
this.rightmenu.tableSettings.UpdateThemeColors();
this.rightmenu.shapeSettings.UpdateThemeColors();
this.rightmenu.textartSettings.UpdateThemeColors();
this.rightmenu.formSettings.UpdateThemeColors();
this.rightmenu.formSettings && this.rightmenu.formSettings.UpdateThemeColors();
},
updateMetricUnit: function() {

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

@ -465,6 +465,8 @@ PE.ApplicationController = new(function(){
if (config.customization.logo.url) {
logo.attr('href', config.customization.logo.url);
} else if (config.customization.logo.url!==undefined) {
logo.removeAttr('href');logo.removeAttr('target');
}
}

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

@ -363,6 +363,8 @@ SSE.ApplicationController = new(function(){
if (config.customization.logo.url) {
logo.attr('href', config.customization.logo.url);
} else if (config.customization.logo.url!==undefined) {
logo.removeAttr('href');logo.removeAttr('target');
}
}

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

@ -116,7 +116,7 @@ define([
me._currentMathObj = undefined;
me._currentParaObjDisabled = false;
me._isDisabled = false;
me._state = {};
me._state = {wsLock: false, wsProps: []};
me.fastcoauthtips = [];
me._TtHeight = 20;
/** coauthoring begin **/

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

@ -1389,11 +1389,13 @@ define([
Common.Utils.Metric.setCurrentMetric(value);
Common.Utils.InternalSettings.set("sse-settings-unit", value);
if (this.appOptions.isEdit || this.appOptions.isRestrictedEdit) { // set api events for toolbar in the Restricted Editing mode
if (this.appOptions.isRestrictedEdit) {
var toolbarController = application.getController('Toolbar');
toolbarController && toolbarController.setApi(me.api);
application.getController('WBProtection').setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api);
} else if (this.appOptions.isEdit) { // set api events for toolbar in the Restricted Editing mode
var toolbarController = application.getController('Toolbar');
toolbarController && toolbarController.setApi(me.api);
if (!this.appOptions.isEdit) return;
var statusbarController = application.getController('Statusbar'),
rightmenuController = application.getController('RightMenu'),

8
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file

@ -54,7 +54,7 @@ define([
initialize: function() {
this.editMode = true;
this._state = {};
this._state = {wsLock: false, wsProps: []};
this.addListeners({
'Toolbar': {
@ -456,8 +456,10 @@ define([
var wbprotect = this.getApplication().getController('WBProtection');
props = wbprotect ? wbprotect.getWSProps() : null;
}
this._state.wsProps = props.wsProps;
this._state.wsLock = props.wsLock;
if (props) {
this._state.wsProps = props.wsProps;
this._state.wsLock = props.wsLock;
}
this.onSelectionChanged(this.api.asc_getCellInfo());
}
});

10
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -426,9 +426,10 @@ define([
this.api.asc_registerCallback('asc_onUnLockCFManager', _.bind(this.onUnLockCFManager, this));
this.api.asc_registerCallback('asc_onZoomChanged', _.bind(this.onApiZoomChange, this));
Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this));
} else if (config.isRestrictedEdit)
} else if (config.isRestrictedEdit) {
this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onApiSelectionChangedRestricted, this));
Common.NotificationCenter.on('protect:wslock', _.bind(this.onChangeProtectSheet, this));
}
},
// onNewDocument: function(btn, e) {
@ -2913,10 +2914,13 @@ define([
},
onApiSelectionChangedRestricted: function(info) {
if (!this.appConfig.isRestrictedEdit) return;
var selectionType = info.asc_getSelectionType();
this.toolbar.lockToolbar(SSE.enumLock.commentLock, (selectionType == Asc.c_oAscSelectionType.RangeCells) && (!info.asc_getComments() || info.asc_getComments().length>0 || info.asc_getLocked()) ||
this.appConfig && this.appConfig.compatibleFeatures && (selectionType != Asc.c_oAscSelectionType.RangeCells),
{ array: this.btnsComment });
this.toolbar.lockToolbar(SSE.enumLock['Objects'], !!this._state.wsProps['Objects'], { array: this.btnsComment });
},
onApiSelectionChanged_DiagramEditor: function(info) {
@ -4065,7 +4069,7 @@ define([
this.toolbar.lockToolbar(SSE.enumLock.wsLock, this._state.wsLock);
this.toolbar.lockToolbar(SSE.enumLock['InsertHyperlinks'], this._state.wsProps['InsertHyperlinks'], {array: [this.toolbar.btnInsertHyperlink]});
this.onApiSelectionChanged(this.api.asc_getCellInfo());
this.appConfig && this.appConfig.isEdit ? this.onApiSelectionChanged(this.api.asc_getCellInfo()) : this.onApiSelectionChangedRestricted(this.api.asc_getCellInfo());
}
},

22
apps/spreadsheeteditor/main/app/controller/WBProtection.js
View file

@ -98,15 +98,16 @@ define([
setMode: function(mode) {
this.appConfig = mode;
this.view = this.createView('WBProtection', {
this.appConfig.isEdit && (this.view = this.createView('WBProtection', {
mode: mode
});
}));
return this;
},
createToolbarPanel: function() {
return this.view.getPanel();
if (this.view)
return this.view.getPanel();
},
getView: function(name) {
@ -270,6 +271,8 @@ define([
},
onAppReady: function (config) {
if (!this.view) return;
var me = this;
(new Promise(function (resolve) {
resolve();
@ -284,15 +287,17 @@ define([
},
onChangeProtectWorkbook: function() {
this.view.btnProtectWB.toggle(this.api.asc_isProtectedWorkbook(), true);
this.view && this.view.btnProtectWB.toggle(this.api.asc_isProtectedWorkbook(), true);
},
onChangeProtectSheet: function() {
var props = this.getWSProps(true);
this.view.btnProtectSheet.toggle(props.wsLock, true); //current sheet
Common.Utils.lockControls(SSE.enumLock['Objects'], props.wsProps['Objects'], { array: [this.view.chLockedText, this.view.chLockedShape]});
Common.Utils.lockControls(SSE.enumLock.wsLock, props.wsLock, { array: [this.view.btnAllowRanges]});
if (this.view) {
this.view.btnProtectSheet.toggle(props.wsLock, true); //current sheet
Common.Utils.lockControls(SSE.enumLock['Objects'], props.wsProps['Objects'], { array: [this.view.chLockedText, this.view.chLockedShape]});
Common.Utils.lockControls(SSE.enumLock.wsLock, props.wsLock, { array: [this.view.btnAllowRanges]});
}
Common.NotificationCenter.trigger('protect:wslock', props);
},
@ -301,6 +306,8 @@ define([
},
getWSProps: function(update) {
if (!this.appConfig || !this.appConfig.isEdit && !this.appConfig.isRestrictedEdit) return;
if (update || !this._state.protection) {
var wsProtected = !!this.api.asc_isProtectedSheet();
var arr = [];
@ -322,6 +329,7 @@ define([
},
onApiSelectionChanged: function(info) {
if (!this.view) return;
if ($('.asc-window.enable-key-events:visible').length>0) return;
var selectionType = info.asc_getSelectionType();