rename timer_goodie to timer (#4030)
Zaahir Moolla
GitHub
parent
de98ce988b
commit
93f6ad141b
|
|
@ -1,10 +1,10 @@
|
|||
package DDG::Goodie::TimerGoodie;
|
||||
package DDG::Goodie::Timer;
|
||||
# ABSTRACT: Shows a countdown timer
|
||||
|
||||
use strict;
|
||||
use DDG::Goodie;
|
||||
|
||||
zci answer_type => 'timer_goodie';
|
||||
zci answer_type => 'timer';
|
||||
zci is_cached => 1;
|
||||
|
||||
my @triggers = qw(timer countdown alarm);
|
||||
|
|
@ -58,7 +58,7 @@ sub build_result {
|
|||
my $time = parse_query_for_time($req->query_lc);
|
||||
return "$time",
|
||||
structured_answer => {
|
||||
id => 'timer_goodie',
|
||||
id => 'timer',
|
||||
name => 'Timer',
|
||||
signal => 'high',
|
||||
meta => {
|
||||
|
|
@ -70,7 +70,7 @@ sub build_result {
|
|||
},
|
||||
templates => {
|
||||
group => 'base',
|
||||
detail => 'DDH.timer_goodie.timer_wrapper',
|
||||
detail => 'DDH.timer.timer_wrapper',
|
||||
wrap_detail => 'base_detail',
|
||||
},
|
||||
};
|
||||
|
|
@ -1,49 +1,49 @@
|
|||
/* GENERAL */
|
||||
|
||||
.zci.zci--timer_goodie.is-active {
|
||||
.zci.zci--timer.is-active {
|
||||
padding-top: 10px;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .tile {
|
||||
.zci--timer .tile {
|
||||
margin-top: 0;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .cw {
|
||||
.zci--timer .cw {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .zci__main {
|
||||
.zci--timer .zci__main {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .zci__body {
|
||||
.zci--timer .zci__body {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .timer_container {
|
||||
.zci--timer .timer_container {
|
||||
position: relative;
|
||||
width: 305px;
|
||||
height: 140px;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .play_pause,
|
||||
.zci--timer_goodie .timer_container,
|
||||
.zci--timer_goodie #add_timer_container,
|
||||
.zci--timer_goodie .display_container {
|
||||
.zci--timer .play_pause,
|
||||
.zci--timer .timer_container,
|
||||
.zci--timer #add_timer_container,
|
||||
.zci--timer .display_container {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.zci--timer_goodie #add_timer_container {
|
||||
.zci--timer #add_timer_container {
|
||||
display: block;
|
||||
width: 140px;
|
||||
height: 140px;
|
||||
border: none;
|
||||
}
|
||||
|
||||
.zci--timer_goodie a#add_timer_btn {
|
||||
.zci--timer a#add_timer_btn {
|
||||
width: 100%;
|
||||
text-decoration: none;
|
||||
display: block;
|
||||
|
|
@ -53,19 +53,19 @@
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
.zci--timer_goodie a#add_timer_btn:hover {
|
||||
.zci--timer a#add_timer_btn:hover {
|
||||
color: #333;
|
||||
}
|
||||
|
||||
/* PLAY/PAUSE BTN */
|
||||
|
||||
.zci--timer_goodie .play_pause {
|
||||
.zci--timer .play_pause {
|
||||
width: 45%;
|
||||
height: 100%;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .play_pause .progress {
|
||||
.zci--timer .play_pause .progress {
|
||||
position: relative;
|
||||
left: 1.5em;
|
||||
top: 1.5em;
|
||||
|
|
@ -77,13 +77,13 @@
|
|||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .timer_container.status_running .play_pause .progress,
|
||||
.zci--timer_goodie .timer_container.status_paused .play_pause .progress {
|
||||
.zci--timer .timer_container.status_running .play_pause .progress,
|
||||
.zci--timer .timer_container.status_paused .play_pause .progress {
|
||||
border-color: #eee;
|
||||
border-color: rgba(150,150,150,0.2);
|
||||
}
|
||||
|
||||
.zci--timer_goodie .play_pause .fill {
|
||||
.zci--timer .play_pause .fill {
|
||||
display: none;
|
||||
top: -4px;
|
||||
left: -4px;
|
||||
|
|
@ -93,13 +93,13 @@
|
|||
clip: rect(0, 100px, 100px, 50px);
|
||||
}
|
||||
|
||||
.zci--timer_goodie .half_complete .play_pause .fill {
|
||||
.zci--timer .half_complete .play_pause .fill {
|
||||
clip: auto;
|
||||
}
|
||||
|
||||
/* this will be shown via JS for browsers that can handle it */
|
||||
.zci--timer_goodie .play_pause .first_half_fill,
|
||||
.zci--timer_goodie .play_pause .rotated_fill {
|
||||
.zci--timer .play_pause .first_half_fill,
|
||||
.zci--timer .play_pause .rotated_fill {
|
||||
display: none;
|
||||
top: 0;
|
||||
left: 0;
|
||||
|
|
@ -111,29 +111,29 @@
|
|||
border-radius: 50%;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .status_stopped .play_pause .fill,
|
||||
.zci--timer_goodie .status_stopped .play_pause .rotated_fill {
|
||||
.zci--timer .status_stopped .play_pause .fill,
|
||||
.zci--timer .status_stopped .play_pause .rotated_fill {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .play_pause .rotated_fill {
|
||||
.zci--timer .play_pause .rotated_fill {
|
||||
clip: rect(0, 50px, 100px, 0);
|
||||
}
|
||||
|
||||
.zci--timer_goodie .play_pause .first_half_fill {
|
||||
.zci--timer .play_pause .first_half_fill {
|
||||
clip: rect(0, 100px, 100px, 50px);
|
||||
}
|
||||
|
||||
.zci--timer_goodie .half_complete .play_pause .first_half_fill {
|
||||
.zci--timer .half_complete .play_pause .first_half_fill {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .timer_container.status_paused .rotated_fill,
|
||||
.zci--timer_goodie .timer_container.status_paused .first_half_fill {
|
||||
.zci--timer .timer_container.status_paused .rotated_fill,
|
||||
.zci--timer .timer_container.status_paused .first_half_fill {
|
||||
border-color: #959595;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .play_pause a {
|
||||
.zci--timer .play_pause a {
|
||||
font-family: "ddg-serp-icons";
|
||||
color: inherit;
|
||||
font-size: 35px;
|
||||
|
|
@ -148,24 +148,24 @@
|
|||
z-index: 10;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .timer_container.status_stopped .play_pause a {
|
||||
.zci--timer .timer_container.status_stopped .play_pause a {
|
||||
color: #4ab857;
|
||||
}
|
||||
|
||||
/* button look for different timer statuses */
|
||||
|
||||
.zci--timer_goodie .play_pause a:after {
|
||||
.zci--timer .play_pause a:after {
|
||||
content: "►";
|
||||
}
|
||||
|
||||
.zci--timer_goodie .status_running .play_pause a:after {
|
||||
.zci--timer .status_running .play_pause a:after {
|
||||
content: "║";
|
||||
position: relative;
|
||||
right: 1px;
|
||||
bottom: 1px;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .status_stopped .play_pause a:after {
|
||||
.zci--timer .status_stopped .play_pause a:after {
|
||||
content: "\2713"; /* check */
|
||||
position: relative;
|
||||
right: 1px;
|
||||
|
|
@ -174,23 +174,23 @@
|
|||
|
||||
/* TIMER NAME / TIME */
|
||||
|
||||
.zci--timer_goodie .display_container {
|
||||
.zci--timer .display_container {
|
||||
width: 55%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .name {
|
||||
.zci--timer .name {
|
||||
margin-top: 2.5em;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .name_input {
|
||||
.zci--timer .name_input {
|
||||
font-size: 1.1em;
|
||||
font-weight: bold;
|
||||
width: 9.05em;
|
||||
margin-bottom: 0.8em;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .time_display {
|
||||
.zci--timer .time_display {
|
||||
font-weight: bold;
|
||||
margin-top: -1.2em;
|
||||
margin-left: 0.3em;
|
||||
|
|
@ -198,29 +198,29 @@
|
|||
display: none;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .time_display .hours_minutes {
|
||||
.zci--timer .time_display .hours_minutes {
|
||||
font-size: 3em;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .time_display .seconds {
|
||||
.zci--timer .time_display .seconds {
|
||||
font-size: 1.5em;
|
||||
color: #999;
|
||||
position: relative;
|
||||
bottom: 0.7em;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .time_input input {
|
||||
.zci--timer .time_input input {
|
||||
width: 2em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
/* IE is the only browser that doesn't show a grey placeholder */
|
||||
.zci--timer_goodie .time_input input:-ms-input-placeholder {
|
||||
.zci--timer .time_input input:-ms-input-placeholder {
|
||||
color: grey;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .name_input,
|
||||
.zci--timer_goodie .time_input input {
|
||||
.zci--timer .name_input,
|
||||
.zci--timer .time_input input {
|
||||
font-size: 1.1em;
|
||||
font-weight: bold;
|
||||
height: 2em;
|
||||
|
|
@ -233,14 +233,14 @@
|
|||
-webkit-border-radius: 2px;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .time_input .separator {
|
||||
.zci--timer .time_input .separator {
|
||||
font-weight: bold;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
/* RESET / ADD MINUTE / CLOSE BTNS */
|
||||
|
||||
.zci--timer_goodie .corner_btn {
|
||||
.zci--timer .corner_btn {
|
||||
color: #999;
|
||||
font-weight: bold;
|
||||
text-decoration: none;
|
||||
|
|
@ -249,12 +249,12 @@
|
|||
font-size: 0.9em;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .corner_btn.reset {
|
||||
.zci--timer .corner_btn.reset {
|
||||
display: none;
|
||||
top: 10px;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .corner_btn.add_minute {
|
||||
.zci--timer .corner_btn.add_minute {
|
||||
display: none;
|
||||
bottom: 10px;
|
||||
border-radius: 50%;
|
||||
|
|
@ -269,7 +269,7 @@
|
|||
padding-right: 0.1em;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .corner_btn.close {
|
||||
.zci--timer .corner_btn.close {
|
||||
top: 4px;
|
||||
font-size: 1.8em;
|
||||
}
|
||||
|
|
@ -278,81 +278,81 @@
|
|||
|
||||
/* running */
|
||||
|
||||
.zci--timer_goodie .status_running .corner_btn.add_minute {
|
||||
.zci--timer .status_running .corner_btn.add_minute {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .status_running .corner_btn.close,
|
||||
.zci--timer_goodie .status_running .time_input {
|
||||
.zci--timer .status_running .corner_btn.close,
|
||||
.zci--timer .status_running .time_input {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .status_running .play_pause .fill,
|
||||
.zci--timer_goodie .status_running .play_pause .rotated_fill,
|
||||
.zci--timer_goodie .status_running .time_display {
|
||||
.zci--timer .status_running .play_pause .fill,
|
||||
.zci--timer .status_running .play_pause .rotated_fill,
|
||||
.zci--timer .status_running .time_display {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/* paused */
|
||||
|
||||
.zci--timer_goodie .status_paused .corner_btn.reset,
|
||||
.zci--timer_goodie .status_stopped .corner_btn.reset,
|
||||
.zci--timer_goodie .status_paused .corner_btn.add_minute {
|
||||
.zci--timer .status_paused .corner_btn.reset,
|
||||
.zci--timer .status_stopped .corner_btn.reset,
|
||||
.zci--timer .status_paused .corner_btn.add_minute {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .status_paused .corner_btn.close,
|
||||
.zci--timer_goodie .status_paused .time_input {
|
||||
.zci--timer .status_paused .corner_btn.close,
|
||||
.zci--timer .status_paused .time_input {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .status_paused .play_pause .fill,
|
||||
.zci--timer_goodie .status_paused .play_pause .rotated_fill,
|
||||
.zci--timer_goodie .status_paused .time_display {
|
||||
.zci--timer .status_paused .play_pause .fill,
|
||||
.zci--timer .status_paused .play_pause .rotated_fill,
|
||||
.zci--timer .status_paused .time_display {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/* stopped */
|
||||
|
||||
.zci--timer_goodie .status_stopped .corner_btn.close,
|
||||
.zci--timer_goodie .status_stopped .time_input {
|
||||
.zci--timer .status_stopped .corner_btn.close,
|
||||
.zci--timer .status_stopped .time_input {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.zci--timer_goodie .status_stopped .time_display {
|
||||
.zci--timer .status_stopped .time_display {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/* CHANGES FOR MOBILE */
|
||||
|
||||
.is-mobile .zci--timer_goodie.is-active,
|
||||
.is-mobile .zci--timer_goodie .cw {
|
||||
.is-mobile .zci--timer.is-active,
|
||||
.is-mobile .zci--timer .cw {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.is-mobile .zci--timer_goodie .zci__body {
|
||||
.is-mobile .zci--timer .zci__body {
|
||||
padding: 10px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.is-mobile .zci--timer_goodie .timer_container,
|
||||
.is-mobile .zci--timer_goodie #add_timer_container {
|
||||
.is-mobile .zci--timer .timer_container,
|
||||
.is-mobile .zci--timer #add_timer_container {
|
||||
width: 100%;
|
||||
margin: 0 0 10px 0;
|
||||
}
|
||||
|
||||
.is-mobile .zci--timer_goodie .play_pause {
|
||||
.is-mobile .zci--timer .play_pause {
|
||||
max-width: 138px;
|
||||
}
|
||||
|
||||
.is-mobile .zci--timer_goodie #add_timer_container {
|
||||
.is-mobile .zci--timer #add_timer_container {
|
||||
height: 45px;
|
||||
margin-bottom: 0;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 0.25em;
|
||||
}
|
||||
|
||||
.is-mobile .zci--timer_goodie #add_timer_btn {
|
||||
.is-mobile .zci--timer #add_timer_btn {
|
||||
font-size: 1.1em;
|
||||
font-weight: 600;
|
||||
line-height: 43px;
|
||||
|
|
@ -360,10 +360,10 @@
|
|||
|
||||
/* CHANGES FOR DARK MODE */
|
||||
|
||||
.dark-bg .zci--timer_goodie a#add_timer_btn:hover {
|
||||
.dark-bg .zci--timer a#add_timer_btn:hover {
|
||||
color: #e6e6e6;
|
||||
}
|
||||
|
||||
.dark-bg .zci--timer_goodie a:hover {
|
||||
.dark-bg .zci--timer a:hover {
|
||||
color: #dadada;
|
||||
}
|
||||
|
|
@ -4,13 +4,13 @@ Used with permission.
|
|||
License: CC BY-NC 3.0 http://creativecommons.org/licenses/by-nc/3.0/
|
||||
*/
|
||||
|
||||
DDH.timer_goodie = DDH.timer_goodie || {};
|
||||
DDH.timer = DDH.timer || {};
|
||||
|
||||
DDH.timer_goodie.build = function(ops) {
|
||||
DDH.timer.build = function(ops) {
|
||||
'use strict';
|
||||
|
||||
var SOUND_NAME = "alarm-sound",
|
||||
soundUrl = '/share/goodie/timer_goodie/alarm.mp3',
|
||||
soundUrl = '/share/goodie/timer/alarm.mp3',
|
||||
soundIsPlaying = false,
|
||||
hasShown = false,
|
||||
$lastTimerToFinish,
|
||||
|
|
@ -119,7 +119,7 @@ DDH.timer_goodie.build = function(ops) {
|
|||
this.halfComplete = false;
|
||||
|
||||
// dom setup
|
||||
this.$element = $(DDH.timer_goodie.timer_goodie());
|
||||
this.$element = $(DDH.timer.timer());
|
||||
|
||||
this.$nameInput = this.$element.find(".name_input");
|
||||
|
||||
|
|
@ -434,7 +434,7 @@ DDH.timer_goodie.build = function(ops) {
|
|||
|
||||
var lastUpdate = new Date().getTime(),
|
||||
enteredTime = parseInt(ops.data[0].time),
|
||||
$dom = DDH.getDOM('timer_goodie'),
|
||||
$dom = DDH.getDOM('timer'),
|
||||
oldTitle = document.title;
|
||||
|
||||
$addTimerBtn = $dom.find("#add_timer_btn");
|
||||
|
|
@ -6,7 +6,7 @@ use warnings;
|
|||
use Test::More;
|
||||
use DDG::Test::Goodie;
|
||||
|
||||
zci answer_type => 'timer_goodie';
|
||||
zci answer_type => 'timer';
|
||||
zci is_cached => 1;
|
||||
|
||||
sub build_structured_answer {
|
||||
|
|
@ -14,7 +14,7 @@ sub build_structured_answer {
|
|||
$time = $time || 0;
|
||||
return "$time",
|
||||
structured_answer => {
|
||||
id => 'timer_goodie',
|
||||
id => 'timer',
|
||||
name => 'Timer',
|
||||
signal => 'high',
|
||||
meta => {
|
||||
|
|
@ -26,7 +26,7 @@ sub build_structured_answer {
|
|||
},
|
||||
templates => {
|
||||
group => 'base',
|
||||
detail => 'DDH.timer_goodie.timer_wrapper',
|
||||
detail => 'DDH.timer.timer_wrapper',
|
||||
wrap_detail => 'base_detail',
|
||||
},
|
||||
};
|
||||
|
|
@ -36,7 +36,7 @@ sub build_test { test_zci(build_structured_answer(@_)) }
|
|||
|
||||
ddg_goodie_test(
|
||||
[
|
||||
'DDG::Goodie::TimerGoodie'
|
||||
'DDG::Goodie::Timer'
|
||||
],
|
||||
# With no initial time
|
||||
'timer' => build_test(),
|
||||
Loading…
Reference in New Issue