active_admin_multi_upload 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c270bdc9e6a211d4726f836ee13213c70edd984
-  data.tar.gz: 94d9e3f22817f207d754c12ec81e84423030d7a1
+  metadata.gz: 2705d3c1976665c606d2318617cf293bb9ab43ec
+  data.tar.gz: 070c14ecc0866e8651dbd6a8bb9438bef15e8342
 SHA512:
-  metadata.gz: dcbdb10871c9b7551e5d6a2ad4e0a9d90c809ccabc389dff0c28f33669b3f316a80205e4e03743a4709f1113c3b88ff2ec64142506ebc16f2d6bb9d5a6fcf904
-  data.tar.gz: 85ccb5f853cf2690be903fcfcdebf38921969ea5f12c5d9e570ac45a24cdab3e6bfb9a338b0932612da405f439297f2de809ef11eaeb0efe8800491d4d999975
+  metadata.gz: 5bcad87082cd4c62639c069c72ae60cb4dad7d9ce46da4f104935f51b582fb30dc3b9eef70c5297fc5bcc0b4db1482c67fbfab727a27848be54d74b179e687ac
+  data.tar.gz: ab1c8ccf568ba5db1ae9ebf00b295dff90f72e817c2524a9fb652aae965fa201aaf1614c91712d2c4455f43306b063796ebe2edc675548b61097d8713eb128b4

data/app/assets/stylesheets/active_admin_multi_upload/jquery_upload.scss

@@ -1096,7 +1096,7 @@ table th[class*="col-"] {
   opacity: 1;
 }
 
-#uploader {
+.uploader {
   margin: 10px 30px 10px 30px;
 }
 

data/app/views/active_admin_multi_upload/_upload_form.html.erb

@@ -7,10 +7,11 @@
     input_id_prefix = options[:input_id_prefix] ||= "#{resource.class.name.downcase}_#{association.singularize}_ids_"
     post_url = options[:post_url] ||= "/admin/#{association}/create_upload"
     input_name = options[:input_name] ||= "#{association.singularize}[#{attribute}]"
+    uploader_id = options[:uploader_name] ||= "#{association}_uploader"
 
  %>
 
-<div id="uploader">
+<div id="<%= uploader_id %>" class="uploader">
   <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
   <div class="row fileupload-buttonbar">
     <div class="span7">
@@ -18,7 +19,7 @@
       <span class="btn btn-success fileinput-button">
         <i class="icon-plus icon-white"></i>
         <span>Add files...</span>
-        <input id="fileupload" type="file" name="<%= input_name %>" multiple>
+        <input id="fileupload_<%= uploader_id %>" type="file" name="<%= input_name %>" multiple>
       </span>
       <button type="reset" class="btn btn-warning cancel">
         <i class="icon-ban-circle icon-white"></i>
@@ -35,7 +36,7 @@
   <div class="fileupload-process"></div>
   <br>
   <!-- The table listing the files available for upload/download -->
-  <table class="table table-striped"><tbody class="files" id="files-container" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
+  <table class="table table-striped"><tbody class="files" id="<%= uploader_id %>-files-container" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
 </div>
 
 
@@ -46,7 +47,7 @@
     acceptFileTypes: 'Filetype not allowed',
     maxNumberOfFiles: 'Max number of files exceeded',
     uploadedBytes: 'Uploaded bytes exceed file size',
-    emptyResult: 'Empty file upload result'
+    emptyResult: 'Something went wrong. Please try again'
 };
 </script>
 
@@ -116,31 +117,32 @@
 <script type="text/javascript" charset="utf-8">
   $(function () {
   // Initialize the jQuery File Upload widget:
-    $('#uploader').fileupload({
+    $("#<%= uploader_id %>").fileupload({
       url: "<%= post_url %>",
       autoUpload: true,
       formData: {},
       sequentialUploads: true,
-      fileInput: $("#fileupload"),
-      filesContainer: "#files-container"
+      fileInput: $("#fileupload_<%= uploader_id %>"),
+      filesContainer: "#<%= uploader_id %>-files-container"
     }).on('fileuploadcompleted', function(e, data) {
-      insertUploadInputs(data.result.files);
+      insertUploadInputsFor<%= association.capitalize %>(data.result.files);
     }).bind('fileuploaddestroy', function(e, data) {
-      removeUploadInputs([data]);
+      removeUploadInputsFor<%= association.capitalize %>([data]);
     });
   });
 </script>
 
 
 <script type="text/javascript">
-var insertUploadInputs = function(files) {
+
+var insertUploadInputsFor<%= association.capitalize %> = function(files) {
   $.each(files, function(index, file) {
       var input = $("<input type='hidden' class='file-upload' name='<%= uploaded_ids_form_input_name %>' id='<%= input_id_prefix %>" + file.id + "' value='" + file.id + "' />");
       input.insertAfter($("#upload_" + file.id));
   });
 };
 
-var removeUploadInputs = function(files) {
+var removeUploadInputsFor<%= association.capitalize %> = function(files) {
   $.each(files, function(index, file) {
     var id = file.url.split("/").pop();
     $("#<%= input_id_prefix %>" + id).remove();
@@ -149,10 +151,10 @@ var removeUploadInputs = function(files) {
 
 $(function () {
   var files = <%= existing_uploads.map(&:to_jq_upload).to_json.html_safe %>;
-  var uploader = $("#uploader").data("blueimpFileupload");
+  var uploader = $("#<%= uploader_id %>").data("blueimpFileupload");
   var template = uploader._renderDownload(files)['appendTo'](uploader.options.filesContainer);
   uploader._transition(template);
-  insertUploadInputs(files);
+  insertUploadInputsFor<%= association.capitalize %>(files);
 });
 
 </script>

data/lib/active_admin_multi_upload/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminMultiUpload
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_multi_upload
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Isaac Norman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails