From 9e3514a993316d5c89677d5040197c5fc1b04cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 14 Aug 2014 22:30:19 +0200
Subject: [PATCH] More small performance tweaks, trying to clean up watcher &
 scope counts

---
 src/app/panels/text/module.js         | 34 ++++++++++++---------------
 src/app/panels/timepicker/module.html |  3 +--
 src/app/panels/timepicker/module.js   | 14 +++++++++--
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/app/panels/text/module.js b/src/app/panels/text/module.js
index 60abc9a3186..575495dcbe2 100644
--- a/src/app/panels/text/module.js
+++ b/src/app/panels/text/module.js
@@ -1,15 +1,3 @@
-/** @scratch /panels/5
- * include::panels/text.asciidoc[]
- */
-
-/** @scratch /panels/text/0
- * == text
- * Status: *Stable*
- *
- * The text panel is used for displaying static text formated as markdown, sanitized html or as plain
- * text.
- *
- */
 define([
   'angular',
   'app',
@@ -23,6 +11,8 @@ function (angular, app, _, require) {
   var module = angular.module('grafana.panels.text', []);
   app.useModule(module);
 
+  var converter;
+
   module.controller('text', function($scope, filterSrv, $sce, panelSrv) {
 
     $scope.panelMeta = {
@@ -68,15 +58,21 @@ function (angular, app, _, require) {
     };
 
     $scope.renderMarkdown = function(content) {
-      require(['./lib/showdown'], function (Showdown) {
-        var converter = new Showdown.converter();
-        var text = content
-          .replace(/&/g, '&amp;')
-          .replace(/>/g, '&gt;')
-          .replace(/</g, '&lt;');
+      var text = content
+        .replace(/&/g, '&amp;')
+        .replace(/>/g, '&gt;')
+        .replace(/</g, '&lt;');
 
+      if (converter) {
+        console.log("markdown render cached");
         $scope.updateContent(converter.makeHtml(text));
-      });
+      }
+      else {
+        require(['./lib/showdown'], function (Showdown) {
+          converter = new Showdown.converter();
+          $scope.updateContent(converter.makeHtml(text));
+        });
+      }
     };
 
     $scope.updateContent = function(html) {
diff --git a/src/app/panels/timepicker/module.html b/src/app/panels/timepicker/module.html
index 82d9fdd4532..7a9282c79ac 100644
--- a/src/app/panels/timepicker/module.html
+++ b/src/app/panels/timepicker/module.html
@@ -15,8 +15,7 @@
     <ul class="nav nav-pills timepicker-dropdown">
       <li class="dropdown">
 
-        <a class="dropdown-toggle timepicker-dropdown" data-toggle="dropdown" href="" bs-tooltip="time.from.date ? (time.from.date | date:'yyyy-MM-dd HH:mm:ss.sss') + ' <br>to<br>' +(time.to.date | date:'yyyy-MM-dd HH:mm:ss.sss') : 'Click to set a time filter'" data-placement="bottom" ng-click="dismiss();">
-
+        <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>
diff --git a/src/app/panels/timepicker/module.js b/src/app/panels/timepicker/module.js
index 7bc987cb5eb..5cae2ef67b5 100644
--- a/src/app/panels/timepicker/module.js
+++ b/src/app/panels/timepicker/module.js
@@ -172,10 +172,20 @@ function (angular, app, _, moment, kbn) {
     };
 
     var getScopeTimeObj = function(from,to) {
-      return {
+      var model = {
         from: getTimeObj(from),
-        to: getTimeObj(to)
+        to: getTimeObj(to),
       };
+
+      if (model.from.date) {
+        model.tooltip = moment(model.from.date).format('YYYY-MM-DD HH:mm:ss') + ' <br>to<br>';
+        model.tooltip += moment(model.to.date).format('YYYY-MM-DD HH:mm:ss');
+      }
+      else {
+        model.tooltip = 'Click to set time filter';
+      }
+
+      return model;
     };
 
     var getTimeObj = function(date) {