lalala 4.1.0.dev.390 → 4.1.0.dev.391

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfdb52b5dc9c54660630ef7bdd70e511bbecb2de
-  data.tar.gz: 747f630687e09134e7ecdf357b97a24a029839fe
+  metadata.gz: 06124eebfc551071567f66a7e3107be4de300b3b
+  data.tar.gz: 155dd70459f66d797294c4110193bb28c80c8a70
 SHA512:
-  metadata.gz: b5b418eb403c559caf3a0988db3dae010f50b6c50d79567713c53edbcaff41e6aaf0ae4b6e4d3d07f196ee3ae859dcc02fb877bd124ed484f2dca4c8b9e08a90
-  data.tar.gz: 178d30c7bc1619a47e227c07b5339d87d83231f9fbdb6d1087a0acf51a248c0440f8c90122ecbbee0a8acb2f56b41dd9eaeda24e6aec5d8e99b631d118540059
+  metadata.gz: 8269bdf38ddc846460f4671c31e4f1ae73a773bee454640c7d191010b9be6aba4a4874dfbb501e4f4e34d5edbaafb7ad363e6bdc2d69a1ce5ffe94befe9579c4
+  data.tar.gz: c26bcb8306e83d32cfe7ad74c43c92871785f76ab1ee3e4a4bc8591167cdad45e96b4cb2765fe451e57156fd80972621444a13bb6b6e825e7dd30d50231e5f42

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

@@ -93,6 +93,7 @@ MediaSelector.prototype.collect_data_from_self = function() {
       var $xfile = $(this);
 
       data.push({
+        file_name: $xfile.find("[name$=\"[file_name]\"]").attr("value"),
         id: $xfile.find("[name$=\"[id]\"]").attr("value"),
         thumb_url: $xfile.attr("data-src-original").replace(/original$/, "thumb"),
         versions: versions
@@ -227,7 +228,18 @@ MediaSelector.prototype.add_selected_to_editor_textarea = function() {
 
   // build markdown text
   for (var i=0, j=selected.length; i<j; ++i) {
-    markdown = markdown + "![](asset://" + selected[i];
+    var file_name = null;
+
+    $.each(this.last_rendered_data, function(idx, value){
+      if ( value.id == selected[i]) {
+        file_name = value.file_name;
+      }
+    });
+
+    file_name;
+
+    markdown = markdown + "![" + file_name + "](asset://" + selected[i];
+
     if (version) markdown = markdown + "/" + version;
     markdown = markdown + ")";
   }

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.1.0"
-  BUILD   = "390"
+  BUILD   = "391"
 
   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.390
+  version: 4.1.0.dev.391
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin