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
8164e2c8
Commit
8164e2c8
authored
Dec 07, 2016
by
Maxim Kadushkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE mobile] debug CellEditor for android, added animation on collapse/expand event
parent
9be7b6ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
12 deletions
+18
-12
apps/spreadsheeteditor/mobile/app/view/CellEditor.js
apps/spreadsheeteditor/mobile/app/view/CellEditor.js
+3
-8
apps/spreadsheeteditor/mobile/resources/less/celleditor.less
apps/spreadsheeteditor/mobile/resources/less/celleditor.less
+15
-4
No files found.
apps/spreadsheeteditor/mobile/app/view/CellEditor.js
View file @
8164e2c8
...
...
@@ -47,8 +47,6 @@ define([
'
use strict
'
;
SSE
.
Views
.
CellEditor
=
Backbone
.
View
.
extend
({
defEditorHeight
:
30
,
maxEditorHeight
:
70
,
el
:
'
.pages > .page
'
,
template
:
_
.
template
(
template
),
...
...
@@ -68,8 +66,6 @@ define([
this
.
$btnexpand
=
$
(
'
#ce-btn-expand
'
,
this
.
el
);
// this.$btnfunc = $('#ce-func-label', this.el);
// this.$el.height(this.defEditorHeight);
return
this
;
},
...
...
@@ -80,12 +76,11 @@ define([
},
expandEditor
:
function
()
{
if
(
this
.
$el
.
h
eight
()
>
this
.
defEditorHeight
)
{
this
.
$el
.
height
(
this
.
defEditorHeight
).
removeClass
(
'
expanded
'
);
if
(
this
.
$el
.
h
asClass
(
'
expanded
'
)
)
{
this
.
$el
.
removeClass
(
'
expanded
'
);
this
.
$btnexpand
.
removeClass
(
'
collapse
'
);
}
else
{
out_height
=
this
.
maxEditorHeight
;
this
.
$el
.
height
(
this
.
maxEditorHeight
).
addClass
(
'
expanded
'
);
this
.
$el
.
addClass
(
'
expanded
'
);
this
.
$btnexpand
.
addClass
(
'
collapse
'
);
}
...
...
apps/spreadsheeteditor/mobile/resources/less/celleditor.less
View file @
8164e2c8
...
...
@@ -3,7 +3,7 @@
@gray-light: #f1f1f1; //rgb(241, 241, 241)
@cellEditorHeight: 30px;
@cellEditor
HeightExp
: 70px;
@cellEditor
ExpandedHeight
: 70px;
.border-radius(@radius: 2px) {
border-radius: @radius;
...
...
@@ -16,14 +16,24 @@
}
position: relative;
height: @cellEditorHeight;
min-height: @cellEditorHeight;
transition: min-height .15s;
background-color: #fff;
display: flex;
align-items: stretch;
//
align-items: stretch;
overflow: hidden;
z-index: 500;
.hairline(bottom, @gray-dark);//@toolbarBorderColor);
&.expanded {
min-height: @cellEditorExpandedHeight;
//height: @cellEditorExpandedHeight;
transition: min-height .15s;
}
.btn {
border: 0 none;
height: @cellEditorHeight;
...
...
@@ -32,11 +42,12 @@
.ce-group {
overflow: hidden;
height: 100%;
}
.group-name {
float: left;
background-color: @
toolbarBg
;
background-color: @
gray-light
;
}
#ce-cell-name {
...
...
@@ -79,7 +90,7 @@
padding-left: 1px;
.hairline(left, @gray-dark);
flex-grow: 1;
height: 100%;
//
height: 100%;
}
#ce-btn-expand {
...
...
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