Commit 75a175b4 authored by Julia Radzhabova's avatar Julia Radzhabova Committed by GitHub

Merge pull request #38 from ONLYOFFICE/hotfix/v4.1.7

Hotfix/v4.1.7
parents 28bdc1b9 218385d3
...@@ -125,7 +125,7 @@ define([ ...@@ -125,7 +125,7 @@ define([
if (active && active.length > 0) { if (active && active.length > 0) {
_.each(active, function(menu) { _.each(active, function(menu) {
menu.hide(); if (menu) menu.hide();
}); });
return true; return true;
} }
......
...@@ -280,7 +280,7 @@ define([ ...@@ -280,7 +280,7 @@ define([
var target_pane = $(".right-panel"); var target_pane = $(".right-panel");
target_pane.find('> .active').removeClass('active'); target_pane.find('> .active').removeClass('active');
_.each(this._settings, function(item){ this._settings.forEach(function(item){
if (item.btn.isActive()) if (item.btn.isActive())
item.btn.toggle(false, true); item.btn.toggle(false, true);
}); });
......
...@@ -154,8 +154,8 @@ require([ ...@@ -154,8 +154,8 @@ require([
'Main', 'Main',
'Common.Controllers.Fonts' 'Common.Controllers.Fonts'
/** coauthoring begin **/ /** coauthoring begin **/
, 'Common.Controllers.Chat', , 'Common.Controllers.Chat'
'Common.Controllers.Comments', ,'Common.Controllers.Comments'
/** coauthoring end **/ /** coauthoring end **/
,'Common.Controllers.Plugins' ,'Common.Controllers.Plugins'
,'Common.Controllers.ExternalDiagramEditor' ,'Common.Controllers.ExternalDiagramEditor'
......
...@@ -277,7 +277,7 @@ define([ ...@@ -277,7 +277,7 @@ define([
clearSelection: function() { clearSelection: function() {
var target_pane = $(".right-panel"); var target_pane = $(".right-panel");
target_pane.find('> .active').removeClass('active'); target_pane.find('> .active').removeClass('active');
_.each(this._settings, function(item){ this._settings.forEach(function(item){
if (item.btn.isActive()) if (item.btn.isActive())
item.btn.toggle(false, true); item.btn.toggle(false, true);
}); });
......
...@@ -145,8 +145,8 @@ require([ ...@@ -145,8 +145,8 @@ require([
'Main', 'Main',
'Common.Controllers.Fonts' 'Common.Controllers.Fonts'
/** coauthoring begin **/ /** coauthoring begin **/
, 'Common.Controllers.Chat', , 'Common.Controllers.Chat'
'Common.Controllers.Comments', ,'Common.Controllers.Comments'
/** coauthoring end **/ /** coauthoring end **/
,'Common.Controllers.Plugins' ,'Common.Controllers.Plugins'
,'Common.Controllers.ExternalDiagramEditor' ,'Common.Controllers.ExternalDiagramEditor'
......
...@@ -126,7 +126,7 @@ define([ ...@@ -126,7 +126,7 @@ define([
if (this._state.prevDisabled != need_disable) { if (this._state.prevDisabled != need_disable) {
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); item.panel.setLocked(need_disable);
}); });
} }
......
...@@ -240,7 +240,7 @@ define([ ...@@ -240,7 +240,7 @@ define([
clearSelection: function() { clearSelection: function() {
var target_pane = $(".right-panel"); var target_pane = $(".right-panel");
target_pane.find('> .active').removeClass('active'); target_pane.find('> .active').removeClass('active');
_.each(this._settings, function(item){ this._settings.forEach(function(item){
if (item.btn.isActive()) if (item.btn.isActive())
item.btn.toggle(false, true); item.btn.toggle(false, true);
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment