Fix bugs
This commit is contained in:
parent
654902b5d7
commit
54ef4fba40
|
@ -148,6 +148,8 @@ define([
|
||||||
};
|
};
|
||||||
|
|
||||||
function applyUsers(count, originalCount) {
|
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
|
var has_edit_users = count > 1 || count > 0 && appConfig && !appConfig.isEdit && !appConfig.isRestrictedEdit; // has other user(s) who edit document
|
||||||
if ( has_edit_users ) {
|
if ( has_edit_users ) {
|
||||||
$btnUsers
|
$btnUsers
|
||||||
|
|
|
@ -265,6 +265,8 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
_initBorderColorView: function () {
|
_initBorderColorView: function () {
|
||||||
|
if (!_shapeObject) return;
|
||||||
|
|
||||||
var me = this,
|
var me = this,
|
||||||
paletteBorderColor = me.getView('EditChart').paletteBorderColor,
|
paletteBorderColor = me.getView('EditChart').paletteBorderColor,
|
||||||
stroke = _shapeObject.get_ShapeProperties().get_stroke();
|
stroke = _shapeObject.get_ShapeProperties().get_stroke();
|
||||||
|
|
|
@ -261,6 +261,8 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
_initBorderColorView: function () {
|
_initBorderColorView: function () {
|
||||||
|
if (!_shapeObject) return;
|
||||||
|
|
||||||
var me = this,
|
var me = this,
|
||||||
paletteBorderColor = me.getView('EditShape').paletteBorderColor,
|
paletteBorderColor = me.getView('EditShape').paletteBorderColor,
|
||||||
stroke = _shapeObject.get_ShapeProperties().get_stroke();
|
stroke = _shapeObject.get_ShapeProperties().get_stroke();
|
||||||
|
|
|
@ -226,7 +226,7 @@ define([
|
||||||
this.$el.show();
|
this.$el.show();
|
||||||
this.selectMenu(panel, defPanel);
|
this.selectMenu(panel, defPanel);
|
||||||
|
|
||||||
this.api.asc_enableKeyEvents(false);
|
this.api && this.api.asc_enableKeyEvents(false);
|
||||||
|
|
||||||
this.fireEvent('menu:show', [this]);
|
this.fireEvent('menu:show', [this]);
|
||||||
},
|
},
|
||||||
|
@ -234,7 +234,7 @@ define([
|
||||||
hide: function() {
|
hide: function() {
|
||||||
this.$el.hide();
|
this.$el.hide();
|
||||||
this.fireEvent('menu:hide', [this]);
|
this.fireEvent('menu:hide', [this]);
|
||||||
this.api.asc_enableKeyEvents(true);
|
this.api && this.api.asc_enableKeyEvents(true);
|
||||||
},
|
},
|
||||||
|
|
||||||
applyMode: function() {
|
applyMode: function() {
|
||||||
|
|
|
@ -199,6 +199,8 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
_initBorderColorView: function () {
|
_initBorderColorView: function () {
|
||||||
|
if (!_shapeObject) return;
|
||||||
|
|
||||||
var me = this,
|
var me = this,
|
||||||
paletteBorderColor = me.getView('EditChart').paletteBorderColor,
|
paletteBorderColor = me.getView('EditChart').paletteBorderColor,
|
||||||
stroke = _shapeObject.get_stroke();
|
stroke = _shapeObject.get_stroke();
|
||||||
|
|
|
@ -194,6 +194,8 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
_initBorderColorView: function () {
|
_initBorderColorView: function () {
|
||||||
|
if (!_shapeObject) return;
|
||||||
|
|
||||||
var me = this,
|
var me = this,
|
||||||
paletteBorderColor = me.getView('EditShape').paletteBorderColor,
|
paletteBorderColor = me.getView('EditShape').paletteBorderColor,
|
||||||
stroke = _shapeObject.get_stroke();
|
stroke = _shapeObject.get_stroke();
|
||||||
|
|
|
@ -230,6 +230,8 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
_initBorderColorView: function () {
|
_initBorderColorView: function () {
|
||||||
|
if (!_shapeObject) return;
|
||||||
|
|
||||||
var me = this,
|
var me = this,
|
||||||
stroke = _shapeObject.get_ShapeProperties().get_stroke();
|
stroke = _shapeObject.get_ShapeProperties().get_stroke();
|
||||||
|
|
||||||
|
|
|
@ -199,6 +199,8 @@ define([
|
||||||
},
|
},
|
||||||
|
|
||||||
_initBorderColorView: function () {
|
_initBorderColorView: function () {
|
||||||
|
if (!_shapeObject) return;
|
||||||
|
|
||||||
var me = this,
|
var me = this,
|
||||||
stroke = _shapeObject.get_ShapeProperties().get_stroke();
|
stroke = _shapeObject.get_ShapeProperties().get_stroke();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue