Merge pull request #142 from TAMULib/error-report-modal

open report error modal using service, static backdrop
TAMULib · Jun 5, 2019 · 6c7e07f · 6c7e07f
2 parents ebb1c01 + 0b55cc9
commit 6c7e07f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/app/controllers/abstractController.js b/app/controllers/abstractController.js
@@ -166,7 +166,7 @@ core.controller('AbstractController', function ($scope, $window, ModalService, S
             method: 'error',
             data: alert
         }).then(function () {
-            $scope.closeModal();
+            $scope.openModal('#reportModal');
         }, function (response) {
             if (response.data === undefined || response.data.message !== "EXPIRED_JWT") {
                 var subject = 'Error Report';

diff --git a/app/services/modalService.js b/app/services/modalService.js
@@ -2,17 +2,17 @@ core.service("ModalService", function () {
 
     var ModalService = this;
 
-    ModalService.openModalId = undefined;
+    var modalElement;
 
     ModalService.openModal = function (id) {
-        ModalService.openModalId = id;
-        angular.element(id).modal('show');
+        modalElement = angular.element(id);
+        modalElement.modal('show');
     };
 
     ModalService.closeModal = function () {
-        angular.element(ModalService.openModalId).modal('hide');
-        angular.element('body').removeClass('modal-open');
-        angular.element('.modal-backdrop').remove();
+        if (modalElement) {
+            modalElement.modal('hide');
+        }
     };
 
     return ModalService;

diff --git a/app/views/alerts/defaultalert.html b/app/views/alerts/defaultalert.html
@@ -1,4 +1,4 @@
-<modal modal-id="reportModal" modal-view="node_modules/weaver-ui-core/app/views/modals/errorReportModal.html" modal-header-class="modal-header-primary"></modal>
+<modal modal-id="reportModal" modal-view="node_modules/weaver-ui-core/app/views/modals/errorReportModal.html" modal-header-class="modal-header-primary" wvr-modal-backdrop="static"></modal>
 
 <div class="alert alert-wrapper alert-{{alert.class}}" ng-class="{fade: alert.fade}" role="alert">
 	<button ng-click="remove(alert, true)" type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>