From b6a3524e9b86722a5c697c33934714c1248889d0 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Sun, 15 Feb 2015 21:39:01 -0800
Subject: [PATCH] Add a relative time component to frontend

---
 .../polymer/components/recent-states.html     |  5 ++-
 .../components/relative-ha-datetime.html      | 41 +++++++++++++++++++
 .../polymer/components/state-info.html        |  5 ++-
 .../polymer/home-assistant-api.html           | 12 ++----
 .../polymer/more-infos/more-info-sun.html     |  6 ++-
 .../polymer/resources/moment-js.html          |  5 +++
 6 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 homeassistant/components/frontend/www_static/polymer/components/relative-ha-datetime.html
 create mode 100644 homeassistant/components/frontend/www_static/polymer/resources/moment-js.html

diff --git a/homeassistant/components/frontend/www_static/polymer/components/recent-states.html b/homeassistant/components/frontend/www_static/polymer/components/recent-states.html
index 5f8463c74bb..408c0448836 100644
--- a/homeassistant/components/frontend/www_static/polymer/components/recent-states.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/recent-states.html
@@ -1,6 +1,8 @@
 <link rel="import" href="../bower_components/polymer/polymer.html">
 <link rel="import" href="../bower_components/core-style/core-style.html">
+
 <link rel="import" href="./loading-box.html">
+<link rel="import" href="relative-ha-datetime.html">
 
 <polymer-element name="recent-states" attributes="stateObj">
   <template>
@@ -18,7 +20,8 @@
               {{state.state}}
             </div>
             <div class='data'>
-              {{state.last_changed | relativeHATime}}
+              <relative-ha-datetime datetime="{{stateObj.last_changed}}">
+              </relative-ha-datetime>
             </div>
           </div>
         </template>
diff --git a/homeassistant/components/frontend/www_static/polymer/components/relative-ha-datetime.html b/homeassistant/components/frontend/www_static/polymer/components/relative-ha-datetime.html
new file mode 100644
index 00000000000..68f75eb90ee
--- /dev/null
+++ b/homeassistant/components/frontend/www_static/polymer/components/relative-ha-datetime.html
@@ -0,0 +1,41 @@
+<link rel="import" href="../bower_components/polymer/polymer.html">
+
+<link rel="import" href="../resources/moment-js.html">
+
+<polymer-element name="relative-ha-datetime" attributes="datetime">
+  <template>
+    <span>{{ relativeTime }}</span>
+  </template>
+  <script>
+  var UPDATE_INTERVAL = 60000; // 60 seconds
+
+  var parseDateTime = window.hass.util.parseDateTime;
+
+  Polymer({
+    relativeTime: "",
+    parsedDateTime: null,
+
+    created: function() {
+      this.updateRelative = this.updateRelative.bind(this);
+    },
+
+    attached: function() {
+      this._interval = setInterval(this.updateRelative, UPDATE_INTERVAL);
+    },
+
+    detached: function() {
+      clearInterval(this._interval);
+    },
+
+    datetimeChanged: function(oldVal, newVal) {
+      this.parsedDateTime = newVal ? parseDateTime(newVal) : null;
+
+      this.updateRelative();
+    },
+
+    updateRelative: function() {
+      this.relativeTime = this.parsedDateTime ? moment(this.parsedDateTime).fromNow() : "";
+    },
+  });
+  </script>
+</polymer-element>
diff --git a/homeassistant/components/frontend/www_static/polymer/components/state-info.html b/homeassistant/components/frontend/www_static/polymer/components/state-info.html
index ddd696fd235..05c9ff643bf 100755
--- a/homeassistant/components/frontend/www_static/polymer/components/state-info.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/state-info.html
@@ -3,6 +3,7 @@
 <link rel="import" href="../bower_components/core-style/core-style.html">
 
 <link rel="import" href="state-badge.html">
+<link rel="import" href="relative-ha-datetime.html">
 
 <polymer-element name="state-info" attributes="stateObj" noscript>
   <template>
