locomotive-aloha-rails 0.20.1.5 → 0.23.2.1

data/vendor/assets/javascripts/aloha/plugins/common/link/nls/ca/i18n.js

@@ -0,0 +1,14 @@
+define({
+	"button.addlink.tooltip": "Insereix un enllaç",
+	"button.removelink.tooltip": "Suprimeix l\'enllaç",
+	"newlink.defaulttext": "Enllaç nou",
+	"floatingmenu.tab.link": "Enllaç",
+	"link.target.self": "Ell mateix",
+	"link.target.blank": "En blanc",
+	"link.target.parent": "Pare",
+	"link.target.top": "Superior",
+	"link.target.framename": "Nom del marc",
+	"link.target.legend": "Objectiu",
+	"link.title.legend": "Títol",
+	"insertLink": "ctrl+k"
+});

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

@@ -1,13 +1,14 @@
-define( {
-	'button.addlink.tooltip': 'Verweis einf\u00fcgen',
-	'button.removelink.tooltip': 'Verweis entfernen',
-	'newlink.defaulttext': 'Neuer Verweis',
-	'floatingmenu.tab.link': 'Verweis',
-	'link.target.self': '\u00D6ffnet im selben Fenster',
-	'link.target.blank': '\u00D6ffnet in neuem Fenster',
-	'link.target.parent': 'Parent',
-	'link.target.top': 'Top',
-	'link.target.framename': 'Framename',
-	'link.target.legend': 'Target',
-	'link.title.legend': 'Title'
-} );
+define({
+	"button.addlink.tooltip": "Verweis einfügen",
+	"button.removelink.tooltip": "Verweis entfernen",
+	"newlink.defaulttext": "Neuer Verweis",
+	"floatingmenu.tab.link": "Verweis",
+	"link.target.self": "Gleiches Fenster",
+	"link.target.blank": "Neues Fenster",
+	"link.target.parent": "Elternfenster",
+	"link.target.top": "Hauptfenster",
+	"link.target.framename": "Framename",
+	"link.target.legend": "Ziel",
+	"link.title.legend": "Titel",
+	"insertLink": "Ctrl+k"
+});

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

@@ -1,9 +1,23 @@
-define( {
-	root: {
-		'button.addlink.tooltip': 'Insert Link',
-	},
-	de: true,
-	fr: true,
-	pl: true,
-	ru: true
-} );
+define({
+	"root":  {
+		"button.addlink.tooltip": "Insert Link",
+		"button.removelink.tooltip": "Remove Link",
+		"newlink.defaulttext": "New Link",
+		"floatingmenu.tab.link": "Link",
+		"link.target.self": "Self",
+		"link.target.blank": "Blank",
+		"link.target.parent": "Parent",
+		"link.target.top": "Top",
+		"link.target.framename": "Framename",
+		"link.target.legend": "Target",
+		"link.title.legend": "Title",
+		"insertLink": "ctrl+k"
+	},
+		"ca": true,
+		"de": true,
+		"mk": true,
+		"pt-br": true,
+		"ru": true,
+		"uk": true,
+		"zh-hans": true
+});

data/vendor/assets/javascripts/aloha/plugins/common/link/nls/mk/i18n.js

@@ -0,0 +1,14 @@
+define({
+	"button.addlink.tooltip": "Внеси линк",
+	"button.removelink.tooltip": "Одстрани линк",
+	"newlink.defaulttext": "Нов линк",
+	"floatingmenu.tab.link": "Линк",
+	"link.target.self": "Себеси",
+	"link.target.blank": "Празно",
+	"link.target.parent": "Родител",
+	"link.target.top": "Најгоре",
+	"link.target.framename": "Име на рамката",
+	"link.target.legend": "Мета",
+	"link.title.legend": "Наслов",
+	"insertLink": "ctrl+k"
+});

data/vendor/assets/javascripts/aloha/plugins/common/link/nls/pt-br/i18n.js

@@ -0,0 +1,14 @@
+define({
+	"button.addlink.tooltip": "Inserir link",
+	"button.removelink.tooltip": "Remover link",
+	"newlink.defaulttext": "Novo link",
+	"floatingmenu.tab.link": "Link",
+	"link.target.self": "Auto",
+	"link.target.blank": "Em branco",
+	"link.target.parent": "Parente",
+	"link.target.top": "Topo",
+	"link.target.framename": "Nome do frame",
+	"link.target.legend": "Alvo",
+	"link.title.legend": "Título",
+	"insertLink": "Ctrl+K"
+});

