locomotive-aloha-rails 0.23.2.1 → 0.23.2.2

data/vendor/assets/javascripts/aloha/lib/util/strings.js

@@ -105,10 +105,18 @@ define(['jquery'], function ($) {
 		return result;
 	}
 
+	/**
+	 * Returns true for the empty string, null and undefined.
+	 */
+	function empty(str) {
+		return "" === str || null == str;
+	}
+
 	return {
 		words: words,
 		dashesToCamelCase: dashesToCamelCase,
 		camelCaseToDashes: camelCaseToDashes,
-		splitIncl: splitIncl
+		splitIncl: splitIncl,
+		empty: empty
 	};
 });

data/vendor/assets/javascripts/aloha/plugins/common/align/nls/de/i18n.js

@@ -2,5 +2,8 @@ define({
 	"button.alignright.tooltip": "Rechtsbünding",
 	"button.alignleft.tooltip": "Linksbündig",
 	"button.aligncenter.tooltip": "Zentriert",
-	"button.alignjustify.tooltip": "Blocksatz"
+	"button.alignjustify.tooltip": "Blocksatz",
+	"button.aligntop.tooltip": "Oben aurichten",
+	"button.alignmiddle.tooltip": "Zentriert ausrichten",
+	"button.alignbottom.tooltip": "Unten ausrichten"
 });

data/vendor/assets/javascripts/aloha/plugins/common/block/lib/blockmanager.js

