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

Fix bugs

Browse source
This commit is contained in:
Julia Radzhabova 2019-01-11 14:02:28 +03:00
parent 654902b5d7
commit 54ef4fba40
8 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/view/Header.js
View file

@ -148,6 +148,8 @@ define([
};
function applyUsers(count, originalCount) {
if (!$btnUsers) return;
var has_edit_users = count > 1 || count > 0 && appConfig && !appConfig.isEdit && !appConfig.isRestrictedEdit; // has other user(s) who edit document
if ( has_edit_users ) {
$btnUsers

2
apps/documenteditor/mobile/app/controller/edit/EditChart.js
View file

@ -265,6 +265,8 @@ define([
},
_initBorderColorView: function () {
if (!_shapeObject) return;
var me = this,
paletteBorderColor = me.getView('EditChart').paletteBorderColor,
stroke = _shapeObject.get_ShapeProperties().get_stroke();

2
apps/documenteditor/mobile/app/controller/edit/EditShape.js
View file

@ -261,6 +261,8 @@ define([
},
_initBorderColorView: function () {
if (!_shapeObject) return;
var me = this,
paletteBorderColor = me.getView('EditShape').paletteBorderColor,
stroke = _shapeObject.get_ShapeProperties().get_stroke();

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

@ -226,7 +226,7 @@ define([
this.$el.show();
this.selectMenu(panel, defPanel);
this.api.asc_enableKeyEvents(false);
this.api && this.api.asc_enableKeyEvents(false);
this.fireEvent('menu:show', [this]);
},
@ -234,7 +234,7 @@ define([
hide: function() {
this.$el.hide();
this.fireEvent('menu:hide', [this]);
this.api.asc_enableKeyEvents(true);
this.api && this.api.asc_enableKeyEvents(true);
},
applyMode: function() {

2
apps/presentationeditor/mobile/app/controller/edit/EditChart.js
View file

@ -199,6 +199,8 @@ define([
},
_initBorderColorView: function () {
if (!_shapeObject) return;
var me = this,
paletteBorderColor = me.getView('EditChart').paletteBorderColor,
stroke = _shapeObject.get_stroke();

2
apps/presentationeditor/mobile/app/controller/edit/EditShape.js
View file

@ -194,6 +194,8 @@ define([
},
_initBorderColorView: function () {
if (!_shapeObject) return;
var me = this,
paletteBorderColor = me.getView('EditShape').paletteBorderColor,
stroke = _shapeObject.get_stroke();

2
apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js
View file

@ -230,6 +230,8 @@ define([
},
_initBorderColorView: function () {
if (!_shapeObject) return;
var me = this,
stroke = _shapeObject.get_ShapeProperties().get_stroke();

2
apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js
View file

@ -199,6 +199,8 @@ define([
},
_initBorderColorView: function () {
if (!_shapeObject) return;
var me = this,
stroke = _shapeObject.get_ShapeProperties().get_stroke();