lalala 4.0.0.dev.133 → 4.0.0.dev.134

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6329301663edfc88e1b14baea18850d1796b06ac
-  data.tar.gz: 2d6c046c1452ae601c8a0a4eb1c6f4237c53ada2
+  metadata.gz: 4ff12f23f11e3f4a30243125978c3afed923dcfb
+  data.tar.gz: 32268b08b966ad0084f3c64daa9186106cb285d7
 SHA512:
-  metadata.gz: f6e326d7b28ec3dfe25e908dd9539abe3ac2a4e85b31ad907720fd665df84bd361692168eda21c053e8d66591d9871f5f235faaede5949febd88bedc3e294463
-  data.tar.gz: b952b456028c79d336d6a0f475dbe81d97c8463025a978615b8c04bb0afd7f65499b3c3ec1ddcd5c1c39a4cfe54d1787e2e8d053bc212fbaa47a0eedded32905
+  metadata.gz: 01a1a6daa3a96804b2ad33fa4a7a7fe986db1af15b196c4b990e1e8cdc9c0c0d4877a6d43ee8bc37a0c7851d567923877bfab89f5c996643116bb73240046456
+  data.tar.gz: f0b36b20bfb665ae6087a5a66795ddadb0c3c5b15beb796df5dce3f8dc0f3e0ede1864c014d58833d125e05a0add4982e91a502cbf629426d8565a1b2f6912e3

data/app/assets/javascripts/lalala/modules/grid.module.js

