forked from elastic/kibana
-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix timezone detection bug, does not exist in same way in 4.2
- Loading branch information
Rashid Khan
committed
Nov 18, 2015
1 parent
4368180
commit ff47988
Showing
3 changed files
with
29 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
build/ | ||
node_modules/ | ||
target/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
define(function (require) { | ||
var tzDetect = require('jstimezonedetect').jstz; | ||
var moment = require('moment'); | ||
|
||
return function timezoneFn(config, Private) { | ||
return function () { | ||
var configuredTZ = config.get('dateFormat:tz', 'Browser'); | ||
var configDefaults = Private(require('ui/config/defaults')); | ||
var detectedTimezone = tzDetect.determine().name(); | ||
var isDefaultTimezone; | ||
|
||
try { | ||
isDefaultTimezone = configuredTZ === configDefaults['dateFormat:tz'].value; | ||
} catch (e) { | ||
return detectedTimezone; | ||
} | ||
|
||
var timezone = isDefaultTimezone ? | ||
(detectedTimezone || moment().format('Z')) : | ||
configuredTZ; | ||
|
||
return timezone; | ||
}; | ||
}; | ||
}); |