From ce8d332d3202ffc6ac8272dc2380b50d26cea2fd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 15 Mar 2017 14:22:04 +0300 Subject: [PATCH] Delete unused method "applyEditRights" from api. --- apps/api/documents/api.js | 3 +- .../main/app/controller/Main.js | 63 ++---------------- .../main/app/controller/Main.js | 66 ++----------------- .../main/app/controller/Main.js | 56 ++-------------- .../mobile/app/controller/Main.js | 62 ----------------- 5 files changed, 18 insertions(+), 232 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 16102c2c6..a7d9dfde2 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -270,7 +270,7 @@ res; if (msg.event === 'onRequestEditRights' && !handler) { - _applyEditRights(false, 'handler is\'n defined'); + _applyEditRights(false, 'handler isn\'t defined'); } else if (msg.event === 'onInternalMessage' && msg.data && msg.data.type == 'localstorage') { _callLocalStorage(msg.data.data); } else { @@ -546,7 +546,6 @@ return { showError : _showError, showMessage : _showMessage, - applyEditRights : _applyEditRights, processSaveResult : _processSaveResult, processRightsChange : _processRightsChange, denyEditingRights : _denyEditingRights, diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 31116fd5b..acf1541d0 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -708,64 +708,13 @@ define([ }, onApplyEditRights: function(data) { - var application = this.getApplication(); - application.getController('Statusbar').setStatusCaption(''); + this.getApplication().getController('Statusbar').setStatusCaption(''); - if (data) { - if (data.allowed) { - data.requestrights = true; - this.appOptions.isEdit= true; - - this.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'],ApplyEditRights); - - var me = this; - setTimeout(function(){ - me.applyModeCommonElements(); - me.applyModeEditorElements(); - me.api.asc_setViewMode(false); - - var timer_rp = setInterval(function(){ - clearInterval(timer_rp); - - var toolbarController = application.getController('Toolbar'), - rightmenuController = application.getController('RightMenu'), - leftmenuController = application.getController('LeftMenu'), - documentHolderController = application.getController('DocumentHolder'), - fontsControllers = application.getController('Common.Controllers.Fonts'); - - leftmenuController.setMode(me.appOptions).createDelayedElements(); - - rightmenuController.createDelayedElements(); - - Common.NotificationCenter.trigger('layout:changed', 'main'); - - var timer_sl = setInterval(function(){ - if (window.styles_loaded) { - clearInterval(timer_sl); - - documentHolderController.getView('DocumentHolder').createDelayedElements(); - documentHolderController.getView('DocumentHolder').changePosition(); - me.loadLanguages(); - - var shapes = me.api.asc_getPropertyEditorShapes(); - if (shapes) - me.fillAutoShapes(shapes[0], shapes[1]); - - me.fillTextArt(me.api.asc_getTextArtPreviews()); - me.updateThemeColors(); - toolbarController.activateControls(); - - me.api.UpdateInterfaceState(); - } - }, 50); - },50); - }, 100); - } else { - Common.UI.info({ - title: this.requestEditFailedTitleText, - msg: data.message || this.requestEditFailedMessageText - }); - } + if (data && !data.allowed) { + Common.UI.info({ + title: this.requestEditFailedTitleText, + msg: data.message || this.requestEditFailedMessageText + }); } }, diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index cb405f72b..2400623cb 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -510,67 +510,13 @@ define([ }, onApplyEditRights: function(data) { - var application = this.getApplication(); - application.getController('Statusbar').setStatusCaption(''); + this.getApplication().getController('Statusbar').setStatusCaption(''); - if (data) { - if (data.allowed) { - data.requestrights = true; - this.appOptions.isEdit= true; - - this.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'],ApplyEditRights); - - var me = this; - setTimeout(function(){ - me.applyModeCommonElements(); - me.applyModeEditorElements('view'); - me.api.asc_setViewMode(false); - - var timer_rp = setInterval(function(){ - clearInterval(timer_rp); - - var toolbarController = application.getController('Toolbar'), - viewportController = application.getController('Viewport'), - rightmenuController = application.getController('RightMenu'), - leftmenuController = application.getController('LeftMenu'), - documentHolderController = application.getController('DocumentHolder'), - fontsControllers = application.getController('Common.Controllers.Fonts'); - - leftmenuController.setMode(me.appOptions).createDelayedElements(); - - rightmenuController.createDelayedElements(); - - Common.NotificationCenter.trigger('layout:changed', 'main'); - - var timer_sl = setInterval(function(){ - if (window.styles_loaded) { - clearInterval(timer_sl); - - documentHolderController.getView('DocumentHolder').createDelayedElements(); - documentHolderController.getView('DocumentHolder').changePosition(); - // me.getController('Common.controller.CommentsPopover').onDocumentContentReady(); - // me.getController('Search').setMode({isEdit: me.modeEdit}); - - me.api.asc_registerCallback('asc_onFocusObject', _.bind(me.onFocusObject, me)); - me.api.asc_registerCallback('asc_onUpdateLayout', _.bind(me.fillLayoutsStore, me)); // slide layouts loading - me.updateThemeColors(); - var shapes = me.api.asc_getPropertyEditorShapes(); - if (shapes) - me.fillAutoShapes(shapes[0], shapes[1]); - me.fillTextArt(me.api.asc_getTextArtPreviews()); - toolbarController.activateControls(); - - me.api.UpdateInterfaceState(); - } - }, 50); - },50); - }, 100); - } else { - Common.UI.info({ - title: this.requestEditFailedTitleText, - msg: data.message || this.requestEditFailedMessageText - }); - } + if (data && !data.allowed) { + Common.UI.info({ + title: this.requestEditFailedTitleText, + msg: data.message || this.requestEditFailedMessageText + }); } }, diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 3882c35dc..99d939313 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -514,57 +514,11 @@ define([ }, onApplyEditRights: function(data) { - if (data) { - if (data.allowed) { - this.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'],ApplyEditRights); - this.appOptions.isEdit = true; - - var me = this; - setTimeout(function(){ - me.applyModeCommonElements(); - me.applyModeEditorElements('view'); - me.api.asc_setViewMode(false); - - var application = me.getApplication(); - var documentHolderController = application.getController('DocumentHolder'); - - application.getController('LeftMenu').setMode(me.appOptions).createDelayedElements(); - Common.NotificationCenter.trigger('layout:changed', 'main'); - - var timer_sl = setInterval(function(){ - if (window.styles_loaded) { - clearInterval(timer_sl); - - documentHolderController.getView('DocumentHolder').createDelayedElements(); - documentHolderController.resetApi(); - - application.getController('Toolbar').createDelayedElements(); - application.getController('RightMenu').createDelayedElements(); - application.getController('Statusbar').getView('Statusbar').update(); - application.getController('CellEditor').setMode(me.appOptions); - - me.api.asc_registerCallback('asc_onSaveUrl', _.bind(me.onSaveUrl, me)); - me.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(me.onDocumentModifiedChanged, me)); - me.api.asc_registerCallback('asc_onDocumentCanSaveChanged', _.bind(me.onDocumentCanSaveChanged, me)); - me.api.asc_registerCallback('asc_onDownloadUrl', _.bind(me.onDownloadUrl, me)); - var shapes = me.api.asc_getPropertyEditorShapes(); - if (shapes) - me.fillAutoShapes(shapes[0], shapes[1]); - - me.fillTextArt(me.api.asc_getTextArtPreviews()); - me.updateThemeColors(); - - application.getController('FormulaDialog').setApi(me.api); - } - }, 50); - }, 50); - } - else { - Common.UI.info({ - title: this.requestEditFailedTitleText, - msg: data.message || this.requestEditFailedMessageText - }); - } + if (data && !data.allowed) { + Common.UI.info({ + title: this.requestEditFailedTitleText, + msg: data.message || this.requestEditFailedMessageText + }); } }, diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index fe649c843..30f54cc44 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -435,68 +435,6 @@ define([ } }, - onApplyEditRights: function(data) { -// var application = this.getApplication(); -// application.getController('Statusbar').setStatusCaption(''); -// -// if (data) { -// if (data.allowed) { -// data.requestrights = true; -// this.appOptions.isEdit= true; -// -// this.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction,ApplyEditRights); -// -// var me = this; -// setTimeout(function(){ -// me.applyModeCommonElements(); -// me.applyModeEditorElements(); -// me.api.asc_setViewMode(false); -// -// var timer_rp = setInterval(function(){ -// clearInterval(timer_rp); -// -// var toolbarController = application.getController('Toolbar'), -// rightmenuController = application.getController('RightMenu'), -// leftmenuController = application.getController('LeftMenu'), -// documentHolderController = application.getController('DocumentHolder'), -// fontsControllers = application.getController('Common.Controllers.Fonts'); -// -// leftmenuController.setMode(me.appOptions).createDelayedElements(); -// -// rightmenuController.createDelayedElements(); -// -// Common.NotificationCenter.trigger('layout:changed', 'main'); -// -// var timer_sl = setInterval(function(){ -// if (window.styles_loaded) { -// clearInterval(timer_sl); -// -// documentHolderController.getView('DocumentHolder').createDelayedElements(); -// documentHolderController.getView('DocumentHolder').changePosition(); -// me.loadLanguages(); -// -// var shapes = me.api.asc_getPropertyEditorShapes(); -// if (shapes) -// me.fillAutoShapes(shapes[0], shapes[1]); -// -// me.fillTextArt(me.api.asc_getTextArtPreviews()); -// me.updateThemeColors(); -// toolbarController.activateControls(); -// -// me.api.UpdateInterfaceState(); -// } -// }, 50); -// },50); -// }, 100); -// } else { -// Common.UI.info({ -// title: this.requestEditFailedTitleText, -// msg: data.message || this.requestEditFailedMessageText -// }); -// } -// } - }, - onDocumentContentReady: function() { if (this._isDocReady) return;