lalala 4.0.0.dev.416 → 4.1.0.dev.299

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef72aab01de9989951e7e4d303f16a2911c8c44f
-  data.tar.gz: a7102ce474162384d712bd30c0598b8b02d3ec7e
+  metadata.gz: aff21ad204eeefac76dc2d8cc0228cf471e7a652
+  data.tar.gz: 7b71c86c78f8f818846c1a215377a6e33be9c033
 SHA512:
-  metadata.gz: 5adb784c82733c4548008d64e71547556ed9e6c1a9b2498baceae6c4a9accbd33479e4397becfe86dcb18f4445cb1bf1b6a9f85f316840c0297a4f3e03317dc2
-  data.tar.gz: a4ce47bd0aa3f5fb9448bb759197dd7f6e8c117471de10760c52664e8e3b758a1ee46641ab83d490e313288183643ba4bf1559e95ff64c15158d1635ca443091
+  metadata.gz: 2fd3c377829f45890a6e263e0138ca114ee6eaf58d902cbb1b5b3a3934ec119640a8c47d333e186b9997d7f36cb4bcaf002faf01168dfd259eb0ea3954e157e8
+  data.tar.gz: f8a5bd437f23d2de42367364659ba04b540d7da857acd17c9c44944d9d2f97e64eb6b618e680e2f852bca6c4f3b83bf674fb06c3142444516796e2dcce6a0c3e

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.1.7
+  - 2.0.0
 
 env:
   global:

data/Gemfile

@@ -1,10 +1,8 @@
 source 'https://rubygems.org'
 
-ruby "2.1.7"
+ruby "2.0.0"
 
 gemspec name: 'lalala'
 gemspec name: 'lalala-development', groups: [:development]
 gemspec name: 'lalala-assets',      groups: [:development, :assets]
 gemspec name: 'lalala-test',        groups: [:test]
-
-gem "active_admin-sortable_tree"

data/Haraway.md

@@ -0,0 +1,14 @@
+# Haraway
+
+## How to use
+
+1. Create initializer (config/initializers/haraway.rb)
+2. Add "haraway_metadata" column to the necessary tables (type = "text")
+3. In the model:  
+`has_many_assets :asset_association_name, :profile`
+`attr_accessible :asset_association_name`
+
+
+## To do
+
+- Include actual Haraway gem (not the local repo)

data/app/assets/javascripts/lalala/base.js

@@ -3,6 +3,14 @@
 
 //= require_tree ../browser
 //= require_tree ./modules
+//= require_tree ./initializers
 //= require_self
 
+var haraway = require("lalala/initializers/haraway");
+
+$(function() {
+  haraway.init();
+});
+
+// TODO - refactor
 require('lalala/modules/init');

data/app/assets/javascripts/lalala/initializers/chosen.module.js

@@ -0,0 +1,3 @@
+exports.init = function() {
+  $('select').not(".bypass-chosen").chosen();
+};

data/app/assets/javascripts/lalala/initializers/haraway.module.js

@@ -0,0 +1,8 @@
+var FileUploader = require("lalala/modules/file-uploader");
+
+
+exports.init = function() {
+  $("x-files").each(function() {
+    new FileUploader(this);
+  });
+};

data/app/assets/javascripts/lalala/lib/overlay.js

