Merge pull request #12 from revelrylabs/master

fix file upload for IE11
LifeboyTech · Jul 13, 2018 · 8895198 · 8895198
2 parents fdf9a9e + 4812be5
commit 8895198
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/public/js/base.form.js b/public/js/base.form.js
@@ -195,9 +195,9 @@ $(document).ready(function() {
 
 
         $('#station-fileupload-form').submit();
-
         $("#postiframe").load(function () {
-                $iframeContents = $("#postiframe").contents().find('*').first().text();
+            try {
+                $iframeContents = $("#postiframe")[0].contentWindow.document.body.innerText;
                 $results = $.parseJSON($iframeContents);
                 if ($results.success)
                 {
@@ -233,6 +233,9 @@ $(document).ready(function() {
                     $(this).remove();
                     scroll(0,0);
                 }
+            } catch (e) {
+                $(this).remove();
+            }
         });
     });
 

diff --git a/src/controllers/StationFileController.php b/src/controllers/StationFileController.php
@@ -205,7 +205,7 @@ public function upload()
 	{
 		// return an error response if no file is detected, this may be due to the fact that the file is too large.
 		if (!$this->request->hasFile('uploaded_file')) {
-			return Response::json(['success' => FALSE, 'reason' => 'No file uploaded or invalid file type.']);
+			return Response::make(json_encode(['success' => FALSE, 'reason' => 'No file uploaded or invalid file type.']));
 		}
 
 		$panel               = new Panel;
@@ -239,7 +239,7 @@ public function upload()
 			$bad_image = !$is_an_image || !in_array(strtolower($extension), $allowed_image_extensions);
 
 			if ($bad_file) {
-				return Response::json(['success' => FALSE, 'reason' => 'File is not a valid image.']);
+				return Response::make(json_encode(['success' => FALSE, 'reason' => 'File is not a valid image.']));
 			}
 
 			$allow_upsize    = isset($element['allow_upsize']) && $element['allow_upsize'];
@@ -258,7 +258,7 @@ public function upload()
 			$target_directory   = isset($element['directory']) ? $element['directory'] : '';
 
 			if ($bad_file) {
-				return Response::json(['success' => FALSE, 'reason' => 'Sorry, this file type is not allowed.']);
+				return Response::make(json_encode(['success' => FALSE, 'reason' => 'Sorry, this file type is not allowed.']));
 			}
 
 			$this->send_to_s3($new_file_name, $target_directory, $app_config, TRUE);
@@ -282,7 +282,7 @@ public function upload()
 			'complete_uri'  => $complete_uri,
 		];
 
-		return Response::json($response);
+		return Response::make(json_encode($response));
 	}
 
 	private function fetch_original($filename, $app_config){