From f0cdbe2860d0b8e28d6c9f44a4518398d1bdc634 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 22 Aug 2017 16:32:30 +0300 Subject: [PATCH] Fix Bug 35582. --- apps/documenteditor/main/app/view/ShapeSettings.js | 2 +- apps/presentationeditor/main/app/view/ShapeSettings.js | 2 +- apps/presentationeditor/main/app/view/SlideSettings.js | 2 +- apps/presentationeditor/main/app/view/TextArtSettings.js | 2 +- apps/spreadsheeteditor/main/app/view/ShapeSettings.js | 2 +- apps/spreadsheeteditor/main/app/view/TextArtSettings.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index f6975dee3..72f4a4919 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1201,7 +1201,7 @@ define([ this.fillControls.push(this.btnInsertFromUrl); this.btnInsertFromFile.on('click', _.bind(function(btn){ - if (this.api) this.api.ChangeShapeImageFromFile(); + if (this.api) this.api.ChangeShapeImageFromFile(this.BlipFillType); this.fireEvent('editcomplete', this); }, this)); this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this)); diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index e44ce7f15..aa989206f 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1114,7 +1114,7 @@ define([ this.fillControls.push(this.btnInsertFromUrl); this.btnInsertFromFile.on('click', _.bind(function(btn){ - if (this.api) this.api.ChangeShapeImageFromFile(); + if (this.api) this.api.ChangeShapeImageFromFile(this.BlipFillType); this.fireEvent('editcomplete', this); }, this)); this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this)); diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index a691fa1d4..a72138855 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -655,7 +655,7 @@ define([ el: $('#slide-button-from-file') }); this.btnInsertFromFile.on('click', _.bind(function(btn){ - if (this.api) this.api.ChangeSlideImageFromFile(); + if (this.api) this.api.ChangeSlideImageFromFile(this.BlipFillType); this.fireEvent('editcomplete', this); }, this)); this.FillItems.push(this.btnInsertFromFile); diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index 42b739c68..d39780326 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -1104,7 +1104,7 @@ define([ this.lockedControls.push(this.btnInsertFromUrl); this.btnInsertFromFile.on('click', _.bind(function(btn){ - if (this.api) this.api.ChangeArtImageFromFile(); + if (this.api) this.api.ChangeArtImageFromFile(this.BlipFillType); this.fireEvent('editcomplete', this); }, this)); this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this)); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index b6aa676e4..10a296181 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1138,7 +1138,7 @@ define([ this.fillControls.push(this.btnInsertFromUrl); this.btnInsertFromFile.on('click', _.bind(function(btn){ - if (this.api) this.api.asc_changeShapeImageFromFile(); + if (this.api) this.api.asc_changeShapeImageFromFile(this.BlipFillType); Common.NotificationCenter.trigger('edit:complete', this); }, this)); this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this)); diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index 0d0bb52fe..8ee40be0e 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -1108,7 +1108,7 @@ define([ this.lockedControls.push(this.btnInsertFromUrl); this.btnInsertFromFile.on('click', _.bind(function(btn){ - if (this.api) this.api.asc_changeArtImageFromFile(); + if (this.api) this.api.asc_changeArtImageFromFile(this.BlipFillType); Common.NotificationCenter.trigger('edit:complete', this); }, this)); this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));