@@ -0,0 +1,335 @@
+/*
+
+    OVERLAY JS
+    v0.1.0
+
+*/
+
+(function($) {
+
+"use strict";
+
+var __bind = function(fn, me) {
+  return function() { return fn.apply(me, arguments); };
+};
+
+var default_template_function = function() {
+  return [
+    '<div class="overlay-outer-wrapper">',
+      '<div class="overlay-inner-wrapper">',
+        '<div class="overlay-content">',
+          '<div class="overlay-header">',
+            '<a href="#" class="close"></a>',
+          '</div>',
+        '</div>',
+      '</div>',
+    '</div>'
+  ].join('');
+};
+
+var default_background_template_function = function() {
+  return [
+    ''
+  ].join('');
+};
+
+
+//
+//  Default settings
+//
+Overlay.prototype.settings = {
+  class_name: "mod-overlay",
+  background_class_name: "mod-overlay-background",
+  content_class_name: "overlay-content",
+
+  is_shown_class: "visible",
+
+  template_function: default_template_function,
+  background_template_function: default_background_template_function
+};
+
+
+
+//
+//  Constructor
+//  -> and main setup
+//
+function Overlay(el, settings) {
+  //
+  // instance variables:
+  // el, $el, bg, $bg,
+  // $content, state
+
+  this.bind_some_methods_to_self();
+  this.set_initial_state_object();
+  this.set_initial_settings_object(settings);
+  this.create_new_or_use_element(el);
+  this.bind_events();
+}
+
+
+
+//
+//  Create new or use element
+//
+//  -> If an element is given, set that element as
+//     the main element and find the associated background element.
+//
+//     If not, make new elements and append them to the body element.
+//
+//     And also cache some other elements.
+//
+Overlay.prototype.create_new_or_use_element = function(element) {
+  var predefined = !!element;
+  var background;
+
+  // main element
+  if (!predefined) {
+    element = document.createElement("div");
+    element.className = this.settings.class_name;
+    element.innerHTML = this.settings.template_function();
+  }
+
+  this.el = element;
+  this.$el = $(this.el);
+
+  // background
+  if (!predefined) {
+    background = document.createElement("div");
+    background.className = this.settings.background_class_name;
+    background.innerHTML = this.settings.background_template_function();
+  } else {
+    background = this.$el.siblings("." + this.settings.background_class_name).get(0);
+  }
+
+  this.bg = background;
+  this.$bg = $(this.bg);
+
+  // add to dom if needed
+  if (!predefined) {
+    document.body.appendChild(element);
+    document.body.appendChild(background);
+  }
+
+  // cache other elements
+  this.cache_other_elements();
+};
+
+
+Overlay.prototype.cache_other_elements = function() {
+  this.$content = this.$el.find("." + this.settings.content_class_name);
+};
+
+
+
+//
+//  Show + callback
+//
+//  -> Shows the main element and background by
+//     setting 'display: block', then adds the
+//     is_shown class to those elements and then
+//     calls the callback on transitionend (if supported).
+//
+//     The reason for the setTimeout usage is that, for example.
+//     If you set the following at the same time,
+//     'display: block' and 'opacity: 1' along with
+//     a transition for opacity. Then the transition won't work,
+//     for reasons unknown.
+//
+Overlay.prototype.show = function(content_key) {
+  var that = this;
+
+  // content key
+  content_key = content_key || "default";
+
+  // show
+  setTimeout(function() {
+    that.$el.add(that.$bg).css("display", "block");
+  }, 0);
+
+  // main
+  setTimeout(function() {
+    that.$el.add(that.$bg)
+      .addClass(that.settings.is_shown_class)
+      .addClass(content_key);
+  }, 25);
+
+  // state
+  this.state.is_shown = true;
+  this.state.content_key = content_key;
+
+  // callback
+  if (this.state.transition_key) {
+    this.$el.on(this.state.transition_key, this.show_callback);
+  } else {
+    this.show_callback();
+  }
+};
+
+
+Overlay.prototype.show_callback = function() {
+  this.$el.off(this.state.transition_key, this.show_callback);
+
+  $(window).trigger("overlay.open." + this.state.content_key);
+};
+
+
+
+//
+//  Hide + callback
+//
+Overlay.prototype.hide = function() {
+  this.$el.add(this.$bg)
+    .removeClass(this.settings.is_shown_class)
+    .removeClass(this.state.content_key);
+
+  // state
+  this.state.content_key = false;
+  this.state.is_shown = false;
+
+  // callback
+  if (this.state.transition_key) {
+    this.$el.on(this.state.transition_key, this.hide_callback);
+  } else {
+    this.hide_callback();
+  }
+};
+
+
+Overlay.prototype.hide_callback = function() {
+  this.$el.off(this.state.transition_key, this.hide_callback);
+
+  this.$el.add(this.$bg).css("display", "none");
+  this.clear_content();
+
+  $(window).trigger("overlay.hide");
+};
+
+
+
+//
+//  Content
+//
+Overlay.prototype.append_content = function(x) {
+  this.$content.append(x);
+};
+
+
+Overlay.prototype.clear_content = function() {
+  this.el.innerHTML = this.settings.template_function();
+  this.cache_other_elements();
+};
+
+
+
+//
+//  Destroy self
+//
+Overlay.prototype.destroy = function() {
+  this.unbind_events();
+  this.$el.remove();
+  this.el = null;
+};
+
+
+
+//
+//  State
+//
+Overlay.prototype.set_initial_state_object = function() {
+  var fake_el, transitions, transition_key;
+
+  // state object
+  this.state = {
+    is_shown: false
+  };
+
+  // find correct transtionend key
+  fake_el = document.createElement("fake");
+
+  transitions = {
+    "transition" : "transitionend",
+    "WebkitTransition" : "webkitTransitionEnd",
+    "MozTransition" : "transitionend",
+    "msTransition" : "MSTransitionEnd",
+    "OTransition" : "otransitionend"
+  };
+
+  for (var t in transitions) {
+    if (fake_el.style[t] !== undefined) {
+      transition_key = transitions[t];
+      break;
+    }
+  }
+
+  this.state.transition_key = transition_key;
+};
+
+
+Overlay.prototype.set_initial_settings_object = function(settings) {
+  this.settings = $.extend({}, this.settings, settings || {});
+};
+
+
+
+//
+//  Events
+//
+Overlay.prototype.bind_events = function() {
+  // every element with class .close closes the overlay
+  this.$el.on("click.overlay", ".close", this.close_click_handler);
+
+  // close overlay when ESC key is pressed
+  $(document).on("keydown.overlay", this.document_keydown_handler);
+};
+
+
+Overlay.prototype.unbind_events = function() {
+  this.$el.off("click.overlay", ".close", this.close_click_handler);
+  $(document).off("keydown.overlay", this.document_keydown_handler);
+};
+
+
+Overlay.prototype.close_click_handler = function(e) {
+  e.preventDefault();
+
+  this.hide();
+};
+
+
+Overlay.prototype.document_keydown_handler = function(e) {
+  if (e.which == 27 && this.state.is_shown) {
+    this.hide();
+  }
+};
+
+
+
+//
+//  Utilities
+//
+Overlay.prototype.bind_some_methods_to_self = function() {
+  var methods = [
+    "show_callback", "hide_callback",
+    "close_click_handler", "document_keydown_handler"
+  ];
+
+  for (var i=0, j=methods.length; i<j; ++i) {
+    this.bind_to_self(methods[i]);
+  }
+};
+
+
+Overlay.prototype.bind_to_self = function(method_name) {
+  this[method_name] = __bind(this[method_name], this);
+};
+
+
+
+//
+//  Export
+//
+window.Overlay = Overlay;
+
+
+})(jQuery || Zepto);

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

