Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
bugzilla
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ivan Ivlev
bugzilla
Commits
34685ab7
You need to sign in or sign up before continuing.
Commit
34685ab7
authored
7 years ago
by
Дмитрий Никулин
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Auto-reset timer after reaching 12h limit
parent
f5436f06
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
5 deletions
+13
-5
timer_common.js
js/etersoft/timer_common.js
+9
-1
timersplash.html.tmpl
template/en/default/etersoft/timersplash.html.tmpl
+2
-2
timersplash.html.tmpl
template/ru/default/etersoft/timersplash.html.tmpl
+2
-2
No files found.
js/etersoft/timer_common.js
View file @
34685ab7
...
...
@@ -5,6 +5,9 @@
// Свойства, имена которых начинаются с подчеркивания, являются служебными и
// не должны использоваться как API.
// Лимит таймера - 12 часов
var
MAX_ALLOWED_VALUE
=
60
*
60
*
12
;
// Получаем GET-параметр id из адресной строки.
// Если параметра нет, или он не является числом, то возвращаем undefined.
function
getIdFromUrl
(){
...
...
@@ -20,7 +23,8 @@ function getIdFromUrl(){
// Конструктор таймера
// id - некий уникальный идентификатор, например, номер баги или тикета
// onUpdate - функция, вызываемая при обновлении таймера. Опциональна.
function
Timer
(
id
,
onUpdate
){
function
Timer
(
id
,
onUpdate
,
limit
){
this
.
limit
=
limit
||
MAX_ALLOWED_VALUE
;
this
.
_storageKey
=
id
;
this
.
onUpdate
=
onUpdate
;
...
...
@@ -167,6 +171,10 @@ Timer.prototype.togglePause = function(){
// Вызывает onUpdate, если определена.
// Используется при автообнолении и при изменении состояния таймера
Timer
.
prototype
.
update
=
function
(){
if
(
this
.
getElapsedSeconds
()
>
this
.
limit
){
this
.
reset
();
return
;
}
if
(
typeof
this
.
onUpdate
===
'function'
){
this
.
onUpdate
();
}
...
...
This diff is collapsed.
Click to expand it.
template/en/default/etersoft/timersplash.html.tmpl
View file @
34685ab7
...
...
@@ -42,6 +42,6 @@
</div>
</div>
<script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js"></script>
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js"></script>
<script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js
?20171013
"></script>
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js
?20161212
"></script>
This diff is collapsed.
Click to expand it.
template/ru/default/etersoft/timersplash.html.tmpl
View file @
34685ab7
...
...
@@ -42,5 +42,5 @@
</div>
</div>
<script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js"></script>
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js"></script>
<script language="javascript" type="text/javascript" src="js/etersoft/timer_common.js
?20171013
"></script>
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js
?20171011
"></script>
This diff is collapsed.
Click to expand it.
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