From cdbd2bec47a0c630e8e9247f91cdd208fb1a0d30 Mon Sep 17 00:00:00 2001
From: Alison <github@bankofknowledge.net>
Date: Fri, 16 Jun 2017 14:03:00 -0500
Subject: [PATCH] be able to close edit textbox w/o save

#54

Ignore my local branch name
---
 client/app/pages/dashboards/add-widget-dialog.js | 1 +
 client/app/pages/dashboards/edit-text-box.html   | 4 ++--
 client/app/pages/dashboards/widget.js            | 7 ++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/app/pages/dashboards/add-widget-dialog.js b/client/app/pages/dashboards/add-widget-dialog.js
index 4c257717f8..512ab5e911 100644
--- a/client/app/pages/dashboards/add-widget-dialog.js
+++ b/client/app/pages/dashboards/add-widget-dialog.js
@@ -17,6 +17,7 @@ const AddWidgetDialog = {
     this.query = {};
     this.selected_query = undefined;
     this.text = '';
+    this.existing_text = '';
     this.widgetSizes = [{
       name: 'Regular',
       value: 1,
diff --git a/client/app/pages/dashboards/edit-text-box.html b/client/app/pages/dashboards/edit-text-box.html
index 3c947135df..481386ef72 100644
--- a/client/app/pages/dashboards/edit-text-box.html
+++ b/client/app/pages/dashboards/edit-text-box.html
@@ -1,5 +1,5 @@
 <div class="modal-header">
-  <button type="button" class="close" aria-label="Close" ng-click="$ctrl.close()"><span aria-hidden="true">&times;</span></button>
+  <button type="button" class="close" aria-label="Close" ng-click="$ctrl.closeWithoutSave()"><span aria-hidden="true">&times;</span></button>
   <h4 class="modal-title">Edit TextBox</h4>
 </div>
 <div class="modal-body">
@@ -13,6 +13,6 @@ <h4 class="modal-title">Edit TextBox</h4>
 </div>
 
 <div class="modal-footer">
-  <button type="button" class="btn btn-default" ng-disabled="$ctrl.saveInProgress" ng-click="$ctrl.close()">Close</button>
+  <button type="button" class="btn btn-default" ng-disabled="$ctrl.saveInProgress" ng-click="$ctrl.closeWithoutSave()">Close</button>
   <button type="button" class="btn btn-primary" ng-disabled="$ctrl.saveInProgress" ng-click="$ctrl.saveWidget()">Save</button>
 </div>
diff --git a/client/app/pages/dashboards/widget.js b/client/app/pages/dashboards/widget.js
index 95997c599a..e8c4f3ae86 100644
--- a/client/app/pages/dashboards/widget.js
+++ b/client/app/pages/dashboards/widget.js
@@ -8,7 +8,7 @@ const EditTextBoxComponent = {
     close: '&',
     dismiss: '&',
   },
-  controller(toastr) {
+  controller($rootScope, $location, $http, toastr) {
     'ngInject';
 
     this.saveInProgress = false;
@@ -23,6 +23,10 @@ const EditTextBoxComponent = {
         this.saveInProgress = false;
       });
     };
+    this.closeWithoutSave = () => {
+      this.widget.text = this.widget.existing_text;
+      this.close();
+    };
   },
 };
 
@@ -30,6 +34,7 @@ function DashboardWidgetCtrl($location, $uibModal, $window, Events, currentUser)
   this.canViewQuery = currentUser.hasPermission('view_query');
 
   this.editTextBox = () => {
+    this.widget.existing_text = this.widget.text;
     $uibModal.open({
       component: 'editTextBox',
       resolve: {