Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
Hotfix/v4.1.7
This commit is contained in:
Julia Radzhabova 2016-10-28 14:51:47 +03:00 committed by GitHub
parent 28bdc1b91a 218385d386
commit 75a175b426
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/Menu.js
View file

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

2
apps/documenteditor/main/app/view/RightMenu.js
View file

@ -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);
});

4
apps/presentationeditor/main/app.js
View file

@ -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'

2
apps/presentationeditor/main/app/view/RightMenu.js
View file

@ -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);
});

4
apps/presentationeditor/main/app_dev.js
View file

@ -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'

2
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file

@ -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);
});
}

2
apps/spreadsheeteditor/main/app/view/RightMenu.js
View file

@ -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);
});