Fix Bug 35564.
This commit is contained in:
parent
9efa672947
commit
d72edde725
|
@ -173,8 +173,11 @@ define([
|
||||||
|
|
||||||
this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this));
|
this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this));
|
||||||
this.btnInsertFromFile.on('click', _.bind(function(btn){
|
this.btnInsertFromFile.on('click', _.bind(function(btn){
|
||||||
|
if (this._isFromFile) return;
|
||||||
|
this._isFromFile = true;
|
||||||
if (this.api) this.api.ChangeImageFromFile();
|
if (this.api) this.api.ChangeImageFromFile();
|
||||||
this.fireEvent('editcomplete', this);
|
this.fireEvent('editcomplete', this);
|
||||||
|
this._isFromFile = false;
|
||||||
}, this));
|
}, this));
|
||||||
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
|
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
|
||||||
this.btnEditObject.on('click', _.bind(function(btn){
|
this.btnEditObject.on('click', _.bind(function(btn){
|
||||||
|
|
|
@ -127,8 +127,11 @@ define([
|
||||||
|
|
||||||
this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this));
|
this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this));
|
||||||
this.btnInsertFromFile.on('click', _.bind(function(btn){
|
this.btnInsertFromFile.on('click', _.bind(function(btn){
|
||||||
|
if (this._isFromFile) return;
|
||||||
|
this._isFromFile = true;
|
||||||
if (this.api) this.api.ChangeImageFromFile();
|
if (this.api) this.api.ChangeImageFromFile();
|
||||||
this.fireEvent('editcomplete', this);
|
this.fireEvent('editcomplete', this);
|
||||||
|
this._isFromFile = false;
|
||||||
}, this));
|
}, this));
|
||||||
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
|
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
|
||||||
this.btnEditObject.on('click', _.bind(function(btn){
|
this.btnEditObject.on('click', _.bind(function(btn){
|
||||||
|
|
|
@ -181,8 +181,11 @@ define([
|
||||||
this.spnHeight.on('change', _.bind(this.onHeightChange, this));
|
this.spnHeight.on('change', _.bind(this.onHeightChange, this));
|
||||||
this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this));
|
this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this));
|
||||||
this.btnInsertFromFile.on('click', _.bind(function(btn){
|
this.btnInsertFromFile.on('click', _.bind(function(btn){
|
||||||
|
if (this._isFromFile) return;
|
||||||
|
this._isFromFile = true;
|
||||||
if (this.api) this.api.asc_changeImageFromFile();
|
if (this.api) this.api.asc_changeImageFromFile();
|
||||||
Common.NotificationCenter.trigger('edit:complete', this);
|
Common.NotificationCenter.trigger('edit:complete', this);
|
||||||
|
this._isFromFile = false;
|
||||||
}, this));
|
}, this));
|
||||||
this.btnEditObject.on('click', _.bind(function(btn){
|
this.btnEditObject.on('click', _.bind(function(btn){
|
||||||
if (this.api) this.api.asc_startEditCurrentOleObject();
|
if (this.api) this.api.asc_startEditCurrentOleObject();
|
||||||
|
|
Loading…
Reference in a new issue