data/vendor/assets/javascripts/aloha/plugins/common/link/nls/ru/i18n.js

@@ -1,6 +1,14 @@
-define( {
-	'button.addlink.tooltip': '\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443',
-	'button.removelink.tooltip': '\u0423\u0431\u0440\u0430\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443',
-	'newlink.defaulttext': '\u041d\u043e\u0432\u0430\u044f \u0441\u0441\u044b\u043b\u043a\u0430',
-	'floatingmenu.tab.link': '\u0421\u0441\u044b\u043b\u043a\u0430'
-} );
+define({
+	"button.addlink.tooltip": "Вставить ссылку",
+	"button.removelink.tooltip": "Убрать ссылку",
+	"newlink.defaulttext": "Новая ссылка",
+	"floatingmenu.tab.link": "Ссылка",
+	"link.target.self": "Текущее окно",
+	"link.target.blank": "Новое окно",
+	"link.target.parent": "Родительский фрейм",
+	"link.target.top": "Поверх всех фреймов",
+	"link.target.framename": "Имя фрейма",
+	"link.target.legend": "Цель",
+	"link.title.legend": "Название",
+	"insertLink": "ctrl+k"
+});

data/vendor/assets/javascripts/aloha/plugins/common/link/nls/uk/i18n.js

@@ -0,0 +1,14 @@
+define({
+	"button.addlink.tooltip": "Вставити посилання",
+	"button.removelink.tooltip": "Прибрати посилання",
+	"newlink.defaulttext": "Нове посилання",
+	"floatingmenu.tab.link": "Посилання",
+	"link.target.self": "Поточне вікно",
+	"link.target.blank": "Нове вікно",
+	"link.target.parent": "Батьківський фрейм",
+	"link.target.top": "Поверх усіх фреймів",
+	"link.target.framename": "Назва фрейма",
+	"link.target.legend": "Ціль",
+	"link.title.legend": "Назва",
+	"insertLink": "ctrl+k"
+});

data/vendor/assets/javascripts/aloha/plugins/common/link/nls/zh-hans/i18n.js

@@ -0,0 +1,14 @@
+define({
+	"button.addlink.tooltip": "插入链接",
+	"button.removelink.tooltip": "移除链接",
+	"newlink.defaulttext": "新链接",
+	"floatingmenu.tab.link": "链接",
+	"link.target.self": "本页面",
+	"link.target.blank": "新页面",
+	"link.target.parent": "父页面",
+	"link.target.top": "最上层页面",
+	"link.target.framename": "框架名",
+	"link.target.legend": "目标",
+	"link.title.legend": "标题",
+	"insertLink": "ctrl+k"
+});

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

