thin_man 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c3035550e3c17dfa67a9448a702719be0e76acb
-  data.tar.gz: 355d0bbf12eade487e4976b4a8cdbf7ec3aa290a
+  metadata.gz: 1220da7c4d7f921e1b49a0523bedb0ac29327831
+  data.tar.gz: a2504fab73b453d1ff2ffe001a2dc2f891369029
 SHA512:
-  metadata.gz: 82943692e3248084f9907442cf8c4e5989740a860f8731325cfb67d903fbe37a3f38b7ffab7e1d7031be2260ea08d43fad075f84359ba9ddc6ab743aa67eb035
-  data.tar.gz: 9ed3fdf82baa79f4d5116786c56e913408f1deec91d3390599fa80049e32fdc65ad98997f68e55ffbc68493ea4f9dbe30a281e4652fdc913ccd96cf28b9b1e9b
+  metadata.gz: 5f634db41a4ece9187c2addb1d214a6ef3783b8e1e8cc749dacbe31fe957e9f669b42a857a8b709ac9755663819f036a5b69226b3af6595804e07809954d502a
+  data.tar.gz: 3b0e0fa9f33757649136aa95c768b89767658f0625bf0f32049665f4dce13e1378e3118eb58425cef4af898a1d98bb8b66b678198e6838ae9ca3d1094769a4b9

data/app/assets/javascripts/thin_man.js

@@ -170,7 +170,18 @@ var initThinMan = function(){
       },
       ajaxError: function(jqXHR) {
         if(jqXHR.status == 409){
-          this.error_target.html(jqXHR.responseText);
+          try{
+            var data = JSON.parse(jqXHR.responseText);
+          }catch(error){
+            var data = jqXHR.responseText;
+          }
+          if(typeof data === 'string'){
+            this.error_target.html(data);
+          } else if(typeof data === 'object') {
+            if(typeof data.html != 'undefined'){
+              this.error_target.html(data.html);
+            }
+          }
         }else if(jqXHR.status == 500){
           alert('There was an error communicating with the server.')
         }

data/lib/thin_man/version.rb

@@ -1,3 +1,3 @@
 module ThinMan
-  VERSION = "0.11.2"
+  VERSION = "0.11.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thin_man
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Eric Draut, Adam Bialek