be able to close edit textbox w/o save

getredash#54 Ignore my local branch name
washort · Jun 16, 2017 · cdbd2be · cdbd2be
1 parent 2010969
commit cdbd2be
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -8,7 +8,7 @@ const EditTextBoxComponent = {
     close: '&',
     dismiss: '&',
   },
-  controller(toastr) {
+  controller($rootScope, $location, $http, toastr) {
     'ngInject';
 
     this.saveInProgress = false;
@@ -23,13 +23,18 @@ const EditTextBoxComponent = {
         this.saveInProgress = false;
       });
     };
+    this.closeWithoutSave = () => {
+      this.widget.text = this.widget.existing_text;
+      this.close();
+    };
   },
 };
 
 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: {