properly parse response back when submitting a report with a photo

make sure we re-enable all submit buttons after photo upload error

4 files changed, 17 insertions, 3 deletions

diff --git a/phonegap/www/about.html b/phonegap/www/about.html
index 7fae3b9fa..70b6d9dfb 100644
--- a/phonegap/www/about.html
+++ b/phonegap/www/about.html
@@ -12,6 +12,7 @@
     <script type="text/javascript" src="js/config.js"></script>
 	<script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>
     <script type="text/javascript" src="js/jquery-1.7.0.min.js"></script>
+    <script type="text/javascript" src="js/json2.js"></script>
 
 
   </head>
diff --git a/phonegap/www/around.html b/phonegap/www/around.html
index 906809dac..4768d2f42 100644
--- a/phonegap/www/around.html
+++ b/phonegap/www/around.html
@@ -19,6 +19,7 @@
 
 <script src="js/jquery.validate.min.js" type="text/javascript" charset="utf-8"></script>
 
+<script type="text/javascript" src="js/json2.js"></script>
 <script type="text/javascript" src="js/geo.min.js"></script>
 <script type="text/javascript" src="js/fixmystreet.js"></script>
 <script type="text/javascript" src="js/mobile.js"></script>
diff --git a/phonegap/www/index.html b/phonegap/www/index.html
index e3ed9cfa4..cf32ea071 100644
--- a/phonegap/www/index.html
+++ b/phonegap/www/index.html
@@ -8,7 +8,7 @@
 
     <link rel="stylesheet" href="css/base.css">
     <link rel="stylesheet" href="css/mobile.css">
-	<!-- If your application is targeting iOS BEFORE 4.0 you MUST put json2.js from http://www.JSON.org/json2.js into your www directory and include it here -->
+    <script type="text/javascript" src="js/json2.js"></script>
     <script type="text/javascript" src="js/config.js"></script>
 	<script type="text/javascript" charset="utf-8" src="cordova-1.5.0.js"></script>
     <script type="text/javascript" src="js/jquery-1.7.0.min.js"></script>
diff --git a/phonegap/www/js/mobile.js b/phonegap/www/js/mobile.js
index 554872a70..01c87fab4 100644
--- a/phonegap/www/js/mobile.js
+++ b/phonegap/www/js/mobile.js
@@ -187,8 +187,19 @@ function takePhoto(type) {
 function fileUploadSuccess(r) {
     console.log( r.response );
     console.log( typeof r.response );
-    if ( r.response.indexOf( 'success' ) >= 0  ) {
-        window.location = 'email_sent.html';
+    if ( r.response ) {
+        var data = JSON.parse( r.response );
+        if ( data.success ) {
+            if ( data.report ) {
+                localStorage.report = data.report;
+                window.location = 'report_created.html';
+            } else {
+                window.location = 'email_sent.html';
+            }
+        } else {
+            alert('Could not submit report');
+            $('input[type=submit]').prop("disabled", false);
+        }
     } else {
         alert('Could not submit report');
         $('input[type=submit]').prop("disabled", false);
@@ -197,6 +208,7 @@ function fileUploadSuccess(r) {
 
 function fileUploadFail() {
     alert('Could not submit report');
+    $('input[type=submit]').prop("disabled", false);
 }