lalala 4.1.0.dev.375 → 4.1.0.dev.376

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1d34d1c361064e510944ffb7b0ce52d6d20f4f9
-  data.tar.gz: 03d51ab2417ca99c743db05d01b8ea13b323d6dc
+  metadata.gz: 1351443a1807b10240ff4f264546278d22b0750a
+  data.tar.gz: d6264b466e5901242b9f39044e23461bd02f102a
 SHA512:
-  metadata.gz: ccf21de93636159e713e0a068f0ade9004ee0d0b038e5b64a7519f67f0e01091517b98e0eb1bd5256bc61d07fe83c970e862e2cf281cb90fa286398fe149c20d
-  data.tar.gz: e09709e468e99776476ef304b59694c28e386e4d88e45bd27982d3608692d664301016cbdd230f06fc0e9072372b64190d691d215e1e0a65da401082a316149e
+  metadata.gz: d7797050e6ab03264d99d77af3bee5ce35344b9bda7b5b46a38b975d695295636e1ab7faa143552439a2550bf2fcf69145f087b696bcb9accae67ced68b5c48f
+  data.tar.gz: 6f68ec3a7fb2349da2feb021d4227ec86a8e0ab9be85ee7d1ac87834dda2a2c0731420b7e5b3b2749502dd76c2dfb47e2212f8c0a3dd1f30c5d329e1f12c70ce

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

@@ -99,6 +99,9 @@ SingleFileUploader.prototype.file_done_handler = function(e) {
   var name = this.$el.closest("x-files").attr("name");
   var pairs = format_asset_metadata(this.metadata, name);
 
+  // remove any old inputs
+  this.$el.find('input').remove();
+
   for (var i in pairs) {
     var input = document.createElement("input");
     input.type = "hidden";
@@ -110,6 +113,7 @@ SingleFileUploader.prototype.file_done_handler = function(e) {
   this.$el.removeClass("processing");
   this.$el.addClass("uploaded");
   this.$el.find(".content > .title > .name").html(this.metadata.file_name);
+  this.$el.find(".actions").show();
 };
 
 
@@ -118,9 +122,16 @@ SingleFileUploader.prototype.file_done_handler = function(e) {
 //  Events - General
 //
 SingleFileUploader.prototype.bind_events = function() {
+  // show the actions if there is file
+  if (this.$el.find('.content > .title > .name').text().trim().length > 0) {
+    this.$el.find(".actions").show();
+  }
+
   var choose_handler = $.proxy(this.choose_click_handler, this);
+  var delete_handler = $.proxy(this.delete_click_handler, this);
 
   this.$el.on("click", ".choose", choose_handler);
+  this.$el.on("click", "[data-action]", delete_handler);
 
   // when processing/uploading files -> disable form
   Haraway.on("busy", $.proxy(function() {
@@ -145,6 +156,21 @@ SingleFileUploader.prototype.choose_click_handler = function(e) {
   Haraway.choose(accept, false, profile, $.proxy(this.handle_file, this));
 };
 
+SingleFileUploader.prototype.delete_click_handler = function(e) {
+  e.preventDefault();
+
+  this.$el.find(".actions").hide();
+
+  this.$el.find('input').remove();
+
+  var name = this.$el.closest("x-files").attr("name");
+  var input = document.createElement("input");
+  input.type = "hidden";
+  input.name = name+"[_destroy]";
+  input.value = "1";
+  this.$el.append(input);
+}
+
 
 SingleFileUploader.prototype.defer_submit = function(e) {
   var $form = $(e.currentTarget);

data/app/assets/stylesheets/lalala/modules/_single-file-uploader.css.scss

@@ -176,9 +176,33 @@ x-files[single-file] {
   // actions
   .actions {
     border-left: 1px solid #E2E2E2;
+    float: right;
     display: none;
-    float: left;
     padding-left: 19px;
+
+    a {
+      background-position: center;
+      cursor: pointer;
+      display: inline-block;
+      height: 16px;
+      line-height: 24px;
+      margin: 12px 5px 0 0;
+      width: 16px;
+
+      -webkit-filter: grayscale(90%);
+
+      @include transition-duration(450ms);
+      @include transition-property(-webkit-filter);
+    }
+
+    a:hover,
+    a:active,
+    a:focus {
+      -webkit-filter: grayscale(0%);
+    }
+
+    [data-action="delete"] { @include icon("delete"); }
+    [data-action="meta"] { @include icon("information"); display: none; }
   }
 
 

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.1.0"
-  BUILD   = "375"
+  BUILD   = "376"
 
   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.1.0.dev.375
+  version: 4.1.0.dev.376
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin