Merge branch 'hotfix/v4.1.7'

apps/common/main/lib/component/Menu.js

@@ -125,7 +125,7 @@ define([
 
                     if (active && active.length > 0) {
                         _.each(active, function(menu) {
-                            menu.hide();
+                            if (menu) menu.hide();
                         });
                         return true;
                     }

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

@@ -280,7 +280,7 @@ define([
 
             var target_pane = $(".right-panel");
             target_pane.find('> .active').removeClass('active');
-            _.each(this._settings, function(item){
+            this._settings.forEach(function(item){
                 if (item.btn.isActive())
                     item.btn.toggle(false, true);
             });

apps/presentationeditor/main/app.js

@@ -154,8 +154,8 @@ require([
             'Main',
             'Common.Controllers.Fonts'
             /** coauthoring begin **/
-            , 'Common.Controllers.Chat',
-            'Common.Controllers.Comments',
+            , 'Common.Controllers.Chat'
+            ,'Common.Controllers.Comments'
             /** coauthoring end **/
             ,'Common.Controllers.Plugins'
             ,'Common.Controllers.ExternalDiagramEditor'

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

@@ -277,7 +277,7 @@ define([
         clearSelection: function() {
             var target_pane = $(".right-panel");
             target_pane.find('> .active').removeClass('active');
-            _.each(this._settings, function(item){
+            this._settings.forEach(function(item){
                 if (item.btn.isActive())
                     item.btn.toggle(false, true);
             });

apps/presentationeditor/main/app_dev.js

@@ -145,8 +145,8 @@ require([
             'Main',
             'Common.Controllers.Fonts'
             /** coauthoring begin **/
-            , 'Common.Controllers.Chat',
-            'Common.Controllers.Comments',
+            , 'Common.Controllers.Chat'
+            ,'Common.Controllers.Comments'
             /** coauthoring end **/
             ,'Common.Controllers.Plugins'
             ,'Common.Controllers.ExternalDiagramEditor'

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

@@ -126,7 +126,7 @@ define([
 
             if (this._state.prevDisabled != need_disable) {
                 this._state.prevDisabled = need_disable;
-                _.each(this._settings, function(item){
+                this._settings.forEach(function(item){
                     item.panel.setLocked(need_disable);
                 });
             }

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

@@ -240,7 +240,7 @@ define([
         clearSelection: function() {
             var target_pane = $(".right-panel");
             target_pane.find('> .active').removeClass('active');
-            _.each(this._settings, function(item){
+            this._settings.forEach(function(item){
                 if (item.btn.isActive())
                     item.btn.toggle(false, true);
             });