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

[SSE] Return focus from text-art settings controls to canvas.

Browse source
This commit is contained in:
Julia Radzhabova 2016-07-08 17:12:41 +03:00
parent 59f93b6b7d
commit 1dcdf7d7e3
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1051,7 +1051,7 @@ define([
this.imgprops.asc_putShapeProperties(props); this.imgprops.asc_putShapeProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onColorsBorderSelect: function(picker, color) { onColorsBorderSelect: function(picker, color) {

36
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
View file

@ -319,7 +319,7 @@ define([
this.btnInsertFromFile.on('click', _.bind(function(btn){ this.btnInsertFromFile.on('click', _.bind(function(btn){
if (this.api) this.api.asc_changeArtImageFromFile(); if (this.api) this.api.asc_changeArtImageFromFile();
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, this)); }, this));
this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this)); this.btnInsertFromUrl.on('click', _.bind(this.insertFromUrl, this));
@ -690,7 +690,7 @@ define([
} }
break; break;
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onColorsBackSelect: function(picker, color) { onColorsBackSelect: function(picker, color) {
@ -714,7 +714,7 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
addNewColor: function(picker, btn) { addNewColor: function(picker, btn) {
@ -737,7 +737,7 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onColorsFGSelect: function(picker, color) { onColorsFGSelect: function(picker, color) {
@ -757,7 +757,7 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onColorsBGSelect: function(picker, color) { onColorsBGSelect: function(picker, color) {
@ -777,7 +777,7 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onFillTypeSelect: function(combo, record) { onFillTypeSelect: function(combo, record) {
@ -795,7 +795,7 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onNumTransparencyChange: function(field, newValue, oldValue, eOpts){ onNumTransparencyChange: function(field, newValue, oldValue, eOpts){
@ -809,7 +809,7 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onTransparencyChange: function(field, newValue, oldValue){ onTransparencyChange: function(field, newValue, oldValue){
@ -882,7 +882,7 @@ define([
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onSelectGradient: function(btn, picker, itemView, record) { onSelectGradient: function(btn, picker, itemView, record) {
@ -920,7 +920,7 @@ define([
} }
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onColorsGradientSelect: function(picker, color) { onColorsGradientSelect: function(picker, color) {
@ -947,7 +947,7 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onGradientChange: function(slider, newValue, oldValue){ onGradientChange: function(slider, newValue, oldValue){
@ -1017,11 +1017,11 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onComboBlur: function() { onComboBlur: function() {
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onBorderSizeChanged: function(before, combo, record, e) { onBorderSizeChanged: function(before, combo, record, e) {
@ -1065,7 +1065,7 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onColorsBorderSelect: function(picker, color) { onColorsBorderSelect: function(picker, color) {
@ -1086,7 +1086,7 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
insertFromUrl: function() { insertFromUrl: function() {
@ -1588,7 +1588,7 @@ define([
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
$(this.btnTexture.el).find('.form-control').prop('innerHTML', record.get('name')); $(this.btnTexture.el).find('.form-control').prop('innerHTML', record.get('name'));
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
fillTextArt: function() { fillTextArt: function() {
@ -1614,7 +1614,7 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
fillTransform: function(transforms) { fillTransform: function(transforms) {
@ -1647,7 +1647,7 @@ define([
this.shapeprops.put_TextArtProperties(props); this.shapeprops.put_TextArtProperties(props);
this.api.asc_setGraphicObjectProps(this.imgprops); this.api.asc_setGraphicObjectProps(this.imgprops);
} }
this.fireEvent('editcomplete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
UpdateThemeColors: function() { UpdateThemeColors: function() {