Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scheduling-system
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SMASCH
scheduling-system
Commits
0bde71a2
Commit
0bde71a2
authored
4 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
easy ticker removed from dependency list
parent
939797d2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!290
Frontend dependencies moved to npm
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
smash/web/static/js/jquery.easy-ticker.min.js
+0
-2
0 additions, 2 deletions
smash/web/static/js/jquery.easy-ticker.min.js
smash/web/templates/_base.html
+2
-11
2 additions, 11 deletions
smash/web/templates/_base.html
with
2 additions
and
13 deletions
smash/web/static/js/jquery.easy-ticker.min.js
deleted
100644 → 0
+
0
−
2
View file @
939797d2
/* jQuery - Easy Ticker - Plugin v2.0 www.aakashweb.com (c) 2014 Aakash Chakravarthy MIT License. */
;(
function
(
$
,
h
,
i
,
j
){
var
k
=
"
easyTicker
"
,
defaults
=
{
direction
:
'
up
'
,
easing
:
'
swing
'
,
speed
:
'
slow
'
,
interval
:
2000
,
height
:
'
auto
'
,
visible
:
0
,
mousePause
:
1
,
controls
:{
up
:
''
,
down
:
''
,
toggle
:
''
,
playText
:
'
Play
'
,
stopText
:
'
Stop
'
}};
function
EasyTicker
(
f
,
g
){
var
s
=
this
;
s
.
opts
=
$
.
extend
({},
defaults
,
g
);
s
.
elem
=
$
(
f
);
s
.
targ
=
$
(
f
).
children
(
'
:first-child
'
);
s
.
timer
=
0
;
s
.
mHover
=
0
;
s
.
winFocus
=
1
;
init
();
start
();
$
([
h
,
i
]).
off
(
'
focus.jqet
'
).
on
(
'
focus.jqet
'
,
function
(){
s
.
winFocus
=
1
}).
off
(
'
blur.jqet
'
).
on
(
'
blur.jqet
'
,
function
(){
s
.
winFocus
=
0
});
if
(
s
.
opts
.
mousePause
==
1
){
s
.
elem
.
mouseenter
(
function
(){
s
.
timerTemp
=
s
.
timer
;
stop
()}).
mouseleave
(
function
(){
if
(
s
.
timerTemp
!==
0
)
start
()})}
$
(
s
.
opts
.
controls
.
up
).
on
(
'
click
'
,
function
(
e
){
e
.
preventDefault
();
moveDir
(
'
up
'
)});
$
(
s
.
opts
.
controls
.
down
).
on
(
'
click
'
,
function
(
e
){
e
.
preventDefault
();
moveDir
(
'
down
'
)});
$
(
s
.
opts
.
controls
.
toggle
).
on
(
'
click
'
,
function
(
e
){
e
.
preventDefault
();
if
(
s
.
timer
==
0
)
start
();
else
stop
()});
function
init
(){
s
.
elem
.
children
().
css
(
'
margin
'
,
0
).
children
().
css
(
'
margin
'
,
0
);
s
.
elem
.
css
({
position
:
'
relative
'
,
height
:
s
.
opts
.
height
,
overflow
:
'
hidden
'
});
s
.
targ
.
css
({
'
position
'
:
'
absolute
'
,
'
margin
'
:
0
});
setInterval
(
function
(){
adjHeight
()},
100
)}
function
start
(){
s
.
timer
=
setInterval
(
function
(){
if
(
s
.
winFocus
==
1
){
move
(
s
.
opts
.
direction
)}},
s
.
opts
.
interval
);
$
(
s
.
opts
.
controls
.
toggle
).
addClass
(
'
et-run
'
).
html
(
s
.
opts
.
controls
.
stopText
)}
function
stop
(){
clearInterval
(
s
.
timer
);
s
.
timer
=
0
;
$
(
s
.
opts
.
controls
.
toggle
).
removeClass
(
'
et-run
'
).
html
(
s
.
opts
.
controls
.
playText
)}
function
move
(
a
){
var
b
,
eq
,
appType
;
if
(
!
s
.
elem
.
is
(
'
:visible
'
))
return
;
if
(
a
==
'
up
'
){
b
=
'
:first-child
'
;
eq
=
'
-=
'
;
appType
=
'
appendTo
'
}
else
{
b
=
'
:last-child
'
;
eq
=
'
+=
'
;
appType
=
'
prependTo
'
}
var
c
=
s
.
targ
.
children
(
b
);
var
d
=
c
.
outerHeight
();
s
.
targ
.
stop
(
true
,
true
).
animate
({
'
top
'
:
eq
+
d
+
"
px
"
},
s
.
opts
.
speed
,
s
.
opts
.
easing
,
function
(){
c
.
hide
()[
appType
](
s
.
targ
).
fadeIn
();
s
.
targ
.
css
(
'
top
'
,
0
);
adjHeight
()})}
function
moveDir
(
a
){
stop
();
if
(
a
==
'
up
'
)
move
(
'
up
'
);
else
move
(
'
down
'
)}
function
fullHeight
(){
var
a
=
0
;
var
b
=
s
.
elem
.
css
(
'
display
'
);
s
.
elem
.
css
(
'
display
'
,
'
block
'
);
s
.
targ
.
children
().
each
(
function
(){
a
+=
$
(
this
).
outerHeight
()});
s
.
elem
.
css
({
'
display
'
:
b
,
'
height
'
:
a
})}
function
visHeight
(
a
){
var
b
=
0
;
s
.
targ
.
children
(
'
:lt(
'
+
s
.
opts
.
visible
+
'
)
'
).
each
(
function
(){
b
+=
$
(
this
).
outerHeight
()});
if
(
a
==
1
){
s
.
elem
.
stop
(
true
,
true
).
animate
({
height
:
b
},
s
.
opts
.
speed
)}
else
{
s
.
elem
.
css
(
'
height
'
,
b
)}}
function
adjHeight
(){
if
(
s
.
opts
.
height
==
'
auto
'
&&
s
.
opts
.
visible
!=
0
){
anim
=
arguments
.
callee
.
caller
.
name
==
'
init
'
?
0
:
1
;
visHeight
(
anim
)}
else
if
(
s
.
opts
.
height
==
'
auto
'
){
fullHeight
()}}
return
{
up
:
function
(){
moveDir
(
'
up
'
)},
down
:
function
(){
moveDir
(
'
down
'
)},
start
:
start
,
stop
:
stop
,
options
:
s
.
opts
}}
$
.
fn
[
k
]
=
function
(
a
){
return
this
.
each
(
function
(){
if
(
!
$
.
data
(
this
,
k
)){
$
.
data
(
this
,
k
,
new
EasyTicker
(
this
,
a
))}})}})(
jQuery
,
window
,
document
);
\ No newline at end of file
This diff is collapsed.
Click to expand it.
smash/web/templates/_base.html
+
2
−
11
View file @
0bde71a2
...
...
@@ -366,7 +366,6 @@ desired effect
<script
src=
"{% static 'admin-lte/dist/js/app.min.js' %}"
></script>
<!-- Smash js -->
<script
src=
"{% static 'js/smash.js' %}"
></script>
<script
src=
"{% static 'js/jquery.easy-ticker.min.js' %}"
></script>
<script
src=
"{% static 'moment/min/moment.min.js' %}"
></script>
<script
src=
"{% static 'moment-range/dist/moment-range.js' %}"
></script>
<script
type=
"text/javascript"
>
...
...
@@ -375,16 +374,8 @@ desired effect
<script>
//vertical ticker marquee. This could be used for other messages as well :-)
if
(
$
(
'
.ticker_list
'
).
children
().
length
>
1
){
$
(
'
.warning_ticker
'
).
easyTicker
({
direction
:
'
up
'
,
easing
:
'
swing
'
,
speed
:
'
slow
'
,
interval
:
2000
,
height
:
'
auto
'
,
visible
:
1
,
mousePause
:
1
});
}
else
if
(
$
(
'
.ticker_list
'
).
children
().
length
==
1
){
console
.
log
(
"
Not implemented
"
);
}
else
if
(
$
(
'
.ticker_list
'
).
children
().
length
===
1
){
}
else
{
$
(
'
.warning_ticker
'
).
css
(
'
display
'
,
'
none
'
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment