From d51f9be27d7ef526f7daf48126210c759b366b07 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Mon, 8 Jul 2019 13:24:28 +0300 Subject: [PATCH] [Common mobile] Add PluginsShow --- .../mobile/lib}/controller/Plugins.js | 21 ++++++++++--------- apps/documenteditor/mobile/app-dev.js | 8 +++---- apps/documenteditor/mobile/app.js | 8 +++---- apps/presentationeditor/mobile/app-dev.js | 2 ++ apps/presentationeditor/mobile/app.js | 2 ++ apps/spreadsheeteditor/mobile/app-dev.js | 2 ++ apps/spreadsheeteditor/mobile/app.js | 2 ++ 7 files changed, 27 insertions(+), 18 deletions(-) rename apps/{documenteditor/mobile/app => common/mobile/lib}/controller/Plugins.js (94%) diff --git a/apps/documenteditor/mobile/app/controller/Plugins.js b/apps/common/mobile/lib/controller/Plugins.js similarity index 94% rename from apps/documenteditor/mobile/app/controller/Plugins.js rename to apps/common/mobile/lib/controller/Plugins.js index d9eaaa869..d9e37a5d3 100644 --- a/apps/documenteditor/mobile/app/controller/Plugins.js +++ b/apps/common/mobile/lib/controller/Plugins.js @@ -33,12 +33,17 @@ /** * Plugins.js - * Document Editor * - * Created by Julia Svinareva on 1/7/19 + * Created by Julia Svinareva on 8/7/19 * Copyright (c) 2019 Ascensio System SIA. All rights reserved. * */ + +if (Common === undefined) + var Common = {}; + +Common.Controllers = Common.Controllers || {}; + define([ 'core', 'jquery', @@ -47,10 +52,9 @@ define([ ], function (core, $, _, Backbone) { 'use strict'; - DE.Controllers.Plugins = Backbone.Controller.extend(_.extend((function() { + Common.Controllers.Plugins = Backbone.Controller.extend(_.extend((function() { // Private - var rootView, - modal; + var modal; return { models: [], @@ -80,7 +84,6 @@ define([ showPluginModal: function(plugin, variationIndex, frameId, urlAddition) { var me = this, isAndroid = Framework7.prototype.device.android === true, - mainView = DE.getController('Editor').getView('Editor').f7View, isEdit = me.appConfig.isEdit; uiApp.closeModal(); @@ -131,7 +134,7 @@ define([ width: '90%', left: '5%', height: 'auto', - top: '20px', + top: '20px' }); $$(modal).find('.modal-inner').css({padding: '0'}); if (Common.SharedSettings.get('phone')) { @@ -146,8 +149,6 @@ define([ $$('.view.collaboration-root-view.navbar-through').removeClass('navbar-through').addClass('navbar-fixed'); $$('.view.collaboration-root-view .navbar').prependTo('.view.collaboration-root-view > .pages > .page'); } - - DE.getController('Toolbar').getView('Toolbar').hideSearch(); } }, @@ -175,5 +176,5 @@ define([ textCancel: 'Cancel', textLoading: 'Loading' } - })(), DE.Controllers.Plugins || {})) + })(), Common.Controllers.Plugins || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/app-dev.js b/apps/documenteditor/mobile/app-dev.js index 02dfbce11..768ce7629 100644 --- a/apps/documenteditor/mobile/app-dev.js +++ b/apps/documenteditor/mobile/app-dev.js @@ -130,6 +130,7 @@ require([ nameSpace: 'DE', autoCreate: false, controllers : [ + 'Common.Controllers.Plugins', 'Editor', 'Toolbar', 'Search', @@ -150,8 +151,7 @@ require([ 'AddShape', 'AddImage', 'AddOther', - 'Collaboration', - 'Plugins' + 'Collaboration' ] }); @@ -201,6 +201,7 @@ require([ require([ 'common/main/lib/util/LocalStorage', 'common/main/lib/util/utils', + 'common/mobile/lib/controller/Plugins', 'documenteditor/mobile/app/controller/Editor', 'documenteditor/mobile/app/controller/Toolbar', 'documenteditor/mobile/app/controller/Search', @@ -221,8 +222,7 @@ require([ 'documenteditor/mobile/app/controller/add/AddShape', 'documenteditor/mobile/app/controller/add/AddImage', 'documenteditor/mobile/app/controller/add/AddOther', - 'documenteditor/mobile/app/controller/Collaboration', - 'documenteditor/mobile/app/controller/Plugins' + 'documenteditor/mobile/app/controller/Collaboration' ], function() { window.compareVersions = true; app.start(); diff --git a/apps/documenteditor/mobile/app.js b/apps/documenteditor/mobile/app.js index 2aaca7591..0b3aeb561 100644 --- a/apps/documenteditor/mobile/app.js +++ b/apps/documenteditor/mobile/app.js @@ -141,6 +141,7 @@ require([ nameSpace: 'DE', autoCreate: false, controllers : [ + 'Common.Controllers.Plugins', 'Editor', 'Toolbar', 'Search', @@ -161,8 +162,7 @@ require([ 'AddShape', 'AddImage', 'AddOther', - 'Collaboration', - 'Plugins' + 'Collaboration' ] }); @@ -212,6 +212,7 @@ require([ require([ 'common/main/lib/util/LocalStorage', 'common/main/lib/util/utils', + 'common/mobile/lib/controller/Plugins', 'documenteditor/mobile/app/controller/Editor', 'documenteditor/mobile/app/controller/Toolbar', 'documenteditor/mobile/app/controller/Search', @@ -232,8 +233,7 @@ require([ 'documenteditor/mobile/app/controller/add/AddShape', 'documenteditor/mobile/app/controller/add/AddImage', 'documenteditor/mobile/app/controller/add/AddOther', - 'documenteditor/mobile/app/controller/Collaboration', - 'documenteditor/mobile/app/controller/Plugins' + 'documenteditor/mobile/app/controller/Collaboration' ], function() { app.start(); }); diff --git a/apps/presentationeditor/mobile/app-dev.js b/apps/presentationeditor/mobile/app-dev.js index 411ac5c56..eb062d384 100644 --- a/apps/presentationeditor/mobile/app-dev.js +++ b/apps/presentationeditor/mobile/app-dev.js @@ -127,6 +127,7 @@ require([ nameSpace: 'PE', autoCreate: false, controllers : [ + 'Common.Controllers.Plugins', 'Editor', 'Toolbar', 'Search', @@ -195,6 +196,7 @@ require([ require([ 'common/main/lib/util/LocalStorage', 'common/main/lib/util/utils', + 'common/mobile/lib/controller/Plugins', 'presentationeditor/mobile/app/controller/Editor', 'presentationeditor/mobile/app/controller/Toolbar', 'presentationeditor/mobile/app/controller/Search', diff --git a/apps/presentationeditor/mobile/app.js b/apps/presentationeditor/mobile/app.js index b744ea4f9..5103851de 100644 --- a/apps/presentationeditor/mobile/app.js +++ b/apps/presentationeditor/mobile/app.js @@ -138,6 +138,7 @@ require([ nameSpace: 'PE', autoCreate: false, controllers : [ + 'Common.Controllers.Plugins', 'Editor', 'Toolbar', 'Search', @@ -206,6 +207,7 @@ require([ require([ 'common/main/lib/util/LocalStorage', 'common/main/lib/util/utils', + 'common/mobile/lib/controller/Plugins', 'presentationeditor/mobile/app/controller/Editor', 'presentationeditor/mobile/app/controller/Toolbar', 'presentationeditor/mobile/app/controller/Search', diff --git a/apps/spreadsheeteditor/mobile/app-dev.js b/apps/spreadsheeteditor/mobile/app-dev.js index 582d4473a..0a41b8910 100644 --- a/apps/spreadsheeteditor/mobile/app-dev.js +++ b/apps/spreadsheeteditor/mobile/app-dev.js @@ -112,6 +112,7 @@ require([ nameSpace: 'SSE', autoCreate: false, controllers : [ + 'Common.Controllers.Plugins', 'Editor', 'Toolbar', 'Search', @@ -184,6 +185,7 @@ require([ require([ 'common/main/lib/util/LocalStorage', 'common/main/lib/util/utils', + 'common/mobile/lib/controller/Plugins', 'spreadsheeteditor/mobile/app/controller/Editor', 'spreadsheeteditor/mobile/app/controller/Toolbar', 'spreadsheeteditor/mobile/app/controller/Search', diff --git a/apps/spreadsheeteditor/mobile/app.js b/apps/spreadsheeteditor/mobile/app.js index fa8717b31..1f518f056 100644 --- a/apps/spreadsheeteditor/mobile/app.js +++ b/apps/spreadsheeteditor/mobile/app.js @@ -123,6 +123,7 @@ require([ nameSpace: 'SSE', autoCreate: false, controllers : [ + 'Common.Controllers.Plugins', 'Editor', 'Toolbar', 'Search', @@ -195,6 +196,7 @@ require([ require([ 'common/main/lib/util/LocalStorage', 'common/main/lib/util/utils', + 'common/mobile/lib/controller/Plugins', 'spreadsheeteditor/mobile/app/controller/Editor', 'spreadsheeteditor/mobile/app/controller/Toolbar', 'spreadsheeteditor/mobile/app/controller/Search',