@@ -15,7 +15,7 @@ Grid = (function() {
 
 
   function G(grid_element) {
-    this.selected_images = [];
+    this.selected_assets = [];
 
     this.transform_html(grid_element);
     this.bind_mouse_events();
@@ -24,25 +24,20 @@ Grid = (function() {
 
 
   G.prototype.transform_html = function(grid_element) {
-    var fragment, el, el_images, el_input, data_attr, $grid, $original_list;
+    var fragment, el, el_assets, el_actions, el_errors, $grid, $original_list;
 
     // elements
     $grid = $(grid_element);
     $original_list = $grid.children("ul:first-child");
 
-    // data -> attributes
-    data_attr = "data-accessible-attributes";
-    data_attr = $original_list.attr(data_attr)
-    data_attr = data_attr ? data_attr.split(",") : [];
-
-    // document fragment for the images
+    // document fragment for the assets
     fragment = document.createDocumentFragment();
 
-    // transform images html
+    // transform assets html
     $grid.find("li.asset").not(":last-child").each(function() {
       var grid_piece = document.createElement("li");
       grid_piece.className = "asset";
-      grid_piece.innerHTML = this.innerHTML.replace("<a", "<a class=\"image\"");
+      grid_piece.innerHTML = this.innerHTML.replace("<a", "<a class=\"thumbnail\"");
       var overlay = document.createElement("div");
       overlay.className = "overlay";
       grid_piece.appendChild(overlay);
@@ -53,14 +48,14 @@ Grid = (function() {
     el = document.createElement("div");
     el.className = "mod-grid";
 
-    el_images = document.createElement("ul");
-    el_images.className = "images";
-    el_images.appendChild(fragment);
+    el_assets = document.createElement("ul");
+    el_assets.className = "assets";
+    el_assets.appendChild(fragment);
 
     el_actions = document.createElement("div");
     el_actions.className = "actions";
     el_actions.innerHTML = "" +
-      $grid.find("li:last-child").html() +
+      $grid.find("li.actions").html() +
       '<a class="button" rel="choose-files">Choose files</a>' +
       '<div class="files-description"></div>' +
       '<a class="button unavailable" rel="edit">Edit selected</a>' +
@@ -68,7 +63,15 @@ Grid = (function() {
 
     // merge
     el.appendChild(el_actions);
-    el.appendChild(el_images);
+    el.appendChild(el_assets);
+
+    // errors
+    if ($grid.find("li.errors").length) {
+      el_errors = document.createElement("div");
+      el_errors.className = "errors";
+      el_errors.innerHTML = $grid.find("li.errors").html();
+      el.appendChild(el_errors);
+    }
 
     // replace original with new
     $original_list.replaceWith(el);
@@ -87,7 +90,7 @@ Grid = (function() {
     this.$el.children(".actions").find('[rel="edit"], [rel="destroy"]').each(function() {
       var $btn = $(this);
 
-      if (grid.selected_images.length === 0) {
+      if (grid.selected_assets.length === 0) {
         $btn.addClass("unavailable");
       } else {
         $btn.removeClass("unavailable");
@@ -100,11 +103,11 @@ Grid = (function() {
   //  Events
   //
   G.prototype.bind_mouse_events = function() {
-    this.$el.children(".images")
+    this.$el.children(".assets")
       .on("mouseleave", "li", this.row_mouseleave)
       .on("mouseleave", "li label", this.row_label_mouseleave)
       .on("mouseenter", "li label", this.row_label_mouseenter)
-      .on("mouseenter", "li .image", this.row_image_mouseenter)
+      .on("mouseenter", "li .thumbnail", this.row_thumbnail_mouseenter)
       .on("click", "li a", function(e) { e.preventDefault(); })
       .on("click", "li .attributes .close-button", this.close_button_click);
 
@@ -127,7 +130,7 @@ Grid = (function() {
     $(this).parent().addClass("properties").removeClass("move");
   };
 
-  G.prototype.row_image_mouseenter = function(e) {
+  G.prototype.row_thumbnail_mouseenter = function(e) {
     var $p = $(this).parent();
     if ($p.hasClass("edit-block")) return;
     $p.addClass("properties");
@@ -149,19 +152,19 @@ Grid = (function() {
   };
 
   G.prototype.edit_or_destroy_selected_button_click = function(e) {
-    var i = 0, j = this.selected_images.length,
+    var i = 0, j = this.selected_assets.length,
         $e = $(e.currentTarget), action = $e.attr("rel");
 
     if ($e.hasClass("unavailable")) return;
 
     for (; i<j; ++i) {
-      var id = this.selected_images[i];
+      var id = this.selected_assets[i];
       var $row = $("#" + id).parent();
       $row.removeClass("selected");
       this["set_to_" + action]($row[0]);
     }
 
-    this.selected_images.length = 0;
+    this.selected_assets.length = 0;
     this.check_edit_and_destroy_buttons();
   };
 
@@ -190,16 +193,16 @@ Grid = (function() {
         $(ui.unselecting).removeClass("selected");
       },
       stop: function(e, ui) {
-        var new_selected_images = [];
-        grid.$el.find(".images > li").each(function() {
+        var new_selected_assets = [];
+        grid.$el.find(".assets > li").each(function() {
           var $t = $(this), id;
           if ($t.hasClass("selected")) {
             id = $t.children('input[type="hidden"]:first').attr("id");
-            new_selected_images.push(id + "");
+            new_selected_assets.push(id + "");
             id = null;
           }
         });
-        grid.selected_images = new_selected_images;
+        grid.selected_assets = new_selected_assets;
         grid.check_edit_and_destroy_buttons();
       }
     });
@@ -226,7 +229,7 @@ Grid = (function() {
 
   G.prototype.set_to_not_edit = function(row) {
     $(row).removeClass("edit-block");
-  }
+  };
 
 
 

data/app/assets/stylesheets/lalala/modules/_grid.css.scss

@@ -11,12 +11,12 @@
 
   @include border-radius(5px);
 
-  .images,
+  .assets,
   .actions {
     overflow: hidden;
   }
 
-  .images {
+  .assets {
     padding-top: 10px - 3px;
   }
 
@@ -26,7 +26,7 @@
     margin: 0 11px 11px 0;
     position: relative;
 
-    &, .image, .overlay {
+    &, .thumbnail, .overlay {
       height: 100px;
       width: 100px;
     }
@@ -50,15 +50,15 @@
   .asset.will-destroy .overlay,
   .asset.selected.will-destroy .overlay { background: rgba($red, .5); }
 
-  // image + overlay
-  .asset .image,
+  // thumbnail + overlay
+  .asset .thumbnail,
   .asset .overlay {
     left: 0;
     position: absolute;
     top: 0;
   }
 
-  .asset .image {
+  .asset .thumbnail {
     z-index: 0;
   }
 

data/app/models/lalala/abstract_asset.rb

@@ -13,7 +13,7 @@ class Lalala::AbstractAsset < ActiveRecord::Base
 
   def self.extension_white_list
     list = if self.uploaders and self.uploaders[:asset]
-      self.uploaders[:asset].new.extension_white_list
+      self.uploaders[:asset].new.try(:extension_white_list)
     end
 
     list = list || []

data/lib/formtastic/inputs/grid_input.rb

@@ -55,7 +55,7 @@ class Formtastic::Inputs::GridInput
         end
       end
 
-      html += template.content_tag :li do
+      html += template.content_tag :li, class: "actions" do
         builder.fields_for(method, assets.build) do |f|
           f.file_field :asset, multiple: true, accept: asset_model_class.extension_white_list
         end

data/lib/lalala/ext_rack/multiple_file_upload_support.rb

@@ -30,8 +30,10 @@ class Lalala::ExtRack::MultipleFileUploadSupport
       return unless Array === assets
 
       assets.each do |file|
-        params[last_id] = { "asset" => file }.with_indifferent_access
-        last_id.succ!
+        if file.present?
+          params[last_id] = { "asset" => file }.with_indifferent_access
+          last_id.succ!
+        end
       end
 
     else

data/lib/lalala/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.133
+  version: 4.0.0.dev.134
 platform: ruby
 authors:
 - Simon Menke