Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
my-cucumbers-ru-github-io
Project
Project
Details
Activity
Releases
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
Лотуга Данила Сергеевич
my-cucumbers-ru-github-io
Commits
a9db0ee9
Commit
a9db0ee9
authored
May 10, 2013
by
Vadim Makeev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Strict timing parsing
parent
67f7f776
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
14 deletions
+9
-14
shower.js
shower.js
+8
-13
shower.min.js
shower.min.js
+1
-1
No files found.
shower.js
View file @
a9db0ee9
...
...
@@ -188,9 +188,7 @@ window.shower = window.shower || (function(window, document, undefined) {
* @returns {Object} shower
*/
shower
.
init
=
function
(
slideSelector
,
progressSelector
)
{
var
timing
,
minutes
,
seconds
;
var
timing
;
slideSelector
=
slideSelector
||
'.slide'
;
progressSelector
=
progressSelector
||
'div.progress div'
;
...
...
@@ -205,25 +203,22 @@ window.shower = window.shower || (function(window, document, undefined) {
slides
[
i
].
id
=
i
+
1
;
}
timing
=
shower
.
_getData
(
slides
[
i
],
'timing'
)
||
undefined
;
timing
=
shower
.
_getData
(
slides
[
i
],
'timing'
);
// Parsing timing in [S] or [M:S] format
// and returning it in milliseconds
if
(
timing
&&
timing
.
split
(
':'
).
length
<=
2
)
{
if
(
timing
&&
/^
(\d{1,2}
:
)?\d{1,3}
$/
.
test
(
timing
)
)
{
if
(
timing
.
indexOf
(
':'
)
!==
-
1
)
{
timing
=
timing
.
split
(
':'
);
minutes
=
parseInt
(
timing
[
0
],
10
),
seconds
=
parseInt
(
timing
[
1
],
10
);
timing
=
(
minutes
*
60
+
seconds
)
*
1000
;
timing
=
(
parseInt
(
timing
[
0
],
10
)
*
60
+
parseInt
(
timing
[
1
],
10
))
*
1000
;
}
else
{
seconds
=
parseInt
(
timing
,
10
);
timing
=
seconds
*
1000
;
timing
=
parseInt
(
timing
,
10
)
*
1000
;
}
if
(
slides
[
i
].
querySelector
(
'.next'
)
)
{
timing
=
timing
/
(
slides
[
i
].
querySelectorAll
(
'.next'
).
length
+
1
)
;
if
(
timing
===
0
)
{
timing
=
false
;
}
}
else
{
timing
=
undefined
;
timing
=
false
;
}
shower
.
slideList
.
push
(
new
Slide
({
...
...
shower.min.js
View file @
a9db0ee9
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