@@ -1,27 +1,105 @@
-/*!
-* Aloha Editor
-* Author & Copyright (c) 2010 Gentics Software GmbH
-* aloha-sales@gentics.com
-* Licensed unter the terms of http://www.aloha-editor.com/license.html
-*/
-
-define(
-['aloha', 'aloha/jquery', 'aloha/plugin', 'aloha/floatingmenu', 'i18n!list/nls/i18n', 'i18n!aloha/nls/i18n', 'aloha/engine'],
-function(Aloha, jQuery, Plugin, FloatingMenu, i18n, i18nCore, Engine) {
+/* list-plugin.js is part of Aloha Editor project http://aloha-editor.org
+ *
+ * Aloha Editor is a WYSIWYG HTML5 inline editing library and editor. 
+ * Copyright (c) 2010-2012 Gentics Software GmbH, Vienna, Austria.
+ * Contributors http://aloha-editor.org/contribution.php 
+ * 
+ * Aloha Editor is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ *
+ * Aloha Editor is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * 
+ * As an additional permission to the GNU GPL version 2, you may distribute
+ * non-source (e.g., minimized or compacted) forms of the Aloha-Editor
+ * source code without the copy of the GNU GPL normally required,
+ * provided you include this license notice and a URL through which
+ * recipients can access the Corresponding Source.
+ */
+define([
+	'aloha',
+	'jquery',
+	'aloha/plugin',
+	'ui/ui',
+	'ui/scopes',
+	'ui/button',
+	'ui/toggleButton',
+	'i18n!list/nls/i18n',
+	'i18n!aloha/nls/i18n',
+	'aloha/engine',
+	'PubSub'
+], function(
+	Aloha,
+	jQuery,
+	Plugin,
+	Ui,
+	Scopes,
+	Button,
+	ToggleButton,
+	i18n,
+	i18nCore,
+	Engine,
+	PubSub
+) {
+	'use strict';
+
+	var GENTICS = window.GENTICS;
 	
+	/**
+	 * Transforms the given list element and its sub elements (if they are in the selection) into
+	 * the given transformTo target.
+	 * @param domToTransform - The list object that should be transformed
+	 * @param transformTo - Transformationtarget e.g. 'ul' / 'ol'
+	 */
+	function transformExistingListAndSubLists (domToTransform, transformTo) {
+		// find and transform sublists if they are in the selection
+		jQuery(domToTransform).find(domToTransform.nodeName).each(function(){
+			if (isListInSelection(this)) {
+				Aloha.Markup.transformDomObject(this, transformTo, Aloha.Selection.rangeObject);
+			}
+		});
+
+		// the element itself
+		Aloha.Markup.transformDomObject(domToTransform, transformTo, Aloha.Selection.rangeObject);
+	}
+
+	/**
+	 * Checks if a dom element is in the given Slectiontree.
+	 * @param needle - the searched element
+	 * @return returns true if the needle is found in the current selection tree.
+	 */
+	function isListInSelection(needle) {
+		var selectionTree = Aloha.Selection.getSelectionTree();
+		return checkSelectionTreeEntryForElement(selectionTree, needle);
+	}
 
-	var
-		GENTICS = window.GENTICS;
+	/**
+	 * Checks if the given needle is in the given treeElement or in one of its sub elements.
+	 * @param treeElement - the tree element to be searched in
+	 * @param needle - the searched element
+	 */
+	function checkSelectionTreeEntryForElement(treeElementArray, needle) {
+		var found = false;
+		jQuery.each(treeElementArray, function(index, element){
+			if ((element.domobj === needle && element.selection !== "none") || checkSelectionTreeEntryForElement(element.children, needle)) {
+				found = true;
+			}
+		});
+		return found;
+	}
 
 	/**
 	 * Register the ListPlugin as Aloha.Plugin
 	 */
 	var ListPlugin = Plugin.create('list', {
-		/**
-		 * Configure the available languages
-		 */
-		languages: ['en', 'de', 'fr', 'eo', 'fi', 'ru', 'it'],
-
 		/**
 		 * default button configuration
 		 */
@@ -39,116 +117,70 @@ function(Aloha, jQuery, Plugin, FloatingMenu, i18n, i18nCore, Engine) {
 
 			var that = this;
 
-//			//register the workaround-handler keypress handler on every editable
-//			Aloha.bind('aloha-editable-created', function(event, editable) {
-//				editable.obj.keyup(function(event){
-//					deleteWorkaroundHandler(event);
-//					return true;
-//				});
-//			});
-
-			// the 'create unordered list' button
-			this.createUnorderedListButton = new Aloha.ui.Button({
-				'name' : 'ul',
-				'iconClass' : 'aloha-button aloha-button-ul',
-				'size' : 'small',
-				'tooltip' : i18n.t('button.createulist.tooltip'),
-				'toggle' : true,
-				'onclick' : function (element, event) {
-					that.transformList(false);
+			this._orderedListButton = Ui.adopt("orderedList", ToggleButton, {
+				tooltip: i18n.t("button.createolist.tooltip"),
+				icon: "aloha-icon aloha-icon-orderedlist",
+				scope: 'Aloha.continuoustext',
+				click: function(){
+					that.transformList(true);
 				}
 			});
-			// add to floating menu
-			FloatingMenu.addButton(
-				'Aloha.continuoustext',
-				this.createUnorderedListButton,
-				i18nCore.t('floatingmenu.tab.format'),
-				1
-			);
-
-			// the 'create ordered list' button
-			this.createOrderedListButton = new Aloha.ui.Button({
-				'name' : 'ol',
-				'iconClass' : 'aloha-button aloha-button-ol',
-				'size' : 'small',
-				'tooltip' : i18n.t('button.createolist.tooltip'),
-				'toggle' : true,
-				'onclick' : function (element, event) {
-					that.transformList(true);
+
+			this._unorderedListButton = Ui.adopt("unorderedList", ToggleButton, {
+				tooltip: i18n.t("button.createulist.tooltip"),
+				icon: "aloha-icon aloha-icon-unorderedlist",
+				scope: 'Aloha.continuoustext',
+				click: function(){
+					that.transformList(false);
 				}
 			});
-			// add to floating menu
-			FloatingMenu.addButton(
-				'Aloha.continuoustext',
-				this.createOrderedListButton,
-				i18nCore.t('floatingmenu.tab.format'),
-				1
-			);
-
-
-			FloatingMenu.createScope('Aloha.List', 'Aloha.continuoustext');
-			// the 'indent list' button
-			this.indentListButton = new Aloha.ui.Button({
-				'name' : 'indent-list',
-				'iconClass' : 'aloha-button aloha-button-indent-list',
-				'size' : 'small',
-				'tooltip' : i18n.t('button.indentlist.tooltip'),
-				'toggle' : false,
-				'onclick' : function (element, event) {
+
+			this._indentListButton = Ui.adopt("indentList", Button, {
+				tooltip: i18n.t('button.indentlist.tooltip'),
+				icon: 'aloha-icon aloha-icon-indent',
+				scope: 'Aloha.continuoustext',
+				click: function() {
 					that.indentList();
 				}
 			});
-			// add to floating menu
-			FloatingMenu.addButton(
-				'Aloha.continuoustext',
-				this.indentListButton,
-				i18n.t('floatingmenu.tab.list'),
-				1
-			);
-
-			// the 'outdent list' button
-			this.outdentListButton = new Aloha.ui.Button({
-				'name' : 'outdent-list',
-				'iconClass' : 'aloha-button aloha-button-outdent-list',
-				'size' : 'small',
-				'tooltip' : i18n.t('button.outdentlist.tooltip'),
-				'toggle' : false,
-				'onclick' : function (element, event) {
+
+			this._outdentListButton = Ui.adopt("outdentList", Button, {
+				tooltip: i18n.t('button.outdentlist.tooltip'),
+				icon: 'aloha-icon aloha-icon-outdent',
+				scope: 'Aloha.continuoustext',
+				click: function() {
 					that.outdentList();
 				}
 			});
-			// add to floating menu
-			FloatingMenu.addButton(
-				'Aloha.continuoustext',
-				this.outdentListButton,
-				i18n.t('floatingmenu.tab.list'),
-				1
-			);
-
-			// add the event handler for selection change
-			Aloha.bind('aloha-selection-changed', function ( event, rangeObject ) {
-				var i, effectiveMarkup;
+
+			Scopes.createScope('Aloha.List', 'Aloha.continuoustext');
+
+			// add the event handler for context selection change
+			PubSub.sub('aloha.selection.context-change', function(message){
+				var i,
+					effectiveMarkup,
+					rangeObject = message.range;
 				
 				// Hide all buttons in the list tab will make the list tab disappear
-				that.outdentListButton.hide();
-				that.indentListButton.hide();
-				that.createUnorderedListButton.setPressed(false);
-				that.createOrderedListButton.setPressed(false);
+				that._outdentListButton.show(false);
+				that._indentListButton.show(false);
+				that._unorderedListButton.setState(false);
+				that._orderedListButton.setState(false);
 				
 				for ( i = 0; i < rangeObject.markupEffectiveAtStart.length; i++) {
 					effectiveMarkup = rangeObject.markupEffectiveAtStart[ i ];
 					if (Aloha.Selection.standardTagNameComparator(effectiveMarkup, jQuery('<ul></ul>'))) {
-						that.createUnorderedListButton.setPressed(true);
+						that._unorderedListButton.setState(true);
 						// Show all buttons in the list tab
-						that.outdentListButton.show();
-						that.indentListButton.show();
+						that._outdentListButton.show(true);
+						that._indentListButton.show(true);
 						break;
 					}
 					if (Aloha.Selection.standardTagNameComparator(effectiveMarkup, jQuery('<ol></ol>'))) {
-						that.createOrderedListButton.setPressed(true);
+						that._orderedListButton.setState(true);
 						// Show all buttons in the list tab
-						that.outdentListButton.show();
-						that.indentListButton.show();
+						that._outdentListButton.show(true);
+						that._indentListButton.show(true);
 						break;
 					}
 				}
@@ -156,9 +188,6 @@ function(Aloha, jQuery, Plugin, FloatingMenu, i18n, i18nCore, Engine) {
 				if (Aloha.activeEditable) {
 					that.applyButtonConfig(Aloha.activeEditable.obj);
 				}
-
-				// TODO this should not be necessary here!
-				FloatingMenu.doLayout();
 			});
 
 			// add the key handler for Tab
@@ -178,15 +207,15 @@ function(Aloha, jQuery, Plugin, FloatingMenu, i18n, i18nCore, Engine) {
 			if (Aloha.Selection.rangeObject.unmodifiableMarkupAtStart[0]) {
 				// show/hide them according to the config
 				if (jQuery.inArray('ul', config) != -1 && Aloha.Selection.canTag1WrapTag2(Aloha.Selection.rangeObject.unmodifiableMarkupAtStart[0].nodeName, "ul") != -1) {
-					this.createUnorderedListButton.show();
+					this._unorderedListButton.show(true);
 				} else {
-					this.createUnorderedListButton.hide();
+					this._unorderedListButton.show(false);
 				}
 
 				if (jQuery.inArray('ol', config) != -1 && Aloha.Selection.canTag1WrapTag2(Aloha.Selection.rangeObject.unmodifiableMarkupAtStart[0].nodeName, "ol") != -1) {
-					this.createOrderedListButton.show();
+					this._orderedListButton.show(true);
 				} else {
-					this.createOrderedListButton.hide();
+					this._orderedListButton.show(false);
 				}
 
 			}
@@ -252,8 +281,8 @@ function(Aloha, jQuery, Plugin, FloatingMenu, i18n, i18nCore, Engine) {
 				newPara, jqToTransform, nodeName;
 
 			// visible is set to true, but the button is not visible
-			this.outdentListButton.show();
-			this.indentListButton.show();
+			this._outdentListButton.show(true);
+			this._indentListButton.show(true);
 
 			if (!domToTransform) {
 				// wrap a paragraph around the selection
@@ -272,9 +301,6 @@ function(Aloha, jQuery, Plugin, FloatingMenu, i18n, i18nCore, Engine) {
 						//IE7 requires an (empty or non-empty) text node
 						//inside the li for the selection to work.
 						li.appendChild(document.createTextNode(""));
-						/* if ( jQuery.browser.mozilla ) {
-							li.appendChild(document.createElement("BR"));
-						}*/
 
 						editable.append(jqList);
 						editable.focus();
@@ -326,6 +352,7 @@ function(Aloha, jQuery, Plugin, FloatingMenu, i18n, i18nCore, Engine) {
 						newPara = Aloha.Markup.transformDomObject(li, 'p', Aloha.Selection.rangeObject);
 						// if any lists are in the paragraph, move the to after the paragraph
 						newPara.after(newPara.children('ol,ul'));
+						Engine.ensureContainerEditable(newPara.get(0));
 					});
 
 					// unwrap the li (remove the enclosing ul)
@@ -335,15 +362,15 @@ function(Aloha, jQuery, Plugin, FloatingMenu, i18n, i18nCore, Engine) {
 				// we are in an unordered list and shall transform it to an ordered list
 
 				// transform the ul into an ol
-				Aloha.Markup.transformDomObject(domToTransform, 'ol', Aloha.Selection.rangeObject);
-
+				transformExistingListAndSubLists(domToTransform, 'ol');
+				
 				// merge adjacent lists
 				this.mergeAdjacentLists(jQuery(domToTransform));
 			} else if (nodeName == 'ol' && !ordered) {
 				// we are in an ordered list and shall transform it to an unordered list
 
 				// transform the ol into an ul
-				Aloha.Markup.transformDomObject(domToTransform, 'ul', Aloha.Selection.rangeObject);
+				transformExistingListAndSubLists(domToTransform, 'ul');
 
 				// merge adjacent lists
 				this.mergeAdjacentLists(jQuery(domToTransform));
@@ -375,6 +402,7 @@ function(Aloha, jQuery, Plugin, FloatingMenu, i18n, i18nCore, Engine) {
 						newPara = Aloha.Markup.transformDomObject(li, 'p', Aloha.Selection.rangeObject);
 						// if any lists are in the paragraph, move the to after the paragraph
 						newPara.after(newPara.children('ol,ul'));
+						Engine.ensureContainerEditable(newPara.get(0));
 					});
 
 					// unwrap the li (remove the enclosing ul)
@@ -458,6 +486,7 @@ function(Aloha, jQuery, Plugin, FloatingMenu, i18n, i18nCore, Engine) {
 			this.refreshSelection();
 		},
 
+
 		/**
 		 * Indent the selected list items by moving them into a new created, nested list
 		 */