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

Merge pull request #1731 from ONLYOFFICE/feature/de-document-holder

Browse source 
Feature/de document holder
This commit is contained in:
Julia Radzhabova 2022-05-05 23:44:12 +03:00 committed by GitHub
parent 0f986d9775 06c04a7ac4
commit 2e6142d4eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 3472 additions and 3246 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2065
apps/documenteditor/main/app/controller/DocumentHolder.js
View file

File diff suppressed because it is too large Load diff

5
apps/documenteditor/main/app/controller/Links.js
View file

@ -454,7 +454,8 @@ define([
onShowTOCActions: function(obj, x, y) { onShowTOCActions: function(obj, x, y) {
var action = obj.button, var action = obj.button,
menu = (action==AscCommon.CCButtonType.Toc) ? this.view.contentsUpdateMenu : this.view.contentsMenu, menu = (action==AscCommon.CCButtonType.Toc) ? this.view.contentsUpdateMenu : this.view.contentsMenu,
documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, documentHolder = this.getApplication().getController('DocumentHolder'),
documentHolderView = documentHolder.getView(),
menuContainer = documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)), menuContainer = documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)),
me = this; me = this;
@ -479,7 +480,7 @@ define([
menuContainer.css({left: x, top : y}); menuContainer.css({left: x, top : y});
menuContainer.attr('data-value', 'prevent-canvas-click'); menuContainer.attr('data-value', 'prevent-canvas-click');
documentHolderView._preventClick = true; documentHolder._preventClick = true;
menu.show(); menu.show();
menu.alignPosition(); menu.alignPosition();

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

@ -814,7 +814,7 @@ define([
app.getController('Toolbar').DisableToolbar(disable, options.viewMode, options.reviewMode, options.fillFormMode); app.getController('Toolbar').DisableToolbar(disable, options.viewMode, options.reviewMode, options.fillFormMode);
} }
if (options.documentHolder) { if (options.documentHolder) {
app.getController('DocumentHolder').getView().SetDisabled(disable, options.allowProtect, options.fillFormMode); app.getController('DocumentHolder').SetDisabled(disable, options.allowProtect, options.fillFormMode);
} }
if (options.leftMenu) { if (options.leftMenu) {
if (options.leftMenu.disable) if (options.leftMenu.disable)
@ -1262,7 +1262,7 @@ define([
pluginsController.setApi(me.api); pluginsController.setApi(me.api);
documentHolderController.setApi(me.api); documentHolderController.setApi(me.api);
documentHolderController.createDelayedElements(); // documentHolderController.createDelayedElements();
statusbarController.createDelayedElements(); statusbarController.createDelayedElements();
leftmenuController.getView('LeftMenu').disableMenu('all',false); leftmenuController.getView('LeftMenu').disableMenu('all',false);
@ -1270,7 +1270,7 @@ define([
if (me.appOptions.canBranding) if (me.appOptions.canBranding)
me.getApplication().getController('LeftMenu').leftMenu.getMenu('about').setLicInfo(me.editorConfig.customization); me.getApplication().getController('LeftMenu').leftMenu.getMenu('about').setLicInfo(me.editorConfig.customization);
documentHolderController.getView().setApi(me.api).on('editcomplete', _.bind(me.onEditComplete, me)); documentHolderController.getView().on('editcomplete', _.bind(me.onEditComplete, me));
if (me.appOptions.isEdit) { if (me.appOptions.isEdit) {
if (me.appOptions.canForcesave) {// use asc_setIsForceSaveOnUserSave only when customization->forcesave = true if (me.appOptions.canForcesave) {// use asc_setIsForceSaveOnUserSave only when customization->forcesave = true
@ -1645,7 +1645,7 @@ define([
var app = this.getApplication(), var app = this.getApplication(),
viewport = app.getController('Viewport').getView('Viewport'), viewport = app.getController('Viewport').getView('Viewport'),
statusbarView = app.getController('Statusbar').getView('Statusbar'), statusbarView = app.getController('Statusbar').getView('Statusbar'),
documentHolder = app.getController('DocumentHolder').getView(), documentHolder = app.getController('DocumentHolder'),
toolbarController = app.getController('Toolbar'); toolbarController = app.getController('Toolbar');
viewport && viewport.setMode(this.appOptions); viewport && viewport.setMode(this.appOptions);
@ -2259,7 +2259,7 @@ define([
synchronizeChanges: function() { synchronizeChanges: function() {
this.getApplication().getController('Statusbar').synchronizeChanges(); this.getApplication().getController('Statusbar').synchronizeChanges();
this.getApplication().getController('Common.Controllers.ReviewChanges').synchronizeChanges(); this.getApplication().getController('Common.Controllers.ReviewChanges').synchronizeChanges();
this.getApplication().getController('DocumentHolder').getView().hideTips(); this.getApplication().getController('DocumentHolder').hideTips();
/** coauthoring begin **/ /** coauthoring begin **/
this.getApplication().getController('Toolbar').getView().synchronizeChanges(); this.getApplication().getController('Toolbar').getView().synchronizeChanges();
/** coauthoring end **/ /** coauthoring end **/

4634
apps/documenteditor/main/app/view/DocumentHolder.js
View file

File diff suppressed because it is too large Load diff

2
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -1855,7 +1855,7 @@ define([
cls: 'shifted-right', cls: 'shifted-right',
initMenu: function (value) { initMenu: function (value) {
menuViewUndo.setVisible(me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled); menuViewUndo.setVisible(me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled);
menuViewUndo.setDisabled(!me.api.asc_getCanUndo() && !me._isDisabled); menuViewUndo.setDisabled(!me.api.asc_getCanUndo());
menuViewCopySeparator.setVisible(!value.isChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled); menuViewCopySeparator.setVisible(!value.isChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled);
menuViewAddComment.setVisible(!value.isChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled); menuViewAddComment.setVisible(!value.isChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled);
menuViewAddComment.setDisabled(value.locked); menuViewAddComment.setDisabled(value.locked);

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

@ -2327,7 +2327,7 @@ define([
canComment = iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments && !this._isDisabled && cellinfo.asc_getComments() && cellinfo.asc_getComments().length < 1; canComment = iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments && !this._isDisabled && cellinfo.asc_getComments() && cellinfo.asc_getComments().length < 1;
documentHolder.menuViewUndo.setVisible(this.permissions.canCoAuthoring && this.permissions.canComments && !this._isDisabled); documentHolder.menuViewUndo.setVisible(this.permissions.canCoAuthoring && this.permissions.canComments && !this._isDisabled);
documentHolder.menuViewUndo.setDisabled(!this.api.asc_getCanUndo() && !this._isDisabled); documentHolder.menuViewUndo.setDisabled(!this.api.asc_getCanUndo());
documentHolder.menuViewCopySeparator.setVisible(isInSign); documentHolder.menuViewCopySeparator.setVisible(isInSign);
var isRequested = (signProps) ? signProps.asc_getRequested() : false; var isRequested = (signProps) ? signProps.asc_getRequested() : false;