From c50b0c991cd1713af064737fb35e5d5f4bc74b81 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Sat, 28 May 2016 11:15:37 -0700
Subject: [PATCH] Serve moment from window object

---
 src/components/relative-ha-datetime.js | 3 +--
 src/home-assistant.js                  | 2 ++
 src/util/format-date-time.js           | 4 +---
 src/util/format-date.js                | 4 +---
 src/util/format-time.js                | 4 +---
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/components/relative-ha-datetime.js b/src/components/relative-ha-datetime.js
index 1a7986f956..ff40b96a70 100644
--- a/src/components/relative-ha-datetime.js
+++ b/src/components/relative-ha-datetime.js
@@ -1,4 +1,3 @@
-import moment from 'moment';
 import Polymer from '../polymer';
 
 const UPDATE_INTERVAL = 60000; // 60 seconds
@@ -53,6 +52,6 @@ export default new Polymer({
 
   updateRelative() {
     this.relativeTime = this.parsedDateTime ?
-      moment(this.parsedDateTime).fromNow() : '';
+      window.moment(this.parsedDateTime).fromNow() : '';
   },
 });
diff --git a/src/home-assistant.js b/src/home-assistant.js
index b88aed7476..a6e5eac3cc 100644
--- a/src/home-assistant.js
+++ b/src/home-assistant.js
@@ -1,8 +1,10 @@
+import moment from 'moment';
 import Polymer from './polymer';
 
 import HomeAssistant from 'home-assistant-js';
 import nuclearObserver from './util/bound-nuclear-behavior';
 import validateAuth from './util/validate-auth';
+window.moment = moment;
 
 require('./layouts/login-form');
 require('./layouts/home-assistant-main');
diff --git a/src/util/format-date-time.js b/src/util/format-date-time.js
index 67c759954e..21aa8ca20e 100644
--- a/src/util/format-date-time.js
+++ b/src/util/format-date-time.js
@@ -1,5 +1,3 @@
-import moment from 'moment';
-
 export default function formatDateTime(dateObj) {
-  return moment(dateObj).format('lll');
+  return window.moment(dateObj).format('lll');
 }
diff --git a/src/util/format-date.js b/src/util/format-date.js
index 6ddc191dbe..b2164856fc 100644
--- a/src/util/format-date.js
+++ b/src/util/format-date.js
@@ -1,5 +1,3 @@
-import moment from 'moment';
-
 export default function formatDate(dateObj) {
-  return moment(dateObj).format('ll');
+  return window.moment(dateObj).format('ll');
 }
diff --git a/src/util/format-time.js b/src/util/format-time.js
index 0742eee642..339c6f06d9 100644
--- a/src/util/format-time.js
+++ b/src/util/format-time.js
@@ -1,5 +1,3 @@
-import moment from 'moment';
-
 export default function formatTime(dateObj) {
-  return moment(dateObj).format('LT');
+  return window.moment(dateObj).format('LT');
 }