Merge branch 'hotfix/v4.1.6'

apps/api/documents/api.js

@@ -105,63 +105,20 @@
                         text: 'Go to London'
                     },
                     chat: false,
-                    comments: false
+                    comments: false,
+                    leftMenu: true,
+                    rightMenu: true,
+                    toolbar: true
                 },
                 plugins: {
+                    autoStartGuid: 'asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}',
                     url: '../../../../sdkjs-plugins/',
-                    pluginsData: [{
+                    pluginsData: [
-                        name : "chess (fen)",
+                        "helloworld/config.json",
-                        guid : "asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}",
+                        "chess/config.json",
-                        baseUrl: "",
+                        "speech/config.json",
-                        variations : [
+                        "clipart/config.json",
-                            {
-                                description : "chess",
-                                url         : "chess/index.html",
-
-                                icons           : ["chess/icon.png", "chess/icon@2x.png"],
-                                isViewer        : true,
-                                EditorsSupport  : ["word", "cell", "slide"],
-
-                                isVisual        : true,
-                                isModal         : true,
-                                isInsideMode    : false,
-
-                                initDataType    : "ole",
-                                initData        : "",
-
-                                isUpdateOleOnResize : true,
-
-                                buttons         : [ { text: "Ok", primary: true },
-                                                    { text: "Cancel", primary: false } ]
-                            }
                     ]
-                    },
-                    {
-                        name : "glavred",
-                        guid : "asc.{B631E142-E40B-4B4C-90B9-2D00222A286E}",
-                        baseUrl: "",
-                        variations : [
-                            {
-                                description : "glavred",
-                                url         : "glavred/index.html",
-
-                                icons           : ["glavred/icon.png", "glavred/icon@2x.png"],
-                                isViewer        : true,
-                                EditorsSupport  : ["word", "cell", "slide"],
-
-                                isVisual        : true,
-                                isModal         : true,
-                                isInsideMode    : false,
-
-                                initDataType    : "text",
-                                initData        : "",
-
-                                isUpdateOleOnResize : false,
-
-                                buttons         : [ { text: "Ok", primary: true } ]
-                            }
-                        ]
-                    }
                 }
             },
             events: {

apps/common/main/lib/controller/Plugins.js

@@ -224,7 +224,8 @@ define([
                     url = ((plugin.get_BaseUrl().length == 0) ? this.panelPlugins.pluginsPath : plugin.get_BaseUrl()) + url;
 
                 if (variation.get_InsideMode()) {
-                    this.panelPlugins.openInsideMode(plugin.get_Name(), url);
+                    if (!this.panelPlugins.openInsideMode(plugin.get_Name(), url))
+                        this.api.asc_pluginButtonClick(-1);
                 } else {
                     var me = this,
                         arrBtns = variation.get_Buttons(),

apps/common/main/lib/view/Plugins.js

@@ -138,6 +138,8 @@ define([
         },
 
         openInsideMode: function(name, url) {
+            if (!this.pluginsPanel) return false;
+
             this.pluginsPanel.toggleClass('hidden', true);
             this.currentPluginPanel.toggleClass('hidden', false);
 
@@ -161,9 +163,12 @@ define([
 
                 this.iframePlugin.src = url;
             }
+            return true;
         },
 
         closeInsideMode: function() {
+            if (!this.pluginsPanel) return;
+
             if (this.iframePlugin) {
                 this.currentPluginFrame.empty();
                 this.iframePlugin = null;

apps/documenteditor/main/app/controller/Main.js

@@ -61,7 +61,10 @@ define([
         var mapCustomizationElements = {
             about: 'button#left-btn-about',
             feedback: 'button#left-btn-support',
-            goback: '#fm-btn-back > a, #header-back > div'
+            goback: '#fm-btn-back > a, #header-back > div',
+            toolbar: '#viewport #toolbar',
+            leftMenu: '#viewport #left-menu',
+            rightMenu: '#viewport #right-menu'
         };
 
         Common.localStorage.setId('text');
@@ -1768,6 +1771,7 @@ define([
 
                 if (arr.length>0)
                     this.updatePluginsList({
+                        autoStartGuid: plugins.autoStartGuid,
                         url: plugins.url,
                         pluginsData: arr
                     });
@@ -1826,8 +1830,11 @@ define([
                     this.appOptions.pluginsPath = '';
                     this.appOptions.canPlugins = false;
                 }
-                if (this.appOptions.canPlugins)
+                if (this.appOptions.canPlugins) {
                     this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions);
+                    if (plugins.autoStartGuid)
+                        this.api.asc_pluginRun(plugins.autoStartGuid, 0, '');
+                }
                 this.getApplication().getController('LeftMenu').enablePlugins();
             },
 

apps/documenteditor/main/app/view/LeftMenu.js

@@ -309,7 +309,7 @@ define([
 
         showMenu: function(menu, opts) {
             var re = /^(\w+):?(\w*)$/.exec(menu);
-            if (re[1] == 'file') {
+            if (re[1] == 'file' && this.btnFile.isVisible() ) {
                 if (!this.btnFile.pressed) {
                     this.btnFile.toggle(true);
 //                    this.onBtnMenuClick(this.btnFile);

apps/presentationeditor/main/app/controller/Main.js

@@ -59,7 +59,10 @@ define([
         var mapCustomizationElements = {
             about: 'button#left-btn-about',
             feedback: 'button#left-btn-support',
-            goback: '#fm-btn-back > a, #header-back > div'
+            goback: '#fm-btn-back > a, #header-back > div',
+            toolbar: '#viewport #toolbar',
+            leftMenu: '#viewport #left-menu',
+            rightMenu: '#viewport #right-menu'
         };
 
         Common.localStorage.setId('presentation');
@@ -1542,6 +1545,7 @@ define([
 
                 if (arr.length>0)
                     this.updatePluginsList({
+                        autoStartGuid: plugins.autoStartGuid,
                         url: plugins.url,
                         pluginsData: arr
                     });
@@ -1600,8 +1604,11 @@ define([
                     this.appOptions.pluginsPath = '';
                     this.appOptions.canPlugins = false;
                 }
-                if (this.appOptions.canPlugins)
+                if (this.appOptions.canPlugins) {
                     this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions);
+                    if (plugins.autoStartGuid)
+                        this.api.asc_pluginRun(plugins.autoStartGuid, 0, '');
+                }
                 this.getApplication().getController('LeftMenu').enablePlugins();
             },
 

apps/presentationeditor/main/app/view/LeftMenu.js

@@ -330,7 +330,7 @@ define([
 
         showMenu: function(menu) {
             var re = /^(\w+):?(\w*)$/.exec(menu);
-            if (re[1] == 'file') {
+            if (re[1] == 'file' && this.btnFile.isVisible()) {
                 if (!this.btnFile.pressed) {
                     this.btnFile.toggle(true);
 //                    this.onBtnMenuClick(this.btnFile);

apps/spreadsheeteditor/main/app/controller/Main.js

@@ -65,7 +65,10 @@ define([
         var mapCustomizationElements = {
             about: 'button#left-btn-about',
             feedback: 'button#left-btn-support',
-            goback: '#fm-btn-back > a, #header-back > div'
+            goback: '#fm-btn-back > a, #header-back > div',
+            toolbar: '#viewport #toolbar',
+            leftMenu: '#viewport #left-menu',
+            rightMenu: '#viewport #right-menu'
         };
 
         Common.localStorage.setId('table');
@@ -1774,6 +1777,7 @@ define([
 
                 if (arr.length>0)
                     this.updatePluginsList({
+                        autoStartGuid: plugins.autoStartGuid,
                         url: plugins.url,
                         pluginsData: arr
                     });
@@ -1832,8 +1836,11 @@ define([
                     this.appOptions.pluginsPath = '';
                     this.appOptions.canPlugins = false;
                 }
-                if (this.appOptions.canPlugins)
+                if (this.appOptions.canPlugins) {
                     this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions);
+                    if (plugins.autoStartGuid)
+                        this.api.asc_pluginRun(plugins.autoStartGuid, 0, '');
+                }
                 this.getApplication().getController('LeftMenu').enablePlugins();
             },
             

apps/spreadsheeteditor/main/app/view/LeftMenu.js

@@ -294,7 +294,7 @@ define([
 
         showMenu: function(menu) {
             var re = /^(\w+):?(\w*)$/.exec(menu);
-            if (re[1] == 'file') {
+            if (re[1] == 'file' && this.btnFile.isVisible()) {
                 if (!this.btnFile.pressed) {
                     this.btnFile.toggle(true);
                     this.btnFile.$el.focus();