lalala 4.1.0.dev.332 → 4.1.0.dev.334

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 914b10207996a20d92630b7a7da989afa80f161d
-  data.tar.gz: 8f256b33d037b0d4be445fa5ee757a8d953a0bde
+  metadata.gz: 74279769851af8004dd6fedf36acaa579d91d2df
+  data.tar.gz: c0ef9e5365b42a1be0ede001787d3eac08afe117
 SHA512:
-  metadata.gz: 26e842d2024f2e7c3350ecd0bf8a8dddf6bdf977cc46a602039d2fa036440f16a4430233d5fc7e81e55438540820bfb8fca137ce6729187a01110de8505b5cef
-  data.tar.gz: 8fa8b9dc971ee0a45355d775ea9d878aedff6518b2dc49412fbdec8d6fb54560572c6641027a475a32ed80c1be2086b9f2087f2c444e76cfc6ba00c5ce3b1b78
+  metadata.gz: 2534b3139177a069653daff263b179ec75aa10879bbf2dc71ee75f9a13a20c529d7487cad5930d4e5f2191d4f250353afd929d1e8d4e45f26eea27155afe0b3f
+  data.tar.gz: 939333397107f59bfe80414011caf9de7f1cf85cf3f0ca445a0838a789c146100c1ce822d46c914049a6a677448c50a4a21fc71580f0b38caa62f3c5ca5428c2

data/app/assets/javascripts/lalala/modules/file-metadata.module.js

@@ -131,7 +131,7 @@ FileMetadata.prototype.get_form_template = function() {
   if (x.content) {
     $(wrapper).append( $(x.content.children).clone() );
   } else {
-    $(wrapper).append( $x.clone().unwrap() );
+    $(wrapper).append( $x.clone().html() );
   }
 
   return wrapper.innerHTML;
@@ -181,7 +181,7 @@ FileMetadata.prototype.copy_attributes_to_xfile = function() {
     new_attributes_container.className = "attributes";
     new_attributes_container.innerHTML = this.get_form_template();
 
-    this.$xfile.find("[name$=\"id]\"]").after(new_attributes_container);
+    this.$xfile.prepend(new_attributes_container);
     $xattr = $(new_attributes_container);
 
     this.fileuploader.remove_hidden_fields_from_checkboxes($xattr);

data/app/assets/javascripts/lalala/modules/multiple-files-uploader.module.js

@@ -37,7 +37,7 @@ MultipleFilesUploader.prototype.make_xfile_template = function() {
       $content = $(template.content.children);
       $wrapper.append($content);
     } else {
-      $content = $template.remove().unwrap();
+      $content = $.trim($template.html());
       $wrapper.append($content);
     }
 

data/app/assets/stylesheets/lalala/base/_base.css.scss

@@ -10,6 +10,10 @@ a {
   color: $blue;
 }
 
+template {
+  display: none;
+}
+
 .blank_slate {
   display: block;
   font-style: italic;

data/lib/formtastic/inputs/multiple_files_input.rb

@@ -137,7 +137,12 @@ class Formtastic::Inputs::MultipleFilesInput
     <x-file class="uploaded saved-to-db" data-src-original="#{ asset_url_original }">
       #{ thumb_html }
 
+      <div class="attributes">
+        #{ input.asset_attributes_form(template, param_key, asset) }
+      </div>
+
       #{ Formtastic::Inputs::MultipleFilesInput.menu_html }
+      #{ template.hidden_field_tag(param_key + "[][file_name]", asset.file_name) }
       #{ template.hidden_field_tag(param_key + "[][id]", asset.id) }
       #{ template.hidden_field_tag(param_key + "[][_destroy]", "") }
 
@@ -145,10 +150,6 @@ class Formtastic::Inputs::MultipleFilesInput
         #{ asset.file_name }
       </div>
 
-      <div class="attributes">
-        #{ input.asset_attributes_form(template, param_key, asset) }
-      </div>
-
       <div class="meta">
         <div class="row"></div>
       </div>

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.1.0"
-  BUILD   = "332"
+  BUILD   = "334"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

data/test/dummy/db/schema.rb

@@ -73,25 +73,6 @@ ActiveRecord::Schema.define(:version => 20140228141749) do
 
   add_index "articles_tags", ["article_id", "tag_id"], :name => "index_articles_tags_on_article_id_and_tag_id", :unique => true
 
-  create_table "asset_translations", :force => true do |t|
-    t.string  "locale"
-    t.integer "asset_id"
-    t.string  "title"
-    t.text    "caption"
-  end
-
-  create_table "assets", :force => true do |t|
-    t.string   "asset"
-    t.string   "type"
-    t.integer  "asset_owner_id"
-    t.string   "asset_owner_type"
-    t.string   "asset_owner_section"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
-  end
-
-  add_index "assets", ["asset_owner_id", "asset_owner_type", "asset_owner_section"], :name => "asset_owner_idx"
-
   create_table "page_hierarchies", :id => false, :force => true do |t|
     t.integer "ancestor_id",   :null => false
     t.integer "descendant_id", :null => false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.1.0.dev.332
+  version: 4.1.0.dev.334
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin