[Common mobile] Add PluginsShow

This commit is contained in:
Julia Svinareva 2019-07-08 13:24:28 +03:00
parent c828e8072c
commit d51f9be27d
7 changed files with 27 additions and 18 deletions

View file

@ -33,12 +33,17 @@
/** /**
* Plugins.js * 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. * Copyright (c) 2019 Ascensio System SIA. All rights reserved.
* *
*/ */
if (Common === undefined)
var Common = {};
Common.Controllers = Common.Controllers || {};
define([ define([
'core', 'core',
'jquery', 'jquery',
@ -47,10 +52,9 @@ define([
], function (core, $, _, Backbone) { ], function (core, $, _, Backbone) {
'use strict'; 'use strict';
DE.Controllers.Plugins = Backbone.Controller.extend(_.extend((function() { Common.Controllers.Plugins = Backbone.Controller.extend(_.extend((function() {
// Private // Private
var rootView, var modal;
modal;
return { return {
models: [], models: [],
@ -80,7 +84,6 @@ define([
showPluginModal: function(plugin, variationIndex, frameId, urlAddition) { showPluginModal: function(plugin, variationIndex, frameId, urlAddition) {
var me = this, var me = this,
isAndroid = Framework7.prototype.device.android === true, isAndroid = Framework7.prototype.device.android === true,
mainView = DE.getController('Editor').getView('Editor').f7View,
isEdit = me.appConfig.isEdit; isEdit = me.appConfig.isEdit;
uiApp.closeModal(); uiApp.closeModal();
@ -131,7 +134,7 @@ define([
width: '90%', width: '90%',
left: '5%', left: '5%',
height: 'auto', height: 'auto',
top: '20px', top: '20px'
}); });
$$(modal).find('.modal-inner').css({padding: '0'}); $$(modal).find('.modal-inner').css({padding: '0'});
if (Common.SharedSettings.get('phone')) { 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-through').removeClass('navbar-through').addClass('navbar-fixed');
$$('.view.collaboration-root-view .navbar').prependTo('.view.collaboration-root-view > .pages > .page'); $$('.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', textCancel: 'Cancel',
textLoading: 'Loading' textLoading: 'Loading'
} }
})(), DE.Controllers.Plugins || {})) })(), Common.Controllers.Plugins || {}))
}); });

View file

@ -130,6 +130,7 @@ require([
nameSpace: 'DE', nameSpace: 'DE',
autoCreate: false, autoCreate: false,
controllers : [ controllers : [
'Common.Controllers.Plugins',
'Editor', 'Editor',
'Toolbar', 'Toolbar',
'Search', 'Search',
@ -150,8 +151,7 @@ require([
'AddShape', 'AddShape',
'AddImage', 'AddImage',
'AddOther', 'AddOther',
'Collaboration', 'Collaboration'
'Plugins'
] ]
}); });
@ -201,6 +201,7 @@ require([
require([ require([
'common/main/lib/util/LocalStorage', 'common/main/lib/util/LocalStorage',
'common/main/lib/util/utils', 'common/main/lib/util/utils',
'common/mobile/lib/controller/Plugins',
'documenteditor/mobile/app/controller/Editor', 'documenteditor/mobile/app/controller/Editor',
'documenteditor/mobile/app/controller/Toolbar', 'documenteditor/mobile/app/controller/Toolbar',
'documenteditor/mobile/app/controller/Search', 'documenteditor/mobile/app/controller/Search',
@ -221,8 +222,7 @@ require([
'documenteditor/mobile/app/controller/add/AddShape', 'documenteditor/mobile/app/controller/add/AddShape',
'documenteditor/mobile/app/controller/add/AddImage', 'documenteditor/mobile/app/controller/add/AddImage',
'documenteditor/mobile/app/controller/add/AddOther', 'documenteditor/mobile/app/controller/add/AddOther',
'documenteditor/mobile/app/controller/Collaboration', 'documenteditor/mobile/app/controller/Collaboration'
'documenteditor/mobile/app/controller/Plugins'
], function() { ], function() {
window.compareVersions = true; window.compareVersions = true;
app.start(); app.start();

View file

@ -141,6 +141,7 @@ require([
nameSpace: 'DE', nameSpace: 'DE',
autoCreate: false, autoCreate: false,
controllers : [ controllers : [
'Common.Controllers.Plugins',
'Editor', 'Editor',
'Toolbar', 'Toolbar',
'Search', 'Search',
@ -161,8 +162,7 @@ require([
'AddShape', 'AddShape',
'AddImage', 'AddImage',
'AddOther', 'AddOther',
'Collaboration', 'Collaboration'
'Plugins'
] ]
}); });
@ -212,6 +212,7 @@ require([
require([ require([
'common/main/lib/util/LocalStorage', 'common/main/lib/util/LocalStorage',
'common/main/lib/util/utils', 'common/main/lib/util/utils',
'common/mobile/lib/controller/Plugins',
'documenteditor/mobile/app/controller/Editor', 'documenteditor/mobile/app/controller/Editor',
'documenteditor/mobile/app/controller/Toolbar', 'documenteditor/mobile/app/controller/Toolbar',
'documenteditor/mobile/app/controller/Search', 'documenteditor/mobile/app/controller/Search',
@ -232,8 +233,7 @@ require([
'documenteditor/mobile/app/controller/add/AddShape', 'documenteditor/mobile/app/controller/add/AddShape',
'documenteditor/mobile/app/controller/add/AddImage', 'documenteditor/mobile/app/controller/add/AddImage',
'documenteditor/mobile/app/controller/add/AddOther', 'documenteditor/mobile/app/controller/add/AddOther',
'documenteditor/mobile/app/controller/Collaboration', 'documenteditor/mobile/app/controller/Collaboration'
'documenteditor/mobile/app/controller/Plugins'
], function() { ], function() {
app.start(); app.start();
}); });

View file

@ -127,6 +127,7 @@ require([
nameSpace: 'PE', nameSpace: 'PE',
autoCreate: false, autoCreate: false,
controllers : [ controllers : [
'Common.Controllers.Plugins',
'Editor', 'Editor',
'Toolbar', 'Toolbar',
'Search', 'Search',
@ -195,6 +196,7 @@ require([
require([ require([
'common/main/lib/util/LocalStorage', 'common/main/lib/util/LocalStorage',
'common/main/lib/util/utils', 'common/main/lib/util/utils',
'common/mobile/lib/controller/Plugins',
'presentationeditor/mobile/app/controller/Editor', 'presentationeditor/mobile/app/controller/Editor',
'presentationeditor/mobile/app/controller/Toolbar', 'presentationeditor/mobile/app/controller/Toolbar',
'presentationeditor/mobile/app/controller/Search', 'presentationeditor/mobile/app/controller/Search',

View file

@ -138,6 +138,7 @@ require([
nameSpace: 'PE', nameSpace: 'PE',
autoCreate: false, autoCreate: false,
controllers : [ controllers : [
'Common.Controllers.Plugins',
'Editor', 'Editor',
'Toolbar', 'Toolbar',
'Search', 'Search',
@ -206,6 +207,7 @@ require([
require([ require([
'common/main/lib/util/LocalStorage', 'common/main/lib/util/LocalStorage',
'common/main/lib/util/utils', 'common/main/lib/util/utils',
'common/mobile/lib/controller/Plugins',
'presentationeditor/mobile/app/controller/Editor', 'presentationeditor/mobile/app/controller/Editor',
'presentationeditor/mobile/app/controller/Toolbar', 'presentationeditor/mobile/app/controller/Toolbar',
'presentationeditor/mobile/app/controller/Search', 'presentationeditor/mobile/app/controller/Search',

View file

@ -112,6 +112,7 @@ require([
nameSpace: 'SSE', nameSpace: 'SSE',
autoCreate: false, autoCreate: false,
controllers : [ controllers : [
'Common.Controllers.Plugins',
'Editor', 'Editor',
'Toolbar', 'Toolbar',
'Search', 'Search',
@ -184,6 +185,7 @@ require([
require([ require([
'common/main/lib/util/LocalStorage', 'common/main/lib/util/LocalStorage',
'common/main/lib/util/utils', 'common/main/lib/util/utils',
'common/mobile/lib/controller/Plugins',
'spreadsheeteditor/mobile/app/controller/Editor', 'spreadsheeteditor/mobile/app/controller/Editor',
'spreadsheeteditor/mobile/app/controller/Toolbar', 'spreadsheeteditor/mobile/app/controller/Toolbar',
'spreadsheeteditor/mobile/app/controller/Search', 'spreadsheeteditor/mobile/app/controller/Search',

View file

@ -123,6 +123,7 @@ require([
nameSpace: 'SSE', nameSpace: 'SSE',
autoCreate: false, autoCreate: false,
controllers : [ controllers : [
'Common.Controllers.Plugins',
'Editor', 'Editor',
'Toolbar', 'Toolbar',
'Search', 'Search',
@ -195,6 +196,7 @@ require([
require([ require([
'common/main/lib/util/LocalStorage', 'common/main/lib/util/LocalStorage',
'common/main/lib/util/utils', 'common/main/lib/util/utils',
'common/mobile/lib/controller/Plugins',
'spreadsheeteditor/mobile/app/controller/Editor', 'spreadsheeteditor/mobile/app/controller/Editor',
'spreadsheeteditor/mobile/app/controller/Toolbar', 'spreadsheeteditor/mobile/app/controller/Toolbar',
'spreadsheeteditor/mobile/app/controller/Search', 'spreadsheeteditor/mobile/app/controller/Search',