@@ -36,8 +37,8 @@
         </div>
 
         <div class="time-ago">
-          <core-tooltip label="{{stateObj.last_changed}}" position="bottom">
-            {{stateObj.relativeLastChanged}}
+          <core-tooltip label="{{stateObj.lastChanged}}" position="bottom">
+            <relative-ha-datetime datetime="{{stateObj.lastChanged}}"></relative-ha-datetime>
           </core-tooltip>
         </div>
         
diff --git a/homeassistant/components/frontend/www_static/polymer/home-assistant-api.html b/homeassistant/components/frontend/www_static/polymer/home-assistant-api.html
index 39655f34655..eb8b2bc9a28 100644
--- a/homeassistant/components/frontend/www_static/polymer/home-assistant-api.html
+++ b/homeassistant/components/frontend/www_static/polymer/home-assistant-api.html
@@ -1,7 +1,6 @@
 <link rel="import" href="./bower_components/polymer/polymer.html">
 
 <script src="./home-assistant-js/dist/homeassistant.min.js"></script>
-<script src="./bower_components/moment/moment.js"></script>
 
 <link rel="import" href="./dialogs/more-info-dialog.html">
 
@@ -10,10 +9,11 @@
   var DOMAINS_WITH_MORE_INFO = ['light', 'group', 'sun', 'configurator'];
 
   // Register some polymer filters
-  PolymerExpressions.prototype.relativeHATime = function(timeString) {
+
+  PolymerExpressions.prototype.HATimeToDate = function(timeString) {
     if (!timeString) return;
 
-    return moment(window.hass.util.parseDateTime(timeString)).fromNow();
+    return window.hass.util.parseDateTime(timeString);
   };
 
   PolymerExpressions.prototype.HATimeStripDate = function(timeString) {
@@ -45,12 +45,6 @@
         }
       }
     },
-
-    relativeLastChanged: {
-      get: function() {
-        return moment(this.lastChangedAsDate).fromNow();
-      }
-    },
   });
 
   var state,
diff --git a/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-sun.html b/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-sun.html
index d773813c0c1..5cddf381d73 100644
--- a/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-sun.html
+++ b/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-sun.html
@@ -1,6 +1,8 @@
 <link rel="import" href="../bower_components/polymer/polymer.html">
 <link rel="import" href="../bower_components/core-style/core-style.html">
 
+<link rel="import" href="../components/relative-ha-datetime.html">
+
 <polymer-element name="more-info-sun" attributes="stateObj">
 <template>
   <core-style ref='ha-key-value-table'></core-style>
@@ -9,7 +11,7 @@
 
     <div layout justified horizontal class='data-entry' id='rising'>
       <div class='key'>
-        Rising {{stateObj.attributes.next_rising | relativeHATime}}
+        Rising <relative-ha-datetime datetime="{{stateObj.attributes.next_rising}}"></relative-ha-datetime>
       </div>
       <div class='value'>
         {{stateObj.attributes.next_rising | HATimeStripDate}}
@@ -18,7 +20,7 @@
 
     <div layout justified horizontal class='data-entry' id='setting'>
       <div class='key'>
-        Setting {{stateObj.attributes.next_setting | relativeHATime}}
+        Setting <relative-ha-datetime datetime="{{stateObj.attributes.next_setting}}"></relative-ha-datetime>
       </div>
       <div class='value'>
         {{stateObj.attributes.next_setting | HATimeStripDate}}
diff --git a/homeassistant/components/frontend/www_static/polymer/resources/moment-js.html b/homeassistant/components/frontend/www_static/polymer/resources/moment-js.html
new file mode 100644
index 00000000000..70e14e72d7f
--- /dev/null
+++ b/homeassistant/components/frontend/www_static/polymer/resources/moment-js.html
@@ -0,0 +1,5 @@
+<!--
+  Wrapping JS in an HTML file will prevent it from being loaded twice.
+-->
+
+<script src="../bower_components/moment/moment.js"></script>