From 673984a7dbd23dae95354f4c48b026afa891082d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 18 May 2016 15:53:13 +0200
Subject: [PATCH] feat(export): more export stuff

---
 public/app/features/dashboard/dashnav/dashnav.html |  1 +
 public/app/features/dashboard/dashnav/dashnav.ts   |  7 ++++---
 public/app/features/dashboard/export/exporter.ts   | 12 ------------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html
index 8a50c9d3bda..74080a68cd1 100644
--- a/public/app/features/dashboard/dashnav/dashnav.html
+++ b/public/app/features/dashboard/dashnav/dashnav.html
@@ -49,6 +49,7 @@
 			<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('settings');">Settings</a></li>
 			<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('annotations');">Annotations</a></li>
 			<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('templating');">Templating</a></li>
+			<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="viewJson();">View JSON</a></li>
 			<li ng-if="contextSrv.isEditor && !dashboard.editable"><a class="pointer" ng-click="makeEditable();">Make Editable</a></li>
 			<li ng-if="contextSrv.isEditor"><a class="pointer" ng-click="saveDashboardAs();">Save As...</a></li>
 			<li ng-if="dashboardMeta.canSave"><a class="pointer" ng-click="deleteDashboard();">Delete dashboard</a></li>
diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts
index ae7d81dfc58..62f598e1cbd 100644
--- a/public/app/features/dashboard/dashnav/dashnav.ts
+++ b/public/app/features/dashboard/dashnav/dashnav.ts
@@ -169,10 +169,11 @@ export class DashNavCtrl {
       });
     };
 
-    $scope.exportDashboard = function() {
+    $scope.viewJson = function() {
       var clone = $scope.dashboard.getSaveModelClone();
-      var exporter = new DashboardExporter(datasourceSrv);
-      exporter.export(clone);
+      var html = angular.toJson(clone, true);
+      var uri = "data:application/json," + encodeURIComponent(html);
+      var newWindow = window.open(uri);
     };
 
     $scope.snapshot = function() {
diff --git a/public/app/features/dashboard/export/exporter.ts b/public/app/features/dashboard/export/exporter.ts
index 859199e3a07..a5679e81732 100644
--- a/public/app/features/dashboard/export/exporter.ts
+++ b/public/app/features/dashboard/export/exporter.ts
@@ -81,17 +81,5 @@ export class DashboardExporter {
     });
   }
 
-  export(dashboard) {
-    return this.makeExportable(dashboard).then(clean => {
-      var html = angular.toJson(clean, true);
-      var uri = "data:application/json," + encodeURIComponent(html);
-      var newWindow = window.open(uri);
-
-      // var blob = new Blob([angular.toJson(clean, true)], { type: "application/json;charset=utf-8" });
-      // var wnd: any = window;
-      // wnd.saveAs(blob, clean.title + '-' + new Date().getTime() + '.json');
-    });
-  }
-
 }