From ded71189a6e6752ff63b4152bacf6367b3875f6d Mon Sep 17 00:00:00 2001
From: Connor L Jackson <connor.jackson@uconn.edu>
Date: Wed, 22 Feb 2017 19:58:16 -0500
Subject: [PATCH] Some minor modal changes to return page.

---
 WebContent/html/webpages/returnPage.jsp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/WebContent/html/webpages/returnPage.jsp b/WebContent/html/webpages/returnPage.jsp
index 284f415..cb5976e 100644
--- a/WebContent/html/webpages/returnPage.jsp
+++ b/WebContent/html/webpages/returnPage.jsp
@@ -136,7 +136,7 @@ MySQLAccess myaccess = new MySQLAccess();
 //String userID = 
 int counter = 0;
 //9 is just for testing purposes. Should be returning 4 devices at the moment.
-RentedDevice[] mydevices = myaccess.getUserDevices("9");
+RentedDevice[] mydevices = myaccess.getUserDevices("19");
 String deviceString = RentedDevice.arrayToString(mydevices);
 %>
 
@@ -164,7 +164,9 @@ $('input.deviceCheckbox').click(selectBox);
 $('#returnbutton').click(returnDevice);
 $('#closeOrderForm').click(hidePopup);
 
-$(function(){$('#tabledisplay').DataTable();})
+//event listeners to escape modal
+window.onkeydown = function(e){if (e.keyCode == 27){hidePopup();}}
+window.onclick = function(e){var modal = document.getElementById('orderInfoModal'); if(e.target == modal) modal.style.display = "none";}
 
 //This should make the device array of retrieved devices
 function makeDeviceArray(){