lalala 4.1.0.dev.356 → 4.1.0.dev.358

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5dc5c7be7022b894342a8e47bce019f73b28b7d
-  data.tar.gz: a53b3f153cae2ce00620281926847322afe68369
+  metadata.gz: 9b2dedae2f70f1a01c5af634dc2d3b089d0d8066
+  data.tar.gz: be5e2c3e79c90a2eb31b31425e2c10109c904588
 SHA512:
-  metadata.gz: 9e0859cd6db3795674676be4030bc0268dde52665b44e36c79d01ad19b136e21e73bbcd8f651e7b1713546068d456d9f5e3ea6b8e587abec534cc15624853490
-  data.tar.gz: 4d364f1c841c1836d7c81734a075a8599f03d1b1020b48f53a6d850320f996005213e4791c3b949f54cd4e774f3c82fbaa7e6d9cfde1333495e6482383d8da7e
+  metadata.gz: fbe8bbbe66ce8f78dc223495368e28e517bd453efa11482153b6adfbbe7c38d5cee643389106add897561db37e49c7424234f32c436187cb334b47417b3db56f
+  data.tar.gz: 80182d09b7ec601c5ac803d58a636ed4fb5de4f7a9b9ab4477dfbd5a64fed81202cd4b24a3615a8f0efadfb7c858b85f9164cbfba9bf371ab17c72535628ef74

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

