From b6cdb0f885e50fa1df06651919b470a55c99fc80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 15 Aug 2014 08:02:16 +0200
Subject: [PATCH] Moved some expensive bindings from timepicker to controller

---
 src/app/panels/text/module.js         |  1 -
 src/app/panels/timepicker/module.html |  8 +-------
 src/app/panels/timepicker/module.js   | 16 ++++++++++++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/app/panels/text/module.js b/src/app/panels/text/module.js
index 575495dcbe2..c745cf4f30a 100644
--- a/src/app/panels/text/module.js
+++ b/src/app/panels/text/module.js
@@ -64,7 +64,6 @@ function (angular, app, _, require) {
         .replace(/</g, '&lt;');
 
       if (converter) {
-        console.log("markdown render cached");
         $scope.updateContent(converter.makeHtml(text));
       }
       else {
diff --git a/src/app/panels/timepicker/module.html b/src/app/panels/timepicker/module.html
index 7a9282c79ac..6a498da2959 100644
--- a/src/app/panels/timepicker/module.html
+++ b/src/app/panels/timepicker/module.html
@@ -16,13 +16,7 @@
       <li class="dropdown">
 
         <a class="dropdown-toggle timepicker-dropdown" data-toggle="dropdown" href="" bs-tooltip="time.tooltip" data-placement="bottom" ng-click="dismiss();">
-          <span ng-show="filter.time">
-            <span class="pointer" ng-hide="panel.now">{{time.from.date | date:'MMM d, y HH:mm:ss'}}</span>
-            <span class="pointer" ng-show="panel.now">{{time.from.date | moment:'ago'}}</span>
-            to
-            <span class="pointer" ng-hide="panel.now" >{{time.to.date | date:'MMM d, y HH:mm:ss'}}</span>
-            <span class="pointer" ng-show="panel.now">{{time.to.date | moment:'ago'}}</span>
-          </span>
+          <span ng-show="filter.time" ng-bind="time.rangeString"></span>
           <span ng-hide="filter.time">Time filter</span>
           <span ng-show="dashboard.refresh" class="text-warning">refreshed every {{dashboard.refresh}} </span>
           <i class="icon-caret-down"></i>
diff --git a/src/app/panels/timepicker/module.js b/src/app/panels/timepicker/module.js
index 5cae2ef67b5..3f29f1652dc 100644
--- a/src/app/panels/timepicker/module.js
+++ b/src/app/panels/timepicker/module.js
@@ -172,10 +172,7 @@ function (angular, app, _, moment, kbn) {
     };
 
     var getScopeTimeObj = function(from,to) {
-      var model = {
-        from: getTimeObj(from),
-        to: getTimeObj(to),
-      };
+      var model = { from: getTimeObj(from), to: getTimeObj(to), };
 
       if (model.from.date) {
         model.tooltip = moment(model.from.date).format('YYYY-MM-DD HH:mm:ss') + ' <br>to<br>';
@@ -185,6 +182,17 @@ function (angular, app, _, moment, kbn) {
         model.tooltip = 'Click to set time filter';
       }
 
+      if ($scope.filter.time) {
+        if ($scope.panel.now) {
+          model.rangeString = moment(model.from.date).fromNow() + ' to ' +
+            moment(model.to.date).fromNow();
+        }
+        else {
+          model.rangeString = moment(model.from.date).format('MMM D, YYYY hh:mm:ss') + ' to ' +
+            moment(model.to.date).format('MMM D, YYYY hh:mm:ss');
+        }
+      }
+
       return model;
     };