@@ -238,11 +238,8 @@ define([
 			// - IE7/8 Workaround
 			// - deletion of blocks inside block collection
 			jQuery(window.document).keydown(function (e) {
-
-				// Pressing DEL or BACKSPACE in a sidebar attribute editor form input
-				// causes the destruction of the block;
-				// if the keypress comes from a form element do nothing
-				if (typeof e.srcElement !== 'undefined' && typeof e.srcElement.form !== 'undefined') {
+				// Ignore events originating from the UI
+				if ($(e.target).closest('.aloha-ui').length > 0) {
 					return true;
 				}
 

data/vendor/assets/javascripts/aloha/plugins/common/characterpicker/css/characterpicker.css

@@ -22,13 +22,16 @@
 .aloha-character-picker-overlay td{
 	width: 1.2em;
 	height: 1.2em;
-	line-height: 1.2em;
-	font-size: 1em;
 	padding: 0.1em;
-	cursor: pointer;
 	border: 1px solid #afafaf;
 	background-color: #fff;
+
+	color: #000000;
+	line-height: 1.2em;
+	font-size: 1em;
 	text-align: center;
+	
+	cursor: pointer;
 }
 
 .aloha-character-picker-overlay td.focused {

data/vendor/assets/javascripts/aloha/plugins/common/characterpicker/lib/characterpicker-plugin.js

@@ -67,7 +67,7 @@ define([
 	var configs = {};
 
 	/**
-	 * Checks whether the character picker overlay.
+	 * Checks whether the character picker overlay is visible.
 	 *
 	 * @param {Overlay} overlay
 	 * @return {boolean} True if the overlay is visible.
@@ -88,12 +88,12 @@ define([
 		});
 
 		$('body').click(function ($event) {
-			// Because we click events on the overlay ui should not cause it to
+			// Because click events on the overlay ui should not cause it to
 			// hide itself.
 			if (!overlay._overlayActive
 					|| ($event.target === overlay.$element[0])
-					|| $(event.target).is('.aloha-icon-characterpicker')
-					|| $(event.target).find('.aloha-icon-characterpicker').length) {
+					|| $($event.target).is('.aloha-icon-characterpicker')
+					|| $($event.target).find('.aloha-icon-characterpicker').length) {
 				return;
 			}
 			overlay.hide();
@@ -119,12 +119,11 @@ define([
 	 *
 	 * @param {HTMLElement} source The element of which the style element is
 	 *                             taken.
-	 * @param {HTMLElement} target Where the style will be applied.
+	 * @param {jQuery.<HTMLElement>} target Where the style will be applied.
 	 * @param {string} styleProp The css property which shall be copied.
-	 * @return {jQuery.<HTMLElement>}
 	 */
-	function copyStyle(source, target, styleProp) {
-		// Move to strings.js
+	function copyStyle(source, $target, styleProp) {
+		// TODO: Move to strings.js
 		var camelize = function (str) {
 			return str.replace(/\-(\w)/g, function (str, letter) {
 				return letter.toUpperCase();
@@ -144,7 +143,9 @@ define([
 			style = source.style[camelize(styleProp)];
 		}
 
-		return style ? target.css(styleProp, style) : null;
+		if (style) {
+			$target.css(styleProp, style);
+		}
 	}
 
 	/**
@@ -252,24 +253,22 @@ define([
 	}
 
 	/**
-	 * @param {Overlay} overlay
+	 * Calculates the offset at which to position the overlay element.
+	 *
 	 * @param {jQuery.<HTMLElement>} $element A DOM element around which to
 	 *                                        calculate the offset.
 	 */
-	function calculateOffset(overlay, $element) {
+	function calculateOffset($element) {
 		var offset = $element.offset();
 		if ('fixed' === Floating.POSITION_STYLE) {
 			offset.top -= $WINDOW.scrollTop();
 			offset.left -= $WINDOW.scrollLeft();
 		}
-		return {
-			top: overlay.offset.top + (offset.top - overlay.offset.top),
-			left: overlay.offset.left + (offset.left - overlay.offset.left)
-		};
+		return offset;
 	}
 
 	/**
-	 * Insert the selected character, at the editor's selection.
+	 * Inserts the selected character, at the editor's selection.
 	 *
 	 * @param {String} character
 	 */
@@ -318,13 +317,9 @@ define([
 	}
 
 	Overlay.prototype = {
-		offset: {
-			top: 0,
-			left: 0
-		},
 
 		/**
-		 * Show the character overlay at the insert button's position.
+		 * Shows the character overlay at the insert button's position.
 		 *
 		 * @param {jQuery.<HTMLElement>} $insert Insert button.
 		 */
@@ -333,7 +328,7 @@ define([
 
 			// Because the overlay needs to be reposition relative its button.
 			overlay.$element
-			       .css(calculateOffset(overlay, $insert))
+			       .css(calculateOffset($insert))
 			       .css('position', Floating.POSITION_STYLE)
 			       .show()
 			       .find('.focused')
@@ -347,6 +342,9 @@ define([
 			overlay._overlayActive = true;
 		},
 
+		/**
+		 * Hides the character overlay.
+		 */
 		hide: function () {
 			this.$element.hide();
 			this._overlayActive = false;
@@ -354,7 +352,7 @@ define([
 	};
 
 	/**
-	 * Generate an character picker overlay for the given editable.
+	 * Generates an character picker overlay for the given editable.
 	 *
 	 * Because each editable may have its own configuration and therefore may
 	 * have its own overlay.
@@ -366,7 +364,7 @@ define([
 	 *                        character picker.
 	 */
 	function generateOverlay(characterpicker, editable) {
-		var config = characterpicker.getEditableConfig(editable);
+		var config = characterpicker.getEditableConfig(editable.obj);
 		if (!config) {
 			return null;
 		}
@@ -411,11 +409,11 @@ define([
 						rangeAtOpen = Aloha.Selection.rangeObject;
 
 						var from = rangeAtOpen.startContainer.parentNode;
-						var to = characterpicker.overlay.$element;
+						var $to = characterpicker.overlay.$element;
 
-						copyStyle(from, to, 'font-family');
-						copyStyle(from, to, 'font-weight');
-						copyStyle(from, to, 'font-style');
+						copyStyle(from, $to, 'font-family');
+						copyStyle(from, $to, 'font-weight');
+						copyStyle(from, $to, 'font-style');
 
 						characterpicker.overlay.show(this.element);
 					}
@@ -423,8 +421,8 @@ define([
 			});
 
 			/**
-			 * Pre-generate overlays to so that they will be ready when the
-			 * editor click on an editable.
+			 * Pre-generates overlays so that they will be ready when the editor
+			 * click on an editable.
 			 *
 			 * @param {number} editableIndex
 			 */
@@ -455,9 +453,8 @@ define([
 
 			PubSub.sub('aloha.floating.changed', function (message) {
 				if (characterpicker.overlay) {
-					characterpicker.overlay.offset = message.position.offset;
 					characterpicker.overlay.$element.css(
-						calculateOffset(characterpicker.overlay, button.element)
+						calculateOffset(button.element)
 					);
 				}
 			});

data/vendor/assets/javascripts/aloha/plugins/common/contenthandler/lib/blockelementcontenthandler.js

@@ -3,76 +3,58 @@
  * Author & Copyright (c) 2010-2013 Gentics Software GmbH
  * aloha-sales@gentics.com
  * Licensed unter the terms of http://www.aloha-editor.com/license.html
+ *
+ * @overview
+ * Prepares block-level elements in contents of editables that are initialized
+ * for editing ('initEditing'), or when exporting contents of editable for
+ * saving ('getContents').
  */
 define([
 	'jquery',
 	'aloha/core',
 	'aloha/contenthandlermanager',
 	'contenthandler/contenthandler-utils',
+	'util/functions',
 	'util/html'
 ], function (
 	$,
 	Aloha,
 	ContentHandlerManager,
 	Utils,
+	Functions,
 	Html
 ) {
 	'use strict';
 
-	var blocksSelector = Html.BLOCK_TAGNAMES.join();
-	var emptyBlocksSelector = Html.BLOCK_TAGNAMES.join(':empty,') + ':empty';
+	var blocksSelector = Html.BLOCKLEVEL_ELEMENTS.join();
+	var emptyBlocksSelector = Html.BLOCKLEVEL_ELEMENTS.join(':empty,')
+	                        + ':empty';
 	var NOT_ALOHA_BLOCK_FILTER = ':not(.aloha-block)';
 
-	/**
-	 * Determines if the given HTML element needs a trailing <br> tag in order
-	 * for it to be visible.
-	 *
-	 * @param {HTMLElement} block
-	 * @return {boolean}
-	 */
-	function needsEndBr(block) {
-		return (
-			Html.isBlock(block)
-			&&
-			(!block.lastChild ||
-				'br' !== block.lastChild.nodeName.toLowerCase())
-		);
-	}
-
-	/**
-	 * Finds a <br> tag that is at the end of the given container.
-	 * Invisible what spaces are ignored.
-	 *
-	 * @param {HTMLElement} container
-	 * @return {HTMLElement|null} A <br> tag at the end of the container; null
-	 *                            if none is found.
-	 */
-	function findEndBr(container) {
-		var node = container.lastChild;
-		while (node && Html.isIgnorableWhitespace(node)) {
-			node = node.previousSibling;
-		}
-		return ('br' === node.nodeName.toLowerCase()) ? node : null;
-	}
+	var isNotIgnorableWhitespace =
+			Functions.complement(Html.isIgnorableWhitespace);
 
 	/**
 	 * Removes the <br> tag that is at the end of the given container.
-	 * Invisible what spaces are ignored.
+	 * Invisible white spaces are ignored.
 	 *
-	 * @param {number} i Unused
-	 * @param {HTMLElement} element
+	 * @param {number} i Index of element in its collection. (Unused)
+	 * @param {HTMLElement} element The container in which to remove the <br>.
 	 */
-	function removeEndBr(i, element) {
-		var br = findEndBr(element);
-		if (br) {
-			$(br).remove();
+	function removeTrailingBr(i, element) {
+		var node = Html.findNodeRight(
+			element.lastChild,
+			isNotIgnorableWhitespace
+		);
+		if (node && 'br' === node.nodeName.toLowerCase()) {
+			$(node).remove();
 		}
 	}
 
 	/**
 	 * Prepares this content for editing
 	 *
-	 * @param {number} i Unused
+	 * @param {number} i Index of element in its collection. (Unused)
 	 * @param {HTMLElement} element
 	 */
 	function prepareForEditing(i, element) {
@@ -81,10 +63,10 @@ define([
 		$element.filter(emptyBlocksSelector).remove();
 
 		if ($.browser.msie) {
-			// If editing in IE: remove end-br's.  Content edited by Aloha
-			// Editor is no longer exported with <br>'s that are annotated with
-			// "aloha-end-br" classes,  this clean-up is still done, however,
-			// for content that was edited using legacy Aloha Editor.
+			// Because even though content edited by Aloha Editor is no longer
+			// exported with propping <br>'s that are annotated with
+			// "aloha-end-br" classes,  this clean-up still needs to be done for
+			// content that was edited using legacy Aloha Editor.
 			$element.filter('br.aloha-end-br').remove();
 
 			// Because IE's Trident engine goes against W3C's HTML specification
@@ -95,20 +77,14 @@ define([
 			// content editable block-level elements are not rendered invisibly
 			// in IE, we can remove the propping <br> in otherwise empty
 			// block-level elements.
-			$element.filter(blocksSelector).each(removeEndBr);
-		} else {
-			$element.filter('li').each(function () {
-				// Does not compute; Html.isBlock(li) === false
-				if (needsEndBr(this)) {
-					$(this).append('<br/>');
-				}
-			});
+			$element.filter(blocksSelector).each(removeTrailingBr);
 		}
+
 		$element.children(NOT_ALOHA_BLOCK_FILTER).each(prepareForEditing);
 	}
 
 	/**
-	 * Prepares the content for editing in IE7.
+	 * Prepares the content for editing in IE versions older than version 8.
 	 *
 	 * Ensure that all empty blocklevel elements must contain a zero-width
 	 * whitespace.
@@ -116,18 +92,18 @@ define([
 	 * @param {number} i Unused
 	 * @param {HTMLElement} element
 	 */
-	function prepareEditingIE7(i, element) {
+	function prepareEditingInOldIE(i, element) {
 		var $element = $(element);
 		$element.filter(emptyBlocksSelector).append('\u200b');
-		$element.children(NOT_ALOHA_BLOCK_FILTER).each(prepareEditingIE7);
+		$element.children(NOT_ALOHA_BLOCK_FILTER).each(prepareEditingInOldIE);
 	}
 
 	/**
 	 * For a given DOM element, will make sure that it, and every one of its
 	 * child nodes, which is a block-level element ends with a <br> node.
 	 *
-	 * This ensures that a block is rendered visibly (with atleast one
-	 * character height).
+	 * This ensures that a block is rendered visibly (with atleast one character
+	 * height).
 	 *
 	 * @param {number} i Unused
 	 * @param {HTMLElement} element
@@ -139,34 +115,29 @@ define([
 	}
 
 	return ContentHandlerManager.createHandler({
-		handleContent: function (content, options) {
+		handleContent: function handleBlockLevelContent(content, options) {
+			if (!options) {
+				return content;
+			}
 			var $content = Utils.wrapContent(content);
-
-			if (!options || !$content) {
-				return $content && $content.html();
+			if (!$content) {
+				return content;
 			}
-
 			switch (options.command) {
 			case 'initEditable':
 				$content.children(NOT_ALOHA_BLOCK_FILTER)
 				        .each(prepareForEditing);
 
-				// TODO: Do we support ie versions below 7?
 				if ($.browser.msie && $.browser.version <= 7) {
 					$content.children(NOT_ALOHA_BLOCK_FILTER)
-					        .each(prepareEditingIE7);
+					        .each(prepareEditingInOldIE);
 				}
 				break;
 			case 'getContents':
 				$content.children(NOT_ALOHA_BLOCK_FILTER)
 				        .each(propBlockElements);
-
-				// Because trailing end <br>s in <li>s are not necessary for
-				// rendering.
-				$content.find('li>br:last').remove();
 				break;
 			}
-
 			return $content.html();
 		}
 	});

data/vendor/assets/javascripts/aloha/plugins/common/dom-to-xhtml/lib/dom-to-xhtml.js

@@ -118,7 +118,7 @@ function(
 	 *        The given string with & and < characters replaced with the corresponding HTML entity references.
 	 */
 	function encodePcdata(str) {
-		return str.replace(/&/g, '&amp;').replace(/</g, '&lt;');
+		return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 	}
 
 	/**

data/vendor/assets/javascripts/aloha/plugins/common/format/lib/format-plugin.js

@@ -199,6 +199,19 @@ define('format/format-plugin', [
 		Aloha.Selection.changeMarkupOnSelection(jQuery('<' + button + '>'));
 	}
 
+	function updateUiAfterMutation(formatPlugin, rangeObject) {
+		// select the modified range
+		rangeObject.select();
+		// update Button toggle state. We take 'Aloha.Selection.getRangeObject()'
+		// because rangeObject is not up-to-date
+		onSelectionChanged(formatPlugin, Aloha.Selection.getRangeObject());
+	}
+
+	function format(formatPlugin, rangeObject, markup) {
+		GENTICS.Utils.Dom.addMarkup(rangeObject, markup);
+		updateUiAfterMutation(formatPlugin, rangeObject);
+	}
+
 	function addMarkup(button) {
 		var formatPlugin = this;
 		var markup = jQuery('<'+button+'>');
@@ -223,27 +236,26 @@ define('format/format-plugin', [
 				// the range is not collapsed, so we remove the markup from the range
 				GENTICS.Utils.Dom.removeMarkup(rangeObject, jQuery(foundMarkup), Aloha.activeEditable.obj);
 			}
+			updateUiAfterMutation(formatPlugin, rangeObject);
 		} else {
 			// when the range is collapsed, extend it to a word
 			if (rangeObject.isCollapsed()) {
 				GENTICS.Utils.Dom.extendToWord(rangeObject);
 				if (rangeObject.isCollapsed()) {
 					if (StateOverride.enabled()) {
-						StateOverride.setWithRangeObject(commandsByElement[button], true, rangeObject);
+						StateOverride.setWithRangeObject(
+							commandsByElement[button],
+							rangeObject,
+							function (command, rangeObject) {
+								format(formatPlugin, rangeObject, markup);
+							}
+						);
 						return;
 					}
 				}
 			}
-
-			// add the markup
-			GENTICS.Utils.Dom.addMarkup(rangeObject, markup);
+			format(formatPlugin, rangeObject, markup);
 		}
-		// select the modified range
-		rangeObject.select();
-
-		// update Button toggle state. We take 'Aloha.Selection.getRangeObject()'
-		// because rangeObject is not up-to-date
-		onSelectionChanged(formatPlugin, Aloha.Selection.getRangeObject());
 	}
 
 	function onSelectionChanged(formatPlugin, rangeObject) {