From d49cef2201712a4cde45ee7c57a1f1368a9b2097 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sun, 24 Apr 2016 05:36:02 +1000
Subject: [PATCH] Pass the app timezone for conversions

---
 modules/backend/assets/js/october-min.js      | 6 ++++--
 modules/backend/assets/js/october.datetime.js | 8 +++++++-
 modules/backend/layouts/_head.htm             | 1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js
index f354bbbe0..2df20ecf4 100644
--- a/modules/backend/assets/js/october-min.js
+++ b/modules/backend/assets/js/october-min.js
@@ -1727,9 +1727,11 @@ this.$el.one('dispose-control',this.proxy(this.dispose))}
 DateTimeConverter.prototype.initDefaults=function(){if(!this.options.timezone){this.options.timezone=$('meta[name="backend-timezone"]').attr('content')}
 if(!this.options.locale){this.options.locale=$('meta[name="backend-locale"]').attr('content')}
 if(!this.options.format){this.options.format='llll'}
-if(this.options.formatAlias){this.options.format=this.getFormatFromAlias(this.options.formatAlias)}}
+if(this.options.formatAlias){this.options.format=this.getFormatFromAlias(this.options.formatAlias)}
+this.appTimezone=$('meta[name="app-timezone"]').attr('content')
+if(!this.appTimezone){this.appTimezone='UTC'}}
 DateTimeConverter.prototype.getDateTimeValue=function(){this.datetime=this.$el.attr('datetime')
-var momentObj=moment(this.datetime),result
+var momentObj=moment.tz(this.datetime,this.appTimezone),result
 if(this.options.locale){moment.locale(this.options.locale)}
 if(this.options.timezone){momentObj=momentObj.tz(this.options.timezone)}
 if(this.options.timeSince){result=momentObj.fromNow()}
diff --git a/modules/backend/assets/js/october.datetime.js b/modules/backend/assets/js/october.datetime.js
index 0bf33b976..5437ad9d8 100644
--- a/modules/backend/assets/js/october.datetime.js
+++ b/modules/backend/assets/js/october.datetime.js
@@ -67,11 +67,17 @@
         if (this.options.formatAlias) {
             this.options.format = this.getFormatFromAlias(this.options.formatAlias)
         }
+
+        this.appTimezone = $('meta[name="app-timezone"]').attr('content')
+        if (!this.appTimezone) {
+            this.appTimezone = 'UTC'
+        }
     }
 
     DateTimeConverter.prototype.getDateTimeValue = function() {
         this.datetime = this.$el.attr('datetime')
-        var momentObj = moment(this.datetime),
+
+        var momentObj = moment.tz(this.datetime, this.appTimezone),
             result
 
         if (this.options.locale) {
diff --git a/modules/backend/layouts/_head.htm b/modules/backend/layouts/_head.htm
index c2be8adcf..88894c624 100644
--- a/modules/backend/layouts/_head.htm
+++ b/modules/backend/layouts/_head.htm
@@ -1,6 +1,7 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=0, minimal-ui">
 <meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="app-timezone" content="<?= e(Config::get('app.timezone')) ?>">
 <meta name="backend-base-path" content="<?= Backend::baseUrl() ?>">
 <meta name="backend-timezone" content="<?= e(Backend\Models\Preferences::get('timezone')) ?>">
 <meta name="backend-locale" content="<?= e(Backend\Models\Preferences::get('locale')) ?>">