tb_photos 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d47ffc3cd873ef1d97dfcda9161d04650858b91
-  data.tar.gz: 641b8a9871f8c31df76a498cc89409249bb5e86c
+  metadata.gz: 4f54935850231974c5b0c0bf66f1c036fe53e08d
+  data.tar.gz: e7dbb18f7638dbb07664ec9dbb3319fb8356a29b
 SHA512:
-  metadata.gz: ee88ed93472d5864cfeb9a0e0f1a1f5cd93c68132ec92675d5be4c86cba46477de15c2ce66efe98164b3d382a6469e0d8a689953e0b71cb4a679859be526d0fb
-  data.tar.gz: f6325f8fbbc1008bd0be1b9b4f2333f35dc602b7b878b51e4382158bda12173718cf3912c9e021988281c06d71338190cbdd5800d95d534571de1a4d7735c42f
+  metadata.gz: a9b50be0e281fe08d91ce66603a07763e484aaf1cad85625fde342509fd2607f62a73597e5395655cf4a23f706345759d7059bb5e75c6d032ad7e0988045cb48
+  data.tar.gz: 2b633ae4f7895c0c371cbde4c36d9ddb87e7a9fe5844245b211186c9348c3e0f2d4712896e790e6149a28e6f0d254754caba0a05c97b5d2553aec1626a2cb2c9

data/app/assets/javascripts/admin/photos/photos.js

@@ -67,7 +67,9 @@
       }
     }
     else {
-      errors.push("No file found");
+      if($('.admin-photo-form-current-photo').length === 0){
+        errors.push("No file found");
+      }
     }
     return errors;
   };
@@ -161,10 +163,6 @@
   };
 
   self.submittedPhotoForm = function(e){
-    // disable submit button
-    // not working in updated bootstrap!
-    // var submit = $(this).find('input[type=submit]');
-    // submit.attr('disabled', 'disabled').val(submit.attr('data-loading-text'));
 
     if(self.html5upload){
       // create a FormData object and attach form values
@@ -182,10 +180,15 @@
       if(photoValidationErrors.length) {
         return self.generateFileUploadErrors(photoValidationErrors);
       }
-      
-      progressBar = self.progressBarForUpload(file.name);
-      fd.append('spud_photo[photo]', file);
-      form.append(progressBar);
+ 
+      if(file){
+        progressBar = self.progressBarForUpload(file.name);
+        fd.append('spud_photo[photo]', file);
+        form.append(progressBar);  
+      }
+      else{
+        progressBar = self.progressBarForUpload('');
+      }
 
       // send FormData object as ajax request
       var xhr = new XMLHttpRequest();
@@ -255,6 +258,12 @@
     progressBar.find('.progress').addClass('progress-danger');
   };
 
+  self.onPhotoUploadFailure = function(e, progressBar){
+    if(typeof(console) == 'object'){
+      console.error('An unexpected error occurred during upload', e);
+    }
+  };
+
   /*
   * Photo Upload/Edit Form
   ------------------------------- */

data/app/views/admin/photos/_form.html.erb

@@ -30,7 +30,7 @@
         <div class="control-group">
           <label class="control-label">Current Photo</label>
           <div class="controls">
-            <%= image_tag @photo.photo.url(:spud_admin_medium) %>
+            <%= image_tag @photo.photo.url(:spud_admin_medium), :class => 'admin-photo-form-current-photo' %>
           </div>
         </div>
       <% end %>

data/lib/spud_photos/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Photos
-	  VERSION = "1.0.5"
+	  VERSION = "1.0.6"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_photos
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails