Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
1dcdf7d7
Commit
1dcdf7d7
authored
Jul 08, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Return focus from text-art settings controls to canvas.
parent
59f93b6b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
19 deletions
+19
-19
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
+1
-1
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
+18
-18
No files found.
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file @
1dcdf7d7
...
...
@@ -1051,7 +1051,7 @@ define([
this
.
imgprops
.
asc_putShapeProperties
(
props
);
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
onColorsBorderSelect
:
function
(
picker
,
color
)
{
...
...
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
View file @
1dcdf7d7
...
...
@@ -319,7 +319,7 @@ define([
this
.
btnInsertFromFile
.
on
(
'
click
'
,
_
.
bind
(
function
(
btn
){
if
(
this
.
api
)
this
.
api
.
asc_changeArtImageFromFile
();
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
this
));
this
.
btnInsertFromUrl
.
on
(
'
click
'
,
_
.
bind
(
this
.
insertFromUrl
,
this
));
...
...
@@ -690,7 +690,7 @@ define([
}
break
;
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
onColorsBackSelect
:
function
(
picker
,
color
)
{
...
...
@@ -714,7 +714,7 @@ define([
this
.
shapeprops
.
put_TextArtProperties
(
props
);
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
addNewColor
:
function
(
picker
,
btn
)
{
...
...
@@ -737,7 +737,7 @@ define([
this
.
shapeprops
.
put_TextArtProperties
(
props
);
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
onColorsFGSelect
:
function
(
picker
,
color
)
{
...
...
@@ -757,7 +757,7 @@ define([
this
.
shapeprops
.
put_TextArtProperties
(
props
);
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
onColorsBGSelect
:
function
(
picker
,
color
)
{
...
...
@@ -777,7 +777,7 @@ define([
this
.
shapeprops
.
put_TextArtProperties
(
props
);
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
onFillTypeSelect
:
function
(
combo
,
record
)
{
...
...
@@ -795,7 +795,7 @@ define([
this
.
shapeprops
.
put_TextArtProperties
(
props
);
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
onNumTransparencyChange
:
function
(
field
,
newValue
,
oldValue
,
eOpts
){
...
...
@@ -809,7 +809,7 @@ define([
this
.
shapeprops
.
put_TextArtProperties
(
props
);
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
onTransparencyChange
:
function
(
field
,
newValue
,
oldValue
){
...
...
@@ -882,7 +882,7 @@ define([
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
onSelectGradient
:
function
(
btn
,
picker
,
itemView
,
record
)
{
...
...
@@ -920,7 +920,7 @@ define([
}
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
onColorsGradientSelect
:
function
(
picker
,
color
)
{
...
...
@@ -947,7 +947,7 @@ define([
this
.
shapeprops
.
put_TextArtProperties
(
props
);
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
onGradientChange
:
function
(
slider
,
newValue
,
oldValue
){
...
...
@@ -1017,11 +1017,11 @@ define([
this
.
shapeprops
.
put_TextArtProperties
(
props
);
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
onComboBlur
:
function
()
{
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
onBorderSizeChanged
:
function
(
before
,
combo
,
record
,
e
)
{
...
...
@@ -1065,7 +1065,7 @@ define([
this
.
shapeprops
.
put_TextArtProperties
(
props
);
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
onColorsBorderSelect
:
function
(
picker
,
color
)
{
...
...
@@ -1086,7 +1086,7 @@ define([
this
.
shapeprops
.
put_TextArtProperties
(
props
);
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
insertFromUrl
:
function
()
{
...
...
@@ -1588,7 +1588,7 @@ define([
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
$
(
this
.
btnTexture
.
el
).
find
(
'
.form-control
'
).
prop
(
'
innerHTML
'
,
record
.
get
(
'
name
'
));
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
fillTextArt
:
function
()
{
...
...
@@ -1614,7 +1614,7 @@ define([
this
.
shapeprops
.
put_TextArtProperties
(
props
);
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
fillTransform
:
function
(
transforms
)
{
...
...
@@ -1647,7 +1647,7 @@ define([
this
.
shapeprops
.
put_TextArtProperties
(
props
);
this
.
api
.
asc_setGraphicObjectProps
(
this
.
imgprops
);
}
this
.
fireEvent
(
'
edit
complete
'
,
this
);
Common
.
NotificationCenter
.
trigger
(
'
edit:
complete
'
,
this
);
},
UpdateThemeColors
:
function
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment