beef-has_assets 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/app/views/admin/shared/_flickr.html.erb

@@ -1,13 +1,12 @@
 
 <div id="flickr-select">
-  <% form_remote_tag( :url => admin_flickrs_path ) do -%>
+  <% form_remote_tag( :method => :get, :url => admin_flickrs_path, :before => "flickr_before_handler()", :success => "flickr_display_images(request);" ) do -%>
   <p><label for="tags">Search by tag:</label>
-  <%= text_field_tag :tags, params[:tags] %> &nbsp; <%= submit_tag "go" %></p>
+  <%= text_field_tag :tags, params[:tags] %> &nbsp; <%= submit_tag "go" %> <span id="flickr_loading">Loading Flickr images</span></p>
   
   <% end -%>
   
   <div id="flickr-image-container">
-    <p>Loading Flickr images</p>
     <% #= render :partial => 'admin/shared/flickr_image.html.erb', :collection => flickr_images -%>
   </div>
 

data/generators/assets_admin_files/templates/public/javascripts/admin/assets.js

@@ -391,16 +391,22 @@ var Renameable = Class.create(Holdable, {
   } 
 });
 
-var load_flickr_select = function(){
-  new Ajax.Updater('flickr-image-container', '/flickrs/', {
-    parameters: { format: 'html', authenticity_token: AJ.authenticity_token() },
-    onSuccess: swap_flickr_image_src
-});
+var flickr_comms_ref = false;
+var flickr_before_handler = function(){
+  if(false != flickr_comms_ref)
+    flickr_comms_ref;
+  $('flickr_loading').show();
+}; 
+var flickr_display_images = function(response){
+  $('flickr_loading').hide();
+  $('flickr-image-container').update(response.responseText)
 }
-var load_flickr_select = function(){
-  new Ajax.Updater('flickr-image-container', '/admin/flickrs', {
+var flickr_load_select = function(){
+  flickr_before_handler();
+  flickr_comms_ref = new Ajax.Request('/admin/flickrs', {
     method: 'get',
-    parameters: { format: 'html', authenticity_token: AJ.authenticity_token() }
+    parameters: { format: 'html', authenticity_token: AJ.authenticity_token() },
+    onSuccess: flickr_display_images
 });
 }
-document.observe('dom:loaded', load_flickr_select);
+document.observe('dom:loaded', flickr_load_select);

data/has_assets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_assets}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-09-22}
+  s.date = %q{2009-09-24}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-has_assets
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-22 00:00:00 -07:00
+date: 2009-09-24 00:00:00 -07:00
 default_executable: 
 dependencies: []