From d2de0c7dfc926105d9ffbdec6703b13fb34745af Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Thu, 27 Apr 2017 18:25:02 +0300
Subject: [PATCH] [SSE] refactoring

---
 .../main/app/controller/Main.js               | 26 ----------------
 .../main/app/controller/RightMenu.js          |  6 ++++
 .../main/app/controller/Toolbar.js            | 30 ++++++++-----------
 3 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index 8494492905..1a499bccd4 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -922,13 +922,6 @@ define([
                         }
                     });
 
-                    if (this.toolbarView) {
-                        this.toolbarView.on('insertimage', _.bind(me.onInsertImage, me));
-                        this.toolbarView.on('insertshape', _.bind(me.onInsertShape, me));
-                        this.toolbarView.on('insertchart', _.bind(me.onInsertChart, me));
-                        this.toolbarView.on('inserttextart', _.bind(me.onInsertTextArt, me));
-                    }
-
                     var value = Common.localStorage.getItem('sse-settings-unit');
                     Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric());
 
@@ -1599,25 +1592,6 @@ define([
                 }
             },
 
-            loadLanguages: function() {
-            },
-
-            onInsertImage:  function() {
-                this.getApplication().getController('RightMenu').onInsertImage();
-            },
-
-            onInsertChart:  function() {
-                this.getApplication().getController('RightMenu').onInsertChart();
-            },
-
-            onInsertShape:  function() {
-                this.getApplication().getController('RightMenu').onInsertShape();
-            },
-
-            onInsertTextArt:  function() {
-                this.getApplication().getController('RightMenu').onInsertTextArt();
-            },
-
             onInternalCommand: function(data) {
                 if (data) {
                     switch (data.command) {
diff --git a/apps/spreadsheeteditor/main/app/controller/RightMenu.js b/apps/spreadsheeteditor/main/app/controller/RightMenu.js
index 2c9e6bf459..9596d78082 100644
--- a/apps/spreadsheeteditor/main/app/controller/RightMenu.js
+++ b/apps/spreadsheeteditor/main/app/controller/RightMenu.js
@@ -57,6 +57,12 @@ define([
             this._state = {};
 
             this.addListeners({
+                'Toolbar': {
+                    'insertimage': this.onInsertImage.bind(this),
+                    'insertshape': this.onInsertShape.bind(this),
+                    'insertchart':  this.onInsertChart.bind(this),
+                    'inserttextart': this.onInsertTextArt.bind(this)
+                },
                 'RightMenu': {
                     'rightmenuclick': this.onRightMenuClick
                 }
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index afcb9ede34..32331f88fb 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -174,8 +174,6 @@ define([
             /**
              * UI Events
              */
-            toolbar.btnNewDocument.on('click',                          _.bind(this.onNewDocument, this));
-            toolbar.btnOpenDocument.on('click',                         _.bind(this.onOpenDocument, this));
             toolbar.btnPrint.on('click',                                _.bind(this.onPrint, this));
             toolbar.btnSave.on('click',                                 _.bind(this.onSave, this));
             toolbar.btnUndo.on('click',                                 _.bind(this.onUndo, this));
@@ -283,21 +281,19 @@ define([
             this.api.asc_registerCallback('asc_onMathTypes',            _.bind(this.onMathTypes, this));
         },
 
-        onNewDocument: function(btn, e) {
-            if (this.api)
-                this.api.asc_openNewDocument();
-
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-            Common.component.Analytics.trackEvent('ToolBar', 'New Document');
-        },
-
-        onOpenDocument: function(btn, e) {
-            if (this.api)
-                this.api.asc_loadDocumentFromDisk();
-
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-            Common.component.Analytics.trackEvent('ToolBar', 'Open Document');
-        },
+        // onNewDocument: function(btn, e) {
+        //     this.api.asc_openNewDocument();
+        //
+        //     Common.NotificationCenter.trigger('edit:complete', this.toolbar);
+        //     Common.component.Analytics.trackEvent('ToolBar', 'New Document');
+        // },
+        //
+        // onOpenDocument: function(btn, e) {
+        //     this.api.asc_loadDocumentFromDisk();
+        //
+        //     Common.NotificationCenter.trigger('edit:complete', this.toolbar);
+        //     Common.component.Analytics.trackEvent('ToolBar', 'Open Document');
+        // },
 
         onPrint: function(e) {
             Common.NotificationCenter.trigger('print', this.toolbar);