Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
MUR Drupal
d3-library
Commits
00d7183a
Commit
00d7183a
authored
Apr 10, 2014
by
Mike Bostock
Browse files
Fix #1839 - sign of parsed timezone offset.
parent
92c9d9d8
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
9 deletions
+11
-9
d3.js
d3.js
+1
-1
d3.min.js
d3.min.js
+1
-1
src/locale/time-format.js
src/locale/time-format.js
+1
-1
test/time/format-test.js
test/time/format-test.js
+3
-2
test/time/format-utc-test.js
test/time/format-utc-test.js
+3
-2
test/time/time.js
test/time/time.js
+2
-2
No files found.
d3.js
View file @
00d7183a
...
@@ -2675,7 +2675,7 @@
...
@@ -2675,7 +2675,7 @@
return
n
?
(
date
.
y
=
d3_time_expandYear
(
+
n
[
0
]),
i
+
n
[
0
].
length
)
:
-
1
;
return
n
?
(
date
.
y
=
d3_time_expandYear
(
+
n
[
0
]),
i
+
n
[
0
].
length
)
:
-
1
;
}
}
function
d3_time_parseZone
(
date
,
string
,
i
)
{
function
d3_time_parseZone
(
date
,
string
,
i
)
{
return
/^
[
+-
]\d{4}
$/
.
test
(
string
=
string
.
substring
(
i
,
i
+
5
))
?
(
date
.
Z
=
+
string
,
return
/^
[
+-
]\d{4}
$/
.
test
(
string
=
string
.
substring
(
i
,
i
+
5
))
?
(
date
.
Z
=
-
string
,
i
+
5
)
:
-
1
;
i
+
5
)
:
-
1
;
}
}
function
d3_time_expandYear
(
d
)
{
function
d3_time_expandYear
(
d
)
{
...
...
d3.min.js
View file @
00d7183a
This diff is collapsed.
Click to expand it.
src/locale/time-format.js
View file @
00d7183a
...
@@ -292,7 +292,7 @@ function d3_time_parseYear(date, string, i) {
...
@@ -292,7 +292,7 @@ function d3_time_parseYear(date, string, i) {
function
d3_time_parseZone
(
date
,
string
,
i
)
{
function
d3_time_parseZone
(
date
,
string
,
i
)
{
return
/^
[
+-
]\d{4}
$/
.
test
(
string
=
string
.
substring
(
i
,
i
+
5
))
return
/^
[
+-
]\d{4}
$/
.
test
(
string
=
string
.
substring
(
i
,
i
+
5
))
?
(
date
.
Z
=
+
string
,
i
+
5
)
?
(
date
.
Z
=
-
string
,
i
+
5
)
// sign differs from getTimezoneOffset!
:
-
1
;
:
-
1
;
}
}
...
...
test/time/format-test.js
View file @
00d7183a
...
@@ -328,8 +328,9 @@ suite.addBatch({
...
@@ -328,8 +328,9 @@ suite.addBatch({
"
parses timezone offset
"
:
function
(
format
)
{
"
parses timezone offset
"
:
function
(
format
)
{
var
p
=
format
(
"
%m/%d/%Y %Z
"
).
parse
;
var
p
=
format
(
"
%m/%d/%Y %Z
"
).
parse
;
assert
.
deepEqual
(
p
(
"
01/02/1990 +0000
"
),
local
(
1990
,
0
,
1
,
16
));
assert
.
deepEqual
(
p
(
"
01/02/1990 +0000
"
),
local
(
1990
,
0
,
1
,
16
));
assert
.
deepEqual
(
p
(
"
01/02/1990 +0100
"
),
local
(
1990
,
0
,
1
,
17
));
assert
.
deepEqual
(
p
(
"
01/02/1990 +0100
"
),
local
(
1990
,
0
,
1
,
15
));
assert
.
deepEqual
(
p
(
"
01/02/1990 -0100
"
),
local
(
1990
,
0
,
1
,
15
));
assert
.
deepEqual
(
p
(
"
01/02/1990 -0100
"
),
local
(
1990
,
0
,
1
,
17
));
assert
.
deepEqual
(
p
(
"
01/02/1990 -0800
"
),
local
(
1990
,
0
,
2
,
0
));
},
},
"
ignores optional padding modifier, skipping zeroes and spaces
"
:
function
(
format
)
{
"
ignores optional padding modifier, skipping zeroes and spaces
"
:
function
(
format
)
{
var
p
=
format
(
"
%-m/%0d/%_Y
"
).
parse
;
var
p
=
format
(
"
%-m/%0d/%_Y
"
).
parse
;
...
...
test/time/format-utc-test.js
View file @
00d7183a
...
@@ -215,8 +215,9 @@ suite.addBatch({
...
@@ -215,8 +215,9 @@ suite.addBatch({
"
parses timezone offset
"
:
function
(
format
)
{
"
parses timezone offset
"
:
function
(
format
)
{
var
p
=
format
(
"
%m/%d/%Y %Z
"
).
parse
;
var
p
=
format
(
"
%m/%d/%Y %Z
"
).
parse
;
assert
.
deepEqual
(
p
(
"
01/02/1990 +0000
"
),
utc
(
1990
,
0
,
2
));
assert
.
deepEqual
(
p
(
"
01/02/1990 +0000
"
),
utc
(
1990
,
0
,
2
));
assert
.
deepEqual
(
p
(
"
01/02/1990 +0100
"
),
utc
(
1990
,
0
,
2
,
1
));
assert
.
deepEqual
(
p
(
"
01/02/1990 +0100
"
),
utc
(
1990
,
0
,
1
,
23
));
assert
.
deepEqual
(
p
(
"
01/02/1990 -0100
"
),
utc
(
1990
,
0
,
1
,
23
));
assert
.
deepEqual
(
p
(
"
01/02/1990 -0100
"
),
utc
(
1990
,
0
,
2
,
1
));
assert
.
deepEqual
(
p
(
"
01/02/1990 -0800
"
),
time
.
local
(
1990
,
0
,
2
));
}
}
}
}
}
}
...
...
test/time/time.js
View file @
00d7183a
var
offset
=
0
;
var
offset
=
0
;
exports
.
local
=
function
(
year
,
month
,
day
,
hours
,
minutes
,
seconds
,
milliseconds
)
{
exports
.
local
=
function
(
year
,
month
,
day
,
hours
,
minutes
,
seconds
,
milliseconds
)
{
var
date
=
new
Date
()
;
var
date
=
new
Date
;
date
.
setFullYear
(
year
,
month
,
day
);
date
.
setFullYear
(
year
,
month
,
day
);
date
.
setHours
(
hours
||
0
,
offset
+
(
minutes
||
0
),
seconds
||
0
,
milliseconds
||
0
);
date
.
setHours
(
hours
||
0
,
offset
+
(
minutes
||
0
),
seconds
||
0
,
milliseconds
||
0
);
return
date
;
return
date
;
};
};
exports
.
utc
=
function
(
year
,
month
,
day
,
hours
,
minutes
,
seconds
,
milliseconds
)
{
exports
.
utc
=
function
(
year
,
month
,
day
,
hours
,
minutes
,
seconds
,
milliseconds
)
{
var
date
=
new
Date
()
;
var
date
=
new
Date
;
date
.
setUTCFullYear
(
year
,
month
,
day
);
date
.
setUTCFullYear
(
year
,
month
,
day
);
date
.
setUTCHours
(
hours
||
0
,
minutes
||
0
,
seconds
||
0
,
milliseconds
||
0
);
date
.
setUTCHours
(
hours
||
0
,
minutes
||
0
,
seconds
||
0
,
milliseconds
||
0
);
return
date
;
return
date
;
...
...
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