@@ -71,58 +71,51 @@ CPT.prototype.addTriggers = function() {
 CPT.prototype.initStates = function() {
   var _this = this;
 
-  // Close all
-  this.$tree_parents.each(function() {
-    var $tree_parent = $(this),
-        $target      = $tree_parent.data('collapsible_target'),
-        $trigger     = $tree_parent.find('.collapse');
-
-    _this.update($target, $trigger, 'close', false);
-  });
-
-  // Open saved states
   $.each(this.states, function(idx, value) {
     var $tree_parent = $('#' + value),
         $target      = $tree_parent.data('collapsible_target'),
         $trigger     = $tree_parent.find('.collapse');
 
-    _this.update($target, $trigger, 'open', false);
+    _this.close($target, $trigger);
   });
 };
 
 
 /**
- * Update target state
+ * Close target
  *
- * @param  {jQuery object} $target    The element to be closed
- * @param  {jQuery object} $trigger   The trigger element
- * @param  {Boolean}       save_state Default TRUE
+ * @param  {jQuery object} $target  The element to be closed
+ * @param  {jQuery object} $trigger The trigger element
  */
-CPT.prototype.update = function($target, $trigger, state, save_state) {
+CPT.prototype.close = function($target, $trigger) {
   if ( !$target ) {
-    console.warn('Collapsible tree: Can not find tree target');
+    console.warn('Can not find tree target');
     return;
   }
 
-  save_state = (typeof save_state == 'undefined') ? true : save_state;
+  $target.hide();
+  $trigger.addClass('closed');
 
-  if ( state == 'close' ) {
-    $target.hide();
-    $trigger.addClass('closed');
+  this.saveState();
+};
 
-  } else if ( state == 'open') {
-    $target.show();
-    $trigger.removeClass('closed');
 
-  } else {
-    console.warn('Collapsible tree: Unknown state');
+/**
+ * Open target
+ *
+ * @param  {jQuery object} $target  The element to be closed
+ * @param  {jQuery object} $trigger The trigger element
+ */
+CPT.prototype.open = function($target, $trigger) {
+  if ( !$target ) {
+    console.warn('Can not find tree target');
     return;
-
   }
 
-  if ( save_state ) {
-    this.saveState();
-  }
+  $target.show();
+  $trigger.removeClass('closed');
+
+  this.saveState();
 };
 
 
@@ -136,10 +129,10 @@ CPT.prototype.toggleState = function(event) {
       $target  = $trigger.data('tree_parent').data('collapsible_target');
 
   if ( $target.is(':visible') ) {
-    this.update($target, $trigger, 'close');
+    this.close($target, $trigger);
 
   } else {
-    this.update($target, $trigger, 'open');
+    this.open($target, $trigger);
 
   }
 
@@ -158,7 +151,7 @@ CPT.prototype.saveState = function() {
     var $tree_parent = $(this),
         $trigger     = $tree_parent.find('.collapse');
 
-    if ( !$trigger.hasClass('closed') ) {
+    if ( $trigger.hasClass('closed') ) {
       new_states.push($tree_parent.attr('id'));
     }
 

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

@@ -1,9 +1,15 @@
-var markdown_settings;
+var Overlay = require("./overlay"),
+    MediaSelector = require("./media_selector"),
+
+    markdown_settings;
+
 
 exports.init = function(){
   $("textarea.markdown").each(setup);
 };
 
+
+
 function setup() {
   var $this    = $(this);
   var settings = $.extend({}, markdown_settings);
@@ -15,35 +21,30 @@ function setup() {
   $markitup_wrapper.find('.fullscreen').click(open_fullscreen);
   $markitup_wrapper.find('.close-fullscreen').click(close_fullscreen);
   $markitup_wrapper.find('.markdown-cheatsheet').click(toggle_cheatsheet);
-  $('body').on('click', '.markdown-cheatsheet-close', toggle_cheatsheet);
+  $markitup_wrapper.find('.add-image').click(add_image_click_handler);
 }
 
+
+
 //
-// Go fullscreen
+//  Fullscreen
 //
 function open_fullscreen(event) {
   var $markitup_wrapper = $(this).closest('.markItUp');
   $markitup_wrapper.find('.markItUpHeader .preview').trigger('mouseup');
   $markitup_wrapper.addClass('fullscreen');
-
-  $('body').on('keyup.MARKDOWN_FULLSCREEN', function (event) {
-    if (event.which === 27) {
-      close_fullscreen(event);
-    }
-  });
 }
 
-//
-// Close fullscreen
-//
+
 function close_fullscreen(event) {
-  var $markitup_wrapper = $('.close-fullscreen').closest('.markItUp');
+  var $markitup_wrapper = $(this).closest('.markItUp');
   $markitup_wrapper.removeClass('fullscreen');
-  $('body').off('keyup.MARKDOWN_FULLSCREEN');
 }
 
+
+
 //
-// Toggle Markdown cheatsheet
+//  Cheatsheet
 //
 function toggle_cheatsheet(event) {
   var $markdown_cheatsheet = $('#markdown-cheatsheet');
@@ -63,9 +64,7 @@ function toggle_cheatsheet(event) {
   }
 }
 
-//
-// Load Markdown syntax cheatsheet
-//
+
 function load_cheatsheat(options) {
   $.get('/lalala/markdown/cheatsheet', function(data) {
     var $div = $('<div id="markdown-cheatsheet" />');
@@ -82,8 +81,26 @@ function load_cheatsheat(options) {
   });
 }
 
+
+
+//
+//  Images
+//
+function add_image_click_handler(e) {
+  var ms, overlay;
+
+  ms = new MediaSelector();
+  ms.$markitup_container = $(e.currentTarget).closest(".markItUpContainer");
+
+  overlay = Overlay.get_instance();
+  overlay.append_content(ms.$el);
+  overlay.show("media-selector");
+}
+
+
+
 //
-// Mark It Up settings
+//  Mark It Up settings
 //
 var base_path = window.location.pathname.replace(/[\/][^\/]+$/, "");
 
@@ -101,13 +118,10 @@ markdown_settings = {
     { separator: '---' },
     { name: 'Unordered list', openWith: '- ', className: 'unordered-list', multiline: true },
     { name: 'Ordered list', openWith: '1. ', closeWith: '\n2. \n3. ', className: 'ordered-list', multiline: true },
-    /*
-| column header |\n| ------------- | ------------- |\n|               |               |
-    */
     { name: 'Add table', openWith: '| ', closeWith: ' | column header |\n| ------------- | ------------- |\n|               |               |', placeHolder: 'Column header', className: 'add-table', multiline: true },
     { separator: '---' },
     { name: 'Link', key: 'L', openWith: '[[![Link text]!]', closeWith: ']([![Url:!:http://]!])', className: 'add-link' },
-    //{ name: 'Image', openWith: '![[![Alternative text]!]]', closeWith: '([![Url:!:http://]!] "[![Image title]!]")', className: 'add-image' },
+    { name: 'Image', className: 'add-image' },
     { separator: '---' },
     { name: 'Preview', call: 'preview', className: "preview" },
     { name: 'Fullscreen', className: 'fullscreen' },