@@ -89,10 +89,9 @@ function load_cheatsheat(options) {
 function add_image_click_handler(e) {
   var ms, overlay;
 
-  ms = new MediaSelector();
-  ms.$markitup_container = $(e.currentTarget).closest(".markItUpContainer");
-  ms.set_elements();
-  ms.save_cursor_position();
+  ms = new MediaSelector(
+    $(e.currentTarget).closest(".markItUpContainer")
+  );
 
   overlay = Overlay.get_instance();
   overlay.append_content(ms.$el);

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

@@ -1,15 +1,20 @@
 var Overlay = require("./overlay");
 
 
-function MediaSelector() {
+function MediaSelector($markitup_container) {
+  this.$markitup_container = $markitup_container;
   this.$el = $('<div class="mod-media-selector" />');
+  this.set_elements();
 
   // settings
   this.settings = {
     selected_class: "selected",
-    selected_data: "SELF"
+    selected_data: "SELF",
+    editor: {}
   };
 
+  this.gather_editor_settings();
+
   // data
   this.selected_ids = [];
   this.last_rendered_data = [];
@@ -17,6 +22,7 @@ function MediaSelector() {
   // exec
   this.collect_data_and_render();
   this.bind_events();
+  this.save_cursor_position();
 }
 
 
@@ -25,6 +31,25 @@ MediaSelector.prototype.set_elements = function() {
 };
 
 
+MediaSelector.prototype.gather_editor_settings = function() {
+  var attr = this.$textarea.get(0).attributes;
+  attr = Array.prototype.slice.call(attr, 0);
+
+  for (var i=0, j=attr.length; i<j; ++i) {
+    var name = attr[i].name;
+    var value = attr[i].value;
+
+    if (name.match(/^editor\-/)) {
+      name = name.replace(/^editor\-/, "").replace(/\-/g, "_");
+      value = (value && value.toString().length > 0 ? value : true);
+      value = (value === "1" ? true : (value === "0" ? false : value));
+
+      this.settings.editor[name] = value;
+    }
+  }
+};
+
+
 
 //
 //  Data & Render
@@ -47,7 +72,9 @@ MediaSelector.prototype.collect_data_and_render = function() {
   this.render(data);
 
   // versions
-  this.setup_version_option();
+  if (!this.settings.editor.disable_versions_option) {
+    this.setup_version_option();
+  }
 };
 
 
@@ -193,14 +220,16 @@ MediaSelector.prototype.unselect_asset = function($asset) {
 
 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 version = this.$el.find(".options .version select option:selected").val();
   var markdown = "";
 
   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 + ")";
+    markdown = markdown + "![](asset://" + selected[i];
+    if (version) markdown = markdown + "/" + version;
+    markdown = markdown + ")";
   }
 
   // add to textarea

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

@@ -0,0 +1,28 @@
+class Lalala::Markdown::Handlers::LazyAsset < Lalala::Markdown::Handlers::Base
+
+  def initialize(options={})
+    @options = options
+  end
+
+  def image(url, alt=nil, title=nil)
+    unless %r|^asset[:]//(.+)$| === url
+      return ""
+    end
+
+    id_with_version = $1.split("/")
+    id = id_with_version[0]
+    version = id_with_version[1] || "original"
+
+    # build url
+    url = "//" + File.join(
+      "c." + Haraway.configuration.endpoint,
+      id,
+      version.to_s)
+
+    # build img element
+    <<-EOS
+      <img class="js-lazy" data-src="#{url}" alt="#{alt}" title="#{title}" />
+    EOS
+  end
+
+end

data/lib/lalala/markdown/input_helper.rb

@@ -2,10 +2,18 @@ module Lalala::Markdown::InputHelper
   extend ActiveSupport::Concern
 
   def input(method, options = {})
+    if @object.respond_to?("#{method}_html")
+      options = options.dup.clone
 
-    if ( @object.respond_to?("#{method}_html") )
       input_html = options[:input_html] || {}
       input_html[:class] = [input_html[:class], 'markdown'].flatten.compact.join(" ")
+
+      editor_options = options[:editor_options] || {}
+      editor_options.each do |k, v|
+        v = if v === true then "1" elsif v === false then "0" end
+        input_html["editor-#{k.to_s.gsub("_", "-")}"] = v
+      end
+
       options[:input_html] = input_html
     end
 

data/lib/lalala/markdown.rb

@@ -9,6 +9,7 @@ class Lalala::Markdown
   module Handlers
     require 'lalala/markdown/handlers/base'
     require 'lalala/markdown/handlers/asset'
+    require 'lalala/markdown/handlers/lazy_asset'
     require 'lalala/markdown/handlers/vimeo'
     require 'lalala/markdown/handlers/youtube'
   end

data/lib/lalala/version.rb

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

data/test/dummy/app/admin/articles.rb

@@ -10,10 +10,14 @@ ActiveAdmin.register Article do
   form do |f|
     f.inputs do
       f.input :title
-      f.input :body
+
+      f.input :body, editor_options: {
+        disable_versions_option: true
+      }
+
       f.input :tags
       f.input :category, as: :select, collection: %w(A B C)
-	  f.input :url, input_html: { placeholder: 'http://', class: 'js-prepend-placeholder' }
+      f.input :url, input_html: { placeholder: 'http://', class: 'js-prepend-placeholder' }
       f.input :price, input_html: { placeholder: '€', class: 'js-append-placeholder' }
       f.input :poster_image, as: :single_file
 

data/test/dummy/app/models/article.rb

@@ -4,9 +4,6 @@ class Article < ActiveRecord::Base
   # Translations
   translates :title, :body
 
-  # Markdown
-  markdown :body
-
   # Assets
   has_one_asset :poster_image, "images"
   has_many_assets :images, "images"

data/test/dummy/db/schema.rb

@@ -60,10 +60,10 @@ ActiveRecord::Schema.define(:version => 20140926152646) do
   add_index "article_translations", ["locale"], :name => "index_article_translations_on_locale"
 
   create_table "articles", :force => true do |t|
+    t.text     "haraway_metadata"
     t.datetime "created_at",       :null => false
     t.datetime "updated_at",       :null => false
     t.string   "category"
-    t.text     "haraway_metadata"
     t.string   "url"
     t.string   "price"
   end
@@ -75,25 +75,6 @@ ActiveRecord::Schema.define(:version => 20140926152646) 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.356
+  version: 4.1.0.dev.358
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -1453,6 +1453,7 @@ files:
 - lib/lalala/markdown/active_model.rb
 - lib/lalala/markdown/handlers/asset.rb
 - lib/lalala/markdown/handlers/base.rb
+- lib/lalala/markdown/handlers/lazy_asset.rb
 - lib/lalala/markdown/handlers/vimeo.rb
 - lib/lalala/markdown/handlers/youtube.rb
 - lib/lalala/markdown/html_renderer.rb