From f455d5593f150cfb693af01ef58794d0ea5ba463 Mon Sep 17 00:00:00 2001
From: David Baldwynn <david.baldwin@alumni.ubc.ca>
Date: Fri, 6 Nov 2015 13:37:18 -0800
Subject: [PATCH] added animations to delete modal

---
 .../admin-form.client.controller.js           | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/public/modules/forms/controllers/admin-form.client.controller.js b/public/modules/forms/controllers/admin-form.client.controller.js
index a562501f..53aec631 100644
--- a/public/modules/forms/controllers/admin-form.client.controller.js
+++ b/public/modules/forms/controllers/admin-form.client.controller.js
@@ -1,11 +1,11 @@
 'use strict';
 
 // Forms controller
-angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope', '$stateParams', '$state', 'Forms', 'CurrentForm', '$http', '$modal', 'myForm',
-	function($rootScope, $scope, $stateParams, $state, Forms, CurrentForm, $http, $modal, myForm) {
+angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope', '$stateParams', '$state', 'Forms', 'CurrentForm', '$http', '$uibModal', 'myForm',
+	function($rootScope, $scope, $stateParams, $state, Forms, CurrentForm, $http, $uibModal, myForm) {
 
         $scope = $rootScope;
-
+        $scope.animationsEnabled = true;
         $scope.myform = myForm;
         $rootScope.saveInProgress = false;
         CurrentForm.setForm($scope.myform);
@@ -57,11 +57,24 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
         */
         $scope.openDeleteModal = function(){
             console.log('hello');
-            $scope.deleteModal = $modal.open({
+            $scope.deleteModal = $uibModal.open({
               animation: $scope.animationsEnabled,
               templateUrl: 'myModalContent.html',
+              controller: 'AdminFormController',
+              resolve: {
+                myForm: function () {
+                  return $scope.myform;
+                }
+              }
+            });
+            $scope.deleteModal.result.then(function (selectedItem) {
+              $scope.selected = selectedItem;
+            }, function () {
+              console.log('Modal dismissed at: ' + new Date());
             });
         };
+
+
         $scope.cancelDeleteModal = function(){
             if($scope.deleteModal){
                 $scope.deleteModal.dismiss('cancel');