From 3d4e53f7b02334ac8971bb9b85cccefea8cf18a6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 6 Jun 2017 11:04:04 +0300 Subject: [PATCH] Added context menu in the viewer mode (Copy menu item). --- .../main/app/controller/Main.js | 8 +- .../main/app/view/DocumentHolder.js | 89 ++++++++++- apps/documenteditor/main/locale/en.json | 1 + .../main/app/controller/Main.js | 8 +- .../main/app/view/DocumentHolder.js | 84 ++++++++++- apps/presentationeditor/main/locale/en.json | 1 + .../main/app/controller/DocumentHolder.js | 140 +++++++++++------- .../main/app/controller/Main.js | 7 +- .../main/app/controller/Toolbar.js | 2 +- .../main/app/view/DocumentHolder.js | 40 ++++- apps/spreadsheeteditor/main/locale/en.json | 1 + 11 files changed, 303 insertions(+), 78 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 63549a003..5c727d501 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -877,9 +877,11 @@ define([ Common.NotificationCenter.trigger('document:ready', 'main'); } }, 50); - } else if (me.appOptions.canBrandingExt) - Common.NotificationCenter.trigger('document:ready', 'main'); - + } else { + documentHolderController.getView().createDelayedElementsViewer(); + if (me.appOptions.canBrandingExt) + Common.NotificationCenter.trigger('document:ready', 'main'); + } if (this.appOptions.canAnalytics && false) Common.component.Analytics.initialize('UA-12442749-13', 'Document Editor'); diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 70940130a..dfc4bd311 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -81,7 +81,7 @@ define([ me._currentParaObjDisabled = false; var showPopupMenu = function(menu, value, event, docElement, eOpts){ - if (!_.isUndefined(menu) && menu !== null && me.mode.isEdit){ + if (!_.isUndefined(menu) && menu !== null){ Common.UI.Menu.Manager.hideAll(); var showPoint = [event.get_X(), event.get_Y()], @@ -186,9 +186,33 @@ define([ return (!noobject) ? {menu_to_show: menu_to_show, menu_props: menu_props} : null; }; + var fillViewMenuProps = function(selectedElements) { + if (!selectedElements || !_.isArray(selectedElements)) return; + var menu_props = {}, + menu_to_show = me.viewModeMenu, + noobject = true; + for (var i = 0; i