Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
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
Léo-Paul Géneau
gitlab-ce
Commits
0986fe23
Commit
0986fe23
authored
Aug 05, 2016
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace animateEmoji timeout with eventListener
parent
83cd3d79
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
49 deletions
+39
-49
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/awards_handler.js
app/assets/javascripts/awards_handler.js
+5
-5
app/assets/stylesheets/framework/animations.scss
app/assets/stylesheets/framework/animations.scss
+23
-44
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+10
-0
No files found.
CHANGELOG
View file @
0986fe23
...
@@ -26,6 +26,7 @@ v 8.12.0 (unreleased)
...
@@ -26,6 +26,7 @@ v 8.12.0 (unreleased)
- API: Expose issue confidentiality flag. (Robert Schilling)
- API: Expose issue confidentiality flag. (Robert Schilling)
- Fix markdown anchor icon interaction (ClemMakesApps)
- Fix markdown anchor icon interaction (ClemMakesApps)
- Test migration paths from 8.5 until current release !4874
- Test migration paths from 8.5 until current release !4874
- Replace animateEmoji timeout with eventListener (ClemMakesApps)
- Optimistic locking for Issues and Merge Requests (title and description overriding prevention)
- Optimistic locking for Issues and Merge Requests (title and description overriding prevention)
- Add `wiki_page_events` to project hook APIs (Ben Boeckel)
- Add `wiki_page_events` to project hook APIs (Ben Boeckel)
- Remove Gitorious import
- Remove Gitorious import
...
...
app/assets/javascripts/awards_handler.js
View file @
0986fe23
...
@@ -255,12 +255,12 @@
...
@@ -255,12 +255,12 @@
};
};
AwardsHandler
.
prototype
.
animateEmoji
=
function
(
$emoji
)
{
AwardsHandler
.
prototype
.
animateEmoji
=
function
(
$emoji
)
{
var
className
;
var
className
=
'
pulse animated once short
'
;
className
=
'
pulse animated
'
;
$emoji
.
addClass
(
className
);
$emoji
.
addClass
(
className
);
return
setTimeout
((
function
()
{
return
$emoji
.
removeClass
(
className
);
$emoji
.
on
(
'
webkitAnimationEnd animationEnd
'
,
function
()
{
}),
321
);
$
(
this
).
removeClass
(
className
);
});
};
};
AwardsHandler
.
prototype
.
createEmoji
=
function
(
votesBlock
,
emoji
)
{
AwardsHandler
.
prototype
.
createEmoji
=
function
(
votesBlock
,
emoji
)
{
...
...
app/assets/stylesheets/framework/animations.scss
View file @
0986fe23
...
@@ -8,65 +8,44 @@
...
@@ -8,65 +8,44 @@
// Copyright (c) 2016 Daniel Eden
// Copyright (c) 2016 Daniel Eden
.animated
{
.animated
{
-webkit-animation-duration
:
1s
;
@include
webkit-prefix
(
animation-duration
,
1s
);
animation-duration
:
1s
;
@include
webkit-prefix
(
animation-fill-mode
,
both
);
-webkit-animation-fill-mode
:
both
;
animation-fill-mode
:
both
;
}
.animated.infinite
{
-webkit-animation-iteration-count
:
infinite
;
animation-iteration-count
:
infinite
;
}
.animated.hinge
{
&
.infinite
{
-webkit-animation-duration
:
2s
;
@include
webkit-prefix
(
animation-iteration-count
,
infinite
);
animation-duration
:
2s
;
}
}
.animated.flipOutX
,
&
.once
{
.animated.flipOutY
,
@include
webkit-prefix
(
animation-iteration-count
,
1
);
.animated.bounceIn
,
}
.animated.bounceOut
{
-webkit-animation-duration
:
.75s
;
animation-duration
:
.75s
;
}
@-webkit-keyframes
pulse
{
&
.hinge
{
from
{
@include
webkit-prefix
(
animation-duration
,
2s
);
-webkit-transform
:
scale3d
(
1
,
1
,
1
);
transform
:
scale3d
(
1
,
1
,
1
);
}
}
50
%
{
&
.flipOutX
,
-webkit-transform
:
scale3d
(
1
.05
,
1
.05
,
1
.05
);
&
.flipOutY
,
transform
:
scale3d
(
1
.05
,
1
.05
,
1
.05
);
&
.bounceIn
,
&
.bounceOut
{
@include
webkit-prefix
(
animation-duration
,
.75s
);
}
}
to
{
&
.short
{
-webkit-transform
:
scale3d
(
1
,
1
,
1
);
@include
webkit-prefix
(
animation-duration
,
321ms
);
transform
:
scale3d
(
1
,
1
,
1
);
@include
webkit-prefix
(
animation-fill-mode
,
none
);
}
}
}
}
@keyframes
pulse
{
@include
keyframes
(
pulse
)
{
from
{
from
,
to
{
-webkit-transform
:
scale3d
(
1
,
1
,
1
);
@include
webkit-prefix
(
transform
,
scale3d
(
1
,
1
,
1
));
transform
:
scale3d
(
1
,
1
,
1
);
}
}
50
%
{
50
%
{
-webkit-transform
:
scale3d
(
1
.05
,
1
.05
,
1
.05
);
@include
webkit-prefix
(
transform
,
scale3d
(
1
.05
,
1
.05
,
1
.05
));
transform
:
scale3d
(
1
.05
,
1
.05
,
1
.05
);
}
to
{
-webkit-transform
:
scale3d
(
1
,
1
,
1
);
transform
:
scale3d
(
1
,
1
,
1
);
}
}
}
}
.pulse
{
.pulse
{
-webkit-animation-name
:
pulse
;
@include
webkit-prefix
(
animation-name
,
pulse
);
animation-name
:
pulse
;
}
}
app/assets/stylesheets/framework/mixins.scss
View file @
0986fe23
...
@@ -85,3 +85,13 @@
...
@@ -85,3 +85,13 @@
#{
'-webkit-'
+
$property
}
:
$
value
;
#{
'-webkit-'
+
$property
}
:
$
value
;
#{
$property
}
:
$
value
;
#{
$property
}
:
$
value
;
}
}
@mixin
keyframes
(
$animation-name
)
{
@-webkit-keyframes
#{
$animation-name
}
{
@content
;
}
@keyframes
#{
$animation-name
}
{
@content
;
}
}
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