From c5405c6110ceca644f0ecc4c6a4571382a728779 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 23 Jun 2017 14:54:36 +0300
Subject: [PATCH] Plugins: add isCustomWindow type to variation.

---
 apps/common/main/lib/controller/Plugins.js          |  6 +++++-
 apps/common/main/lib/model/Plugin.js                |  1 +
 apps/common/main/lib/view/Plugins.js                |  6 ++++--
 apps/common/main/resources/less/window.less         | 10 ++++++++++
 apps/documenteditor/main/app/controller/Main.js     |  1 +
 apps/presentationeditor/main/app/controller/Main.js |  1 +
 apps/spreadsheeteditor/main/app/controller/Main.js  |  1 +
 7 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js
index 4bcb79ed4..6bd81688b 100644
--- a/apps/common/main/lib/controller/Plugins.js
+++ b/apps/common/main/lib/controller/Plugins.js
@@ -148,6 +148,7 @@ define([
                     variation.set_Url(itemVar.get('url'));
                     variation.set_Icons(itemVar.get('icons'));
                     variation.set_Visual(itemVar.get('isVisual'));
+                    variation.set_CustomWindow(itemVar.get('isCustomWindow'));
                     variation.set_Viewer(itemVar.get('isViewer'));
                     variation.set_EditorsSupport(itemVar.get('EditorsSupport'));
                     variation.set_Modal(itemVar.get('isModal'));
@@ -248,6 +249,7 @@ define([
                         this.api.asc_pluginButtonClick(-1);
                 } else {
                     var me = this,
+                        isCustomWindow = variation.get_CustomWindow(),
                         arrBtns = variation.get_Buttons(),
                         newBtns = {},
                         size = variation.get_Size();
@@ -260,11 +262,13 @@ define([
                     }
 
                     me.pluginDlg = new Common.Views.PluginDlg({
+                        cls: isCustomWindow ? 'plain' : '',
+                        header: !isCustomWindow,
                         title: plugin.get_Name(),
                         width: size[0], // inner width
                         height: size[1], // inner height
                         url: url,
-                        buttons: newBtns,
+                        buttons: isCustomWindow ? undefined : newBtns,
                         toolcallback: _.bind(this.onToolClose, this)
                     });
                     me.pluginDlg.on('render:after', function(obj){
diff --git a/apps/common/main/lib/model/Plugin.js b/apps/common/main/lib/model/Plugin.js
index 3612817be..0f5ea93dc 100644
--- a/apps/common/main/lib/model/Plugin.js
+++ b/apps/common/main/lib/model/Plugin.js
@@ -58,6 +58,7 @@ define([
                 isViewer: false,
                 EditorsSupport: ["word", "cell", "slide"],
                 isVisual: false,
+                isCustomWindow: false,
                 isModal: false,
                 isInsideMode: false,
                 initDataType: 0,
diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js
index 803ab6aaa..3ce4babd8 100644
--- a/apps/common/main/lib/view/Plugins.js
+++ b/apps/common/main/lib/view/Plugins.js
@@ -290,21 +290,22 @@ define([
         initialize : function(options) {
             var _options = {};
             _.extend(_options,  {
-                cls: 'advanced-settings-dlg',
                 header: true,
                 enableKeyEvents: false
             }, options);
 
             var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34;
+            if (!_options.header) header_footer -= 34;
             _options.width = (Common.Utils.innerWidth()-_options.width)<0 ? Common.Utils.innerWidth(): _options.width,
             _options.height += header_footer;
             _options.height = (Common.Utils.innerHeight()-_options.height)<0 ? Common.Utils.innerHeight(): _options.height;
+            _options.cls += ' advanced-settings-dlg';
 
             this.template = [
                 '<div id="id-plugin-container" class="box" style="height:' + (_options.height-header_footer) + 'px;">',
                     '<div id="id-plugin-placeholder" style="width: 100%;height: 100%;"></div>',
                 '</div>',
-                '<% if (_.size(buttons) > 0) { %>',
+                '<% if ((typeof buttons !== "undefined") && _.size(buttons) > 0) { %>',
                     '<div class="separator horizontal"/>',
                     '<div class="footer" style="text-align: center;">',
                         '<% for(var bt in buttons) { %>',
@@ -326,6 +327,7 @@ define([
 
             this.boxEl = this.$window.find('.body > .box');
             this._headerFooterHeight = (this.options.buttons && _.size(this.options.buttons)>0) ? 85 : 34;
+            if (!this.options.header) this._headerFooterHeight -= 34;
             this._headerFooterHeight += ((parseInt(this.$window.css('border-top-width')) + parseInt(this.$window.css('border-bottom-width'))));
 
             var iframe = document.createElement("iframe");
diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less
index 52532f0ac..351069a5c 100644
--- a/apps/common/main/resources/less/window.less
+++ b/apps/common/main/resources/less/window.less
@@ -190,6 +190,16 @@
         -o-transition: none !important;
     }
 
+    &.plain {
+        border: none;
+        box-shadow: none;
+        border-radius: 0;
+
+        .body, .resize-border {
+            border-radius: 0 !important;
+        }
+    }
+
     .resize-border {
         position: absolute;
         width: 5px;
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index ae8095000..ffb4fedc3 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -1943,6 +1943,7 @@ define([
                                     isViewer: itemVar.isViewer,
                                     EditorsSupport: itemVar.EditorsSupport,
                                     isVisual: itemVar.isVisual,
+                                    isCustomWindow: itemVar.isCustomWindow,
                                     isModal: itemVar.isModal,
                                     isInsideMode: itemVar.isInsideMode,
                                     initDataType: itemVar.initDataType,
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 1d5bbd87d..791ac9b2c 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -1758,6 +1758,7 @@ define([
                                     isViewer: itemVar.isViewer,
                                     EditorsSupport: itemVar.EditorsSupport,
                                     isVisual: itemVar.isVisual,
+                                    isCustomWindow: itemVar.isCustomWindow,
                                     isModal: itemVar.isModal,
                                     isInsideMode: itemVar.isInsideMode,
                                     initDataType: itemVar.initDataType,
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index bfdb3b42f..cdd4a681b 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -1942,6 +1942,7 @@ define([
                                     isViewer: itemVar.isViewer,
                                     EditorsSupport: itemVar.EditorsSupport,
                                     isVisual: itemVar.isVisual,
+                                    isCustomWindow: itemVar.isCustomWindow,
                                     isModal: itemVar.isModal,
                                     isInsideMode: itemVar.isInsideMode,
                                     initDataType: itemVar.initDataType,