lalala 4.1.0.dev.321 → 4.1.0.dev.322

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17fba412c58ddb97da16b7d6541b1b4de54a365f
-  data.tar.gz: 8cb2f6ce0d6b3d5c8c250f15b722311010f4d474
+  metadata.gz: ec7fac739486a98458afa0231c3d4cae6b1cdce2
+  data.tar.gz: 9827f80097cf0d9c94e3e8ebf533d4ec769e7ce3
 SHA512:
-  metadata.gz: 24a948109da1c80c239879906c5649c559e5ac4d262786cd8d85b1185f137598822ac1f4ad8ea56cd5b8e4c13bd36361fa3e364776e07d6c47a18c76f3f842f4
-  data.tar.gz: cc115a72b4df85bd11c55910d01bb538835b0cb468489785b4b9e15dd1c5755f4d66f0bbfff320b6fe2ef641eb0d661b207681883f33af70ea922e76b176a050
+  metadata.gz: c4c889f6b37ca982eb6921baf44f409ef2b2ca028a82afa78a25ad5fb8e2483f3b07dc7e8fe3e28dc200ce3ee28f6048e5751e5eb711fb313c27b28541812aab
+  data.tar.gz: bdbc26d54a8d7323bc8d01de1dd512a9e7d1e928cfc8bb54c5c5cca30be89023ae5be059a498a09af5ba5f19fa311c95dba5ada5c8b7cd911cef09632a090043

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

@@ -91,6 +91,8 @@ function add_image_click_handler(e) {
 
   ms = new MediaSelector();
   ms.$markitup_container = $(e.currentTarget).closest(".markItUpContainer");
+  ms.set_elements();
+  ms.save_cursor_position();
 
   overlay = Overlay.get_instance();
   overlay.append_content(ms.$el);

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

@@ -20,6 +20,11 @@ function MediaSelector() {
 }
 
 
+MediaSelector.prototype.set_elements = function() {
+  this.$textarea = this.$markitup_container.find("textarea");
+};
+
+
 
 //
 //  Data & Render
@@ -190,30 +195,77 @@ MediaSelector.prototype.add_selected_to_editor_textarea = function() {
   var selected = this.selected_ids;
   var version = this.$el.find(".options .version select option:selected").val() || "original";
   var markdown = "";
-  var $textarea;
+
+  var old_textarea_text, new_textarea_text;
 
   // build markdown text
   for (var i=0, j=selected.length; i<j; ++i) {
-    markdown = markdown + "![](asset://" + selected[i] + "/" + version + ")  \n";
+    markdown = markdown + "![](asset://" + selected[i] + "/" + version + ")";
   }
 
   // add to textarea
-  // TODO: save cursor position before opening overlay,
-  //       then apply it again here
-  $textarea = this.$markitup_container.find("textarea");
-  $textarea.val($textarea.val() + markdown);
+  old_textarea_text = this.$textarea.val();
+
+  new_textarea_text =
+    old_textarea_text.substring(0, this.textarea_cursor_position) +
+    markdown +
+    old_textarea_text.substr(this.textarea_cursor_position);
+
+  this.$textarea.val(new_textarea_text);
 
   // hide overlay
   Overlay.get_instance().hide();
 };
 
 
+MediaSelector.prototype.save_cursor_position = function() {
+  var textarea, position, selection_range, text_range, text_range_duplicate;
+
+  // elements
+  textarea = this.$textarea.get(0);
+
+  // find position
+  if (textarea.selectionStart != null) {
+    position = textarea.selectionStart;
+
+  } else if (document.selection) {
+    selection_range = document.selection.createRange();
+
+    if (selection_range == null) {
+      position = false;
+
+    } else {
+      text_range = textarea.createTextRange();
+      text_range_duplicate = text_range.duplicate();
+
+      text_range.moveToBookmark(selection_range.getBookmark());
+      text_range_duplicate.setEndPoint("EndToStart", text_range);
+      position = text_range_duplicate.text.length;
+
+    }
+
+  } else {
+    position = false;
+
+  }
+
+  // if no position found
+  if (position === false || position == null) {
+    position = this.$textarea.val().length;
+  }
+
+  // set
+  this.textarea_cursor_position = position;
+};
+
+
 
 //
 //  Options
 //
 MediaSelector.prototype.setup_version_option = function() {
   var versions = [];
+  var excludes = [];
   var select_element;
 
   // collect all versions
@@ -222,15 +274,18 @@ MediaSelector.prototype.setup_version_option = function() {
 
     for (var k=0, l=data_piece.versions.length; k<l; ++k) {
       var version = data_piece.versions[k];
-      if (versions.indexOf(version) === -1) {
-        versions.push(version)
+      if (excludes.indexOf(version) == -1 && versions.indexOf(version) === -1) {
+        versions.push(version);
       }
     }
   }
 
+  // sort versions
+  versions = versions.sort();
+
   // make option element
   select_element = document.createElement("select");
-  select_element.innerHTML = $.map(["original"].concat(versions), function(v) {
+  select_element.innerHTML = $.map(versions, function(v) {
     return "<option value=\"" + v + "\">" + v + "</option>";
   }).join("");
 

data/lib/lalala/markdown/handlers/asset.rb

@@ -13,12 +13,18 @@ class Lalala::Markdown::Handlers::Asset < Lalala::Markdown::Handlers::Base
     id = id_with_version[0]
     version = id_with_version[1] || "original"
 
+    # build url
     url = "//" + File.join(
       "c." + Haraway.configuration.endpoint,
       id,
       version.to_s)
 
-    "<img src=\"#{url}\" alt=\"#{alt}\" title=\"#{title}\" />"
+    # build img element
+    helpers.image_tag(
+      url,
+      alt: alt,
+      title: title
+    )
   end
 
 end

data/lib/lalala/markdown/html_renderer.rb

@@ -62,6 +62,10 @@ class Lalala::Markdown::HtmlRenderer < Redcarpet::Render::HTML
       return ""
     end
 
+    if content =~ /^\<(img|div|span|strong|em)/
+      content = helpers.raw(content)
+    end
+
     options = (@options[:link_attributes] || {}).merge(title: title)
     helpers.link_to(content, link, options)
   end

data/lib/lalala/markdown/markdown_renderer.rb

@@ -208,7 +208,7 @@ class Lalala::Markdown::MarkdownRenderer < Redcarpet::Render::Base
     if title.blank?
       "![#{alt_text}](#{link})"
     else
-      "![#{alt_text}](#{link} #{title})"
+      "![#{alt_text}](#{link} \"#{title}\")"
     end
   end
 
@@ -220,7 +220,7 @@ class Lalala::Markdown::MarkdownRenderer < Redcarpet::Render::Base
     if title.blank?
       "[#{content}](#{link})"
     else
-      "[#{content}](#{link} #{title})"
+      "[#{content}](#{link} \"#{title}\")"
     end
   end
 

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.1.0"
-  BUILD   = "321"
+  BUILD   = "322"
 
   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.321
+  version: 4.1.0.dev.322
 platform: ruby
 authors:
 - Simon Menke