locomotive-aloha-rails 0.20.1.5 → 0.23.2.1

data/vendor/assets/javascripts/aloha/plugins/extra/metaview/css/metaview.css

@@ -4,7 +4,7 @@
 * aloha-sales@gentics.com
 * Licensed unter the terms of http://www.aloha-editor.com/license.html
 */
-button.aloha-button-metaview { background: url(../img/button.png) no-repeat 0px 0px !important; }
+.aloha-icon-metaview { background: url(../img/button.png) no-repeat 0px 0px !important; }
 
 .aloha-metaview p, .aloha-metaview pre,
 .aloha-metaview h1, .aloha-metaview h2,
@@ -15,7 +15,7 @@ button.aloha-button-metaview { background: url(../img/button.png) no-repeat 0px
 .aloha-metaview dl, .aloha-metaview dt,
 .aloha-metaview dd, .aloha-metaview td,
 .aloha-metaview th, .aloha-metaview table, 
-.aloha-metaview caption {
+.aloha-metaview caption, .aloha-metaview hr {
 	background: white no-repeat 2px 2px;
 	padding: 8px 5px 5px;
 	margin: 10px;
@@ -36,7 +36,7 @@ button.aloha-button-metaview { background: url(../img/button.png) no-repeat 0px
 * .aloha-metaview dl, * .aloha-metaview dt,
 * .aloha-metaview dd, * .aloha-metaview td,
 * .aloha-metaview th, * .aloha-metaview table,
-* .aloha-metaview caption {
+* .aloha-metaview caption, * .aloha-metaview hr {
 	min-height: auto;
 }
 
@@ -63,20 +63,12 @@ button.aloha-button-metaview { background: url(../img/button.png) no-repeat 0px
 .aloha-metaview th { background-image: url(../img/th.png); }
 .aloha-metaview table { background-image: url(../img/table.png); }
 .aloha-metaview caption { background-image: url(../img/caption.png); }
+.aloha-metaview hr { background-image: url(../img/hr.png); }
 
 .aloha-metaview abbr[title], .aloha-metaview dfn[title] { border-bottom: 1px dotted; cursor: help; }
-.aloha-metaview [lang] { padding-left: 20px; border: 1px dotted #ddd; background-color: #ccc; background-repeat: no-repeat; background-position: left center;}
+.aloha-metaview [lang] { background-image:url(../../wai-lang/img/button.png); padding-left: 20px; border: 1px dotted #ddd; background-color: #ccc; background-repeat: no-repeat; background-position: left center;}
 
-/* LANGUAGE FLAGS */
-.aloha-metaview [lang="de"] { background-image:url(../../flag-icons/img/flags/de.png); }
-.aloha-metaview [lang="en"] { background-image:url(../../flag-icons/img/flags/en.png); }
-.aloha-metaview [lang="fr"] { background-image:url(../../flag-icons/img/flags/fr.png); }
-.aloha-metaview [lang="es"] { background-image:url(../../flag-icons/img/flags/es.png); }
-.aloha-metaview [lang="it"] { background-image:url(../../flag-icons/img/flags/it.png); }
-.aloha-metaview [lang="nl"] { background-image:url(../../flag-icons/img/flags/nl.png); }
-.aloha-metaview [lang="no"] { background-image:url(../../flag-icons/img/flags/no.png); }
-.aloha-metaview [lang="pl"] { background-image:url(../../flag-icons/img/flags/pl.png); }
-.aloha-metaview [lang="rs"] { background-image:url(../../flag-icons/img/flags/rs.png); }
+/* @todo add also the other languages which are available */
 
 .aloha-metaview q { background-image:url(../img/icon_cite.png); padding-left: 20px; border: 1px dotted #ddd; background-color: #ccc; background-repeat: no-repeat; background-position: left center;}
 

data/vendor/assets/javascripts/aloha/plugins/extra/metaview/lib/metaview-plugin.js

@@ -1,82 +1,186 @@
-/*!
-* 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/plugin', 'aloha/floatingmenu', 'i18n!metaview/nls/i18n', 'i18n!aloha/nls/i18n', 'aloha/jquery', 'css!metaview/css/metaview.css'],
-function(Plugin, FloatingMenu, i18n, i18nCore, jQuery) {
-	
+/* metaview-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-2013 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([
+	'jquery',
+	'aloha/core',
+	'aloha/plugin',
+	'ui/ui',
+	'ui/toggleButton',
+	'i18n!metaview/nls/i18n',
+	'i18n!aloha/nls/i18n'
+], function (
+	$,
+	Aloha,
+	Plugin,
+	Ui,
+	ToggleButton,
+	i18n
+) {
+	'use strict';
 
-	var
-		$ = jQuery,
-		GENTICS = window.GENTICS,
-		Aloha = window.Aloha;
+	/**
+	 * Map of editable ids against their metaview states.
+	 *
+	 * @type {object<string, boolean>}
+	 */
+	var states = {};
 
-     return Plugin.create('metaview', {
-		_constructor: function(){
-			this._super('metaview');
-		},
-		
-		/**
-		 * Configure the available languages
-		 */
-		languages: ['en', 'de'],
+	/**
+	 * Checks whether the given editable is has metaview enabled.
+	 *
+	 * @param {jQuery<HTMLElement>} $editable
+	 * @return {boolean} True if editable is in metaview-enabled state.
+	 */
+	function enabled($editable) {
+		return states[$editable[0].id];
+	}
 
-		
-		/**
-		 * Initialize the plugin
-		 */
+	/**
+	 * Enables metaview for the given editable, and update UI appropriately.
+	 *
+	 * @param {jQuery<HTMLElement>} $editable
+	 * @param {ToggleButton} button
+	 */
+	function enable($editable, button) {
+		$editable.addClass('aloha-metaview');
+		button.setState(true);
+		states[$editable[0].id] = true;
+	}
+
+	/**
+	 * Disables metaview for the given editable, and update UI appropriately.
+	 *
+	 * @param {jQuery<HTMLElement>} $editable
+	 * @param {ToggleButton} button
+	 */
+	function disable($editable, button) {
+		$editable.removeClass('aloha-metaview');
+		button.setState(false);
+		states[$editable[0].id] = false;
+	}
+
+	/**
+	 * Toggles metaview on the given editable.
+	 *
+	 * @param {jQuery<HTMLElement>} $editable
+	 * @param {ToggleButton} button
+	 */
+	function toggle($editable, button) {
+		if (enabled($editable)) {
+			disable($editable, button);
+		} else {
+			enable($editable, button);
+		}
+	}
+
+	/**
+	 * Singleton meta view toggle button to be used across all meta view plugin
+	 * instances.
+	 *
+	 * @type {ToggleButton}
+	 */
+	var METAVIEW_TOGGLE_BUTTON = Ui.adopt('toggleMetaView', ToggleButton, {
+		tooltip : i18n.t('button.switch-metaview.tooltip'),
+		icon: 'aloha-icon aloha-icon-metaview',
+		scope: 'Aloha.continuoustext',
+		click: function () {
+			toggle(Aloha.activeEditable.obj, this);
+		}
+	});
+
+	/**
+	 * Gets the configuration for the given editable/plugin combination.
+	 *
+	 * TODO: Memoize
+	 *
+	 * @param {Plugin} plugin Instance of metaview plugin
+	 * @param {Editable} editable
+	 */
+	function getConfiguration(plugin, editable) {
+		return plugin.getEditableConfig(editable);
+	}
+
+	/**
+	 * Checks whether or not meta-view is automatically enable on an editable.
+	 *
+	 * @param {object} The plugin/editable configuration.
+	 * @return {boolean} True if activated.
+	 */
+	function isAutomaticallyEnabled(config) {
+		return (
+			$.type(config) === 'array' && $.inArray('enabled', config) !== -1
+		);
+	}
+
+	/**
+	 * Checks whether or not meta-view is activated for an editable.
+	 *
+	 * @param {object} The plugin/editable configuration.
+	 * @return {boolean} True if activated.
+	 */
+	function isPluginActivated(config) {
+		return (
+			$.type(config) === 'array' && $.inArray('metaview', config) !== -1
+		);
+	}
+
+    return Plugin.create('metaview', {
+		config: ['metaview'],
 		init: function () {
-			var that = this;
-			
-			this.createButtons();
-	
-			// mark active Editable with a css class
-			Aloha.bind(
-					"aloha-editable-activated",
-					function (jEvent, aEvent) {
-						if(jQuery(Aloha.activeEditable.obj).hasClass('aloha-metaview')) {
-							that.button.setPressed(true);
-						} else {
-							that.button.setPressed(false);
-						}
+			var plugin = this;
+
+			Aloha.bind('aloha-editable-activated', function () {
+				var config = getConfiguration(plugin, Aloha.activeEditable.obj);
+
+				if (isAutomaticallyEnabled(config)) {
+					enable(Aloha.activeEditable.obj, METAVIEW_TOGGLE_BUTTON);
+				}
+
+				if (isPluginActivated(config)) {
+					METAVIEW_TOGGLE_BUTTON.show(true);
+					if (enabled(Aloha.activeEditable.obj)) {
+						enable(
+							Aloha.activeEditable.obj,
+							METAVIEW_TOGGLE_BUTTON
+						);
+					} else {
+						disable(
+							Aloha.activeEditable.obj,
+							METAVIEW_TOGGLE_BUTTON
+						);
 					}
-			);
-		},
-		
-		buttonClick: function() {
-			var that = this;
-			if(jQuery(Aloha.activeEditable.obj).hasClass('aloha-metaview')) {
-				jQuery(Aloha.activeEditable.obj).removeClass('aloha-metaview');
-				that.button.setPressed(false);
-			} else {
-				jQuery(Aloha.activeEditable.obj).addClass('aloha-metaview');
-				that.button.setPressed(true);
-			}
-		},
-		
-		/**
-		 * Initialize the buttons
-		 */
-		createButtons: function () {
-			var that = this;
-	
-			that.button = new Aloha.ui.Button({
-				'name' : 'meta',
-				'iconClass' : 'aloha-button aloha-button-metaview',
-				'size' : 'small',
-				'onclick' : function () { that.buttonClick(); },
-				'tooltip' : i18n.t('button.switch-metaview.tooltip'),
-				'toggle' : true
+				} else {
+					METAVIEW_TOGGLE_BUTTON.show(false);
+				}
+			});
+
+			Aloha.bind('aloha-editable-deactivated', function () {
+				Aloha.activeEditable.obj.removeClass('aloha-metaview');
 			});
-			FloatingMenu.addButton(
-				'Aloha.continuoustext',
-				that.button,
-				i18nCore.t('floatingmenu.tab.format'),
-				1
-			);			
 		}
 	});
-});
+});

data/vendor/assets/javascripts/aloha/plugins/extra/metaview/nls/ca/i18n.js

@@ -0,0 +1,3 @@
+define({
+	"button.switch-metaview.tooltip": "Canvia entre la visualització «meta» i «normal»"
+});

data/vendor/assets/javascripts/aloha/plugins/extra/metaview/nls/de/i18n.js

@@ -1 +1,3 @@
-define({ "button.switch-metaview.tooltip": "Zwischen Metaansicht und normaler Ansicht umschalten" });
+define({
+	"button.switch-metaview.tooltip": "Zwischen Metaansicht und normaler Ansicht umschalten"
+});

data/vendor/assets/javascripts/aloha/plugins/extra/metaview/nls/i18n.js

@@ -1,5 +1,12 @@
 define({
-	root: { "button.switch-metaview.tooltip": "Switch between meta and normal view" },
-	"de":true,
-	"en":true
-});
+	"root":  {
+		"button.switch-metaview.tooltip": "Switch between meta and normal view"
+	},
+		"ca": true,
+		"de": true,
+		"mk": true,
+		"pt-br": true,
+		"ru": true,
+		"uk": true,
+		"zh-hans": true
+});

data/vendor/assets/javascripts/aloha/plugins/extra/metaview/nls/mk/i18n.js

@@ -0,0 +1,3 @@
+define({
+	"button.switch-metaview.tooltip": "Промени помеѓу мета и нормален поглед"
+});

data/vendor/assets/javascripts/aloha/plugins/extra/metaview/nls/pt-br/i18n.js

@@ -0,0 +1,3 @@
+define({
+	"button.switch-metaview.tooltip": "Alternar entre visão meta e normal"
+});

data/vendor/assets/javascripts/aloha/plugins/extra/metaview/nls/ru/i18n.js

@@ -0,0 +1,3 @@
+define({
+	"button.switch-metaview.tooltip": "Переключение между мета- и нормальным видом"
+});

data/vendor/assets/javascripts/aloha/plugins/extra/metaview/nls/uk/i18n.js

@@ -0,0 +1,3 @@
+define({
+	"button.switch-metaview.tooltip": "Перемикання між мета- та звичайним виглядом"
+});

data/vendor/assets/javascripts/aloha/plugins/extra/metaview/nls/zh-hans/i18n.js

@@ -0,0 +1,3 @@
+define({
+	"button.switch-metaview.tooltip": "在元视图和普通视图之间切换"
+});

data/vendor/assets/javascripts/aloha/plugins/extra/numerated-headers/css/numerated-headers.css

@@ -4,4 +4,4 @@
 * aloha-sales@gentics.com
 * Licensed unter the terms of http://www.aloha-editor.com/license.html
 */
-button.aloha-button-numerated-headers { background: url(../img/headers.png) no-repeat 0px 0px !important; }
+.aloha-icon-numerated-headers { background: url(../img/headers.png) no-repeat 0px 0px !important; }

data/vendor/assets/javascripts/aloha/plugins/extra/numerated-headers/lib/numerated-headers-plugin.js

@@ -1,233 +1,421 @@
-/*!
-* 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/jquery','aloha/plugin', 'aloha/floatingmenu', 'i18n!numerated-headers/nls/i18n', 'i18n!aloha/nls/i18n','css!numerated-headers/css/numerated-headers.css',],
-function(jQuery, Plugin, FloatingMenu, i18n, i18nCore) {
-	
-
-   var
-	$ = jQuery,
-	GENTICS = window.GENTICS,
-	Aloha = window.Aloha;
-	
-   return Plugin.create('numerated-headers', {
-     
-	 numeratedactive : true,
-	 headingselector : 'h1, h2, h3, h4, h5, h6',
-	 
-     /**
-      * Initialize the plugin
-      */
-     init: function () {
-       var that = this;
-
-	   if ( typeof this.settings.numeratedactive !== 'undefined' ) {
-			this.numeratedactive = this.settings.numeratedactive;
-		}
+/* numerated-headers-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/core',
+	'jquery',
+	'aloha/plugin',
+	'ui/ui',
+	'ui/toggleButton',
+	'i18n!numerated-headers/nls/i18n',
+	'i18n!aloha/nls/i18n'
+], function (
+	Aloha,
+	$,
+	Plugin,
+	Ui,
+	ToggleButton,
+	i18n,
+	i18nCore
+) {
+	'use strict';
 
-	   // modifyable selector for the headers, that should be numerated
-	   if ( typeof this.settings.headingselector !== 'undefined' ) {
-			this.headingselector = this.settings.headingselector;
-		}
-	   // modifyable selector for the baseobject. Where should be numerated
-	   if ( typeof this.settings.baseobjectSelector !== 'undefined' ) {
-			this.baseobjectSelector = this.settings.baseobjectSelector;
-		}
-		
-       	    // add button to toggle format-less pasting
-          this.numeratedHeadersButton = new Aloha.ui.Button({
-            'iconClass' : 'aloha-button aloha-button-numerated-headers',
-            'size' : 'small',
-            'onclick' : function () {
-		   if(that.numeratedHeadersButton.isPressed()) {
-			//that.numeratedHeadersButton.setPressed(false);
-			that.removeNumerations();
-		   }
-		   else {
-			//that.numeratedHeadersButton.setPressed(true);
-			that.createNumeratedHeaders();
-		   }
-            },
-            'tooltip' : i18n.t('button.numeratedHeaders.tooltip'),
-            'toggle' : true,
-	    'pressed' : this.numeratedactive
-          });
-
-          FloatingMenu.addButton(
-            'Aloha.continuoustext',
-            this.numeratedHeadersButton,
-            i18nCore.t('floatingmenu.tab.format'),
-            1
-          );
-	   
-	  // We need to bind to selection-changed event to recognize backspace and delete interactions
-	  Aloha.bind( 'aloha-selection-changed', function ( event ) {
-	    if ( that.numeratedHeadersButton.isPressed() ) {
-		that.createNumeratedHeaders();
-	    }
-	  });
-     },
-
-	 removeNumerations : function () {
-		var active_editable_obj = this.getBaseElement();
-
-		if ( !active_editable_obj ) {
-			return;
-		}
+	/**
+	 * A cache of editable configuration.
+	 * @private
+	 * @type {object<string, object>}
+	 */
+	var editableConfigurations = {};
+
+	Aloha.bind('aloha-editable-destroyed', function (event, editable) {
+		delete editableConfigurations[editable.getId()];
+	});
+
+	return Plugin.create('numerated-headers', {
+		config: {
+			numeratedactive: true,
+			headingselector: 'h1, h2, h3, h4, h5, h6',
+			trailingdot: false
+		},
+
+		/**
+		 * Initialize the plugin.
+		 */
+		init: function () {
+			var that = this;
+
+			this._formatNumeratedHeadersButton = Ui.adopt('formatNumeratedHeaders',
+				ToggleButton, {
+					tooltip: i18n.t('button.numeratedHeaders.tooltip'),
+					icon: 'aloha-icon aloha-icon-numerated-headers',
+					scope: 'Aloha.continuoustext',
+					click: function () {
+						var buttonPressed = that._formatNumeratedHeadersButton.getState();
+						if (!buttonPressed) {
+							that.removeNumerations();
+						} else {
+							that.createNumeratedHeaders();
+						}
+					}
+				});
+
+
+			// We need to bind to smart-content-changed event to recognize
+			// backspace and delete interactions.
+			Aloha.bind('aloha-smart-content-changed', function (event) {
+				that.cleanNumerations();
+				if (that.showNumbers()) {
+					that.createNumeratedHeaders();
+				}
+			});
+			
+			// We need to listen to that event, when a block is formatted to
+			// header format. smart-content-changed would be not fired in 
+			// that case
+			Aloha.bind('aloha-format-block', function () {
+				that.cleanNumerations();
+				if (that.showNumbers()) {
+					that.createNumeratedHeaders();
+				}
+			});
+
+			Aloha.bind('aloha-editable-activated', function (event) {
+				if (that.isNumeratingOn()) {
+					that._formatNumeratedHeadersButton.show();
+					that.initForEditable(Aloha.activeEditable.obj);
+				} else {
+					that._formatNumeratedHeadersButton.hide();
+				}
+			});
+		},
+
+		/**
+		 * Init the toggle button (and numerating) for the current editable,
+		 * if not yet done.
+		 * If numerating shall be on by default and was not turned on, numbers
+		 * will be created.
+		 */
+		initForEditable: function ($editable) {
+			var flag = $editable.attr('aloha-numerated-headers');
+			if (flag !== 'true' && flag !== 'false') {
+				flag = (true === this.getCurrentConfig().numeratedactive) ? 'true' : 'false';
+				$editable.attr('aloha-numerated-headers', flag);
+			}
+
+			if (flag === 'true') {
+				this.createNumeratedHeaders();
+				this._formatNumeratedHeadersButton.setState(true);
+			} else {
+				this._formatNumeratedHeadersButton.setState(false);
+			}
+		},
 
-		var headers = active_editable_obj.find(this.headingselector);
-		headers.each( function() {
-			jQuery(this).find('span[role=annotation]').each(function(){jQuery(this).remove();});
-		});
-	 },
+		/**
+		 * Get the config for the current editable
+		 */
+		getCurrentConfig: function () {
+			var config = this.getEditableConfig(Aloha.activeEditable.obj);
+
+			// normalize config (set default values)
+			if (config.numeratedactive === true || config.numeratedactive === 'true' || config.numeratedactive === '1') {
+				config.numeratedactive = true;
+			} else {
+				config.numeratedactive = false;
+			}
 
-	getBaseElement: function() {
+			if (typeof config.headingselector !== 'string') {
+				config.headingselector = 'h1, h2, h3, h4, h5, h6';
+			}
+			config.headingselector = $.trim(config.headingselector);
 
-		if ( typeof this.baseobjectSelector !== 'undefined' ) {
-			if( jQuery(this.baseobjectSelector).length > 0 ) {
-				return jQuery(this.baseobjectSelector);
+			if (config.trailingdot === true || config.trailingdot === 'true' || config.trailingdot === '1') {
+				config.trailingdot = true;
 			} else {
+				config.trailingdot = false;
+			}
+
+			return config;
+		},
+
+		/**
+		 * Check whether numerating shall be possible in the current editable
+		 */
+		isNumeratingOn: function () {
+			return this.getCurrentConfig().headingselector !== '';
+		},
+
+		/**
+		 * Check whether numbers shall currently be shown in the current
+		 * editable.
+		 */
+		showNumbers: function () {
+			return (
+				Aloha.activeEditable &&
+				this.isNumeratingOn() &&
+				(Aloha.activeEditable.obj.attr('aloha-numerated-headers') === 'true')
+			);
+		},
+		
+		/**
+		 * Remove all annotations in the current editable.
+		 */
+		cleanNumerations: function () {
+			var that = this;
+			var active_editable_obj = this.getBaseElement();
+			if (!active_editable_obj) {
+				return;
+			}
+			this._saveRemoveAnnotations($(active_editable_obj).find('span[role=annotation]'));
+		},
+		
+		/**
+		 * Savely removes a jQuery collection of annotations.
+		 * @param annotationcollection the collection of annotations.
+		 */
+		_saveRemoveAnnotations: function (annotationcollection) {
+			var that = this;
+			var range = Aloha.Selection.getRangeObject();
+			var rangemod = false;
+			annotationcollection.each(function () {
+				if (range.startContainer === this || $.inArray(this, $(range.startContainer).parents()) > -1) {
+			        range.startContainer = that._prevNode(this);
+			        range.startOffset = 0;
+			        rangemod = true;
+				}
+				if (range.startContainer === this.parentNode && range.startOffset >= $(this).index() && range.startOffset > 0) {
+					range.startOffset --;
+					rangemod = true;
+				}
+				//Check if the selection ends inside the annotation
+				if (range.endContainer === this || $.inArray(this, $(range.endContainer).parents()) > -1) {
+					range.endContainer = that._prevNode(this);
+					range.endOffset = 0;
+					rangemod = true;
+				}
+				if (range.endContainer === this.parentNode && range.endOffset >= $(this).index() && range.endOffset > 0) {
+					range.endOffset --;
+					rangemod = true;
+				}
+				$(this).remove();
+			});
+			if (rangemod === true) {
+				range.update();
+				range.select();
+			}
+		},
+		
+		/**
+		 * Prepends the annotation to the given prependElement.
+		 */
+		_prependAnnotation: function (annotationcontent, prependElem) {
+			var range = Aloha.Selection.getRangeObject();
+			var rangemod = false;
+			if (range.startContainer === prependElem) {
+				range.startOffset ++;
+				rangemod = true;
+			}
+			if (range.endContainer === prependElem) {
+				range.endOffset ++;
+				rangemod = true;
+			}
+			$(prependElem).prepend('<span role="annotation">' +
+					annotationcontent + '</span>');
+			if (rangemod === true) {
+				range.update();
+				range.select();
+			}
+		},
+		
+		/**
+		 * Navigates to the previous node.
+		 */
+		_prevNode: function (node) {
+			var prev = node.previousSibling;
+			if (!prev) {
+				return node.parentNode;
+			}
+			while (prev.lastChild) {
+				prev = prev.lastChild;
+			}
+			return prev;
+		},
+		
+
+		/**
+		 * Removed and disables numeration for the current editable.
+		 */
+		removeNumerations : function () {
+			$(Aloha.activeEditable.obj).attr('aloha-numerated-headers', 'false');
+			this.cleanNumerations();
+		},
+
+		getBaseElement: function () {
+			if (typeof this.baseobjectSelector !== 'undefined') {
+				return ($(this.baseobjectSelector).length > 0) ?
+						$(this.baseobjectSelector) : null;
+			}
+			return Aloha.activeEditable ? Aloha.activeEditable.obj : null;
+		},
+
+		/*
+		* checks if the given Object contains a note Tag that looks like this:
+		* <span annotation=''>
+		*
+		* @param {HTMLElement} obj The DOM object to check.
+		*/
+		hasNote: function (obj) {
+			if (!obj || $(obj).length <= 0) {
 				return false;
 			}
-		} else {
-			if ( typeof Aloha.activeEditable == "undefined" || Aloha.activeEditable == null ) {
-        			return false;
-        		} else {
-				return Aloha.activeEditable.obj;
+			return $(obj).find('span[role=annotation]').length > 0;
+		},
+
+		/*
+		* checks if the given Object has textual content.
+		* A possible "<span annotation=''>" tag will be ignored
+		*
+		* @param {HTMLElement} obj The DOM object to check
+		*/
+		hasContent: function (obj) {
+			if (!obj || 0 === $(obj).length) {
+				return false;
 			}
-		}
-	},
-
-
-	/*
-	* checks if the given Object contains a note Tag that looks like this:
-	* <span annotation=''>
-	*
-	* @param {Object} obj - The Object to check
-	*/
-     	hasNote: function(obj) {
-	
-		if(!obj || !jQuery(obj).length > 0){	
-			return false;
-		}
+			// we have to check the content of this object without the annotation span
+			var $objCleaned = $(obj).clone()
+			                        .find('span[role=annotation]')
+			                        .remove()
+			                        .end();
+			// check for text, also in other possible sub tags
+			return $.trim($objCleaned.text()).length > 0;
+		},
 
-		obj = jQuery(obj);
+		createNumeratedHeaders: function () {
+			var active_editable_obj = this.getBaseElement();
+			if (!active_editable_obj) {
+				return;
+			}
 
-		if( obj.find('span[role=annotation]').length > 0 ) {
-			return true;
-		}
+			var config = this.getCurrentConfig();
+			var headingselector = config.headingselector;
+			var headers = active_editable_obj.find(headingselector);
 
-		return false;
-	},
-
-	
-	/*
-	* checks if the given Object has textual content.
-	* A possible "<span annotation=''>" tag will be ignored
-	*
-	* @param {Object} obj - The Object to check
-	*/
-	hasContent: function(obj) {
-	
-		if( !obj || !jQuery(obj).length > 0 ) {	
-			return false;
-		}
+			Aloha.activeEditable.obj.attr('aloha-numerated-headers', 'true');
 
-		obj = jQuery(obj);
+			if (typeof headers === 'undefined' || headers.length === 0) {
+				return;
+			}
 
-		// we have to check the content of this object without the annotation span
-		var objCleaned = obj.clone().find('span[role=annotation]').remove().end();
+			// base rank is the lowest rank of all selected headers
+			var base_rank = 7;
+			var that = this;
+			headers.each(function () {
+				if (that.hasContent(this)) {
+					var current_rank = parseInt(this.nodeName.substr(1), 10);
+					if (current_rank < base_rank) {
+						base_rank = current_rank;
+					}
+				}
+			});
+			if (base_rank > 6) {
+				return;
+			}
+			var prev_rank = null,
+				current_annotation = [],
+				annotation_pos = 0,
+				i;
 
-		// check for text, also in other possible sub tags
-		if ( objCleaned.text().trim().length > 0 ) {
-			return true;
-		}
-	
-		return false;
-	},
-
-
-     createNumeratedHeaders: function() {
-
-	var active_editable_obj = this.getBaseElement();
-
-	if(!active_editable_obj){
-		return;
-	}
-	
-	var that = this;
-      
-        var headers = active_editable_obj.find(this.headingselector);
-
-		if ( typeof headers == "undefined" || headers.length == 0 ) {
-           return;
-      }
-
-      var base_rank = parseInt(headers[0].nodeName.substr(1));
-      var prev_rank = null;
-      var current_annotation = [];
-      var annotation_pos = 0;
-
-      // initialize the base annotations
-      for ( var i=0; i < (6 - base_rank) + 1; i++ ) {
-          current_annotation[i] = 0; 
-      }
-      
-      headers.each(function(){
-	// build and count annotation only if there is content in this header
-	if( that.hasContent(this) ) {
-
-       		var current_rank = parseInt(this.nodeName.substr(1));
-        	if( prev_rank == null ){
-          		//increment the main annotation 
-          		current_annotation[annotation_pos]++;
-        	}
-        	//starts a sub title
-        	else if ( current_rank > prev_rank ) {
-          		current_annotation[++annotation_pos]++; 
-        	}
-        	//continues subtitles
-        	else if ( current_rank == prev_rank ) {
-          		current_annotation[annotation_pos]++; 
-        	}
-        	//goes back to a main title
-        	else if ( current_rank < prev_rank ) {
-          		var current_pos = current_rank - base_rank;
-          		for( var j=annotation_pos; j > (current_pos); j-- ){
-            			current_annotation[j] = 0; //reset current sub-annotation
-          		}
-          		annotation_pos = current_pos;
-          		current_annotation[annotation_pos]++; 
-        	}
-
-        	prev_rank = current_rank;
-
-        	var annotation_result = current_annotation[0];
-        	for( var i = 1; i < current_annotation.length; i++ ){
-          		if(current_annotation[i] != 0){
-             			annotation_result += ("." + current_annotation[i]); 
-          		} 
-        	}
-	
-		if ( that.hasNote(this) ) {
-			jQuery(this).find('span[role=annotation]').html(annotation_result); 
-		} else {
-			jQuery(this).prepend("<span role='annotation'>" + annotation_result + "</span> ");
-		}
-	} else {
-		// no Content, so remove the Note, if there is one
-		if ( that.hasNote(this) ) {
-			jQuery(this).find('span[role=annotation]').remove();
-		}
-		
-	}
+			// initialize the base annotations
+			for (i = 0; i < (6 - base_rank) + 1; i++) {
+				current_annotation[i] = 0;
+			}
+
+			headers.each(function () {
+				// build and count annotation only if there is content in this header
+				if (that.hasContent(this)) {
 
-      })
-     }
-     
-   });
+					var current_rank = parseInt(this.nodeName.substr(1), 10);
+					if (prev_rank === null && current_rank !== base_rank) {
+						// when the first found header has a rank
+						// different from the base rank, we omit it
+						that._saveRemoveAnnotations($(this).find('span[role=annotation]'));
+						return;
+					} else if (prev_rank === null) {
+						// increment the main annotation
+						current_annotation[annotation_pos]++;
+					} else if (current_rank > prev_rank) {
+						// starts a sub title
+						current_annotation[++annotation_pos]++;
+					} else if (current_rank === prev_rank) {
+						// continues subtitles
+						current_annotation[annotation_pos]++;
+					} else if (current_rank < prev_rank) {
+						//goes back to a main title
+						var current_pos = current_rank - base_rank;
+						var j;
+						for (j = annotation_pos; j > (current_pos); j--) {
+							current_annotation[j] = 0; //reset current sub-annotation
+						}
+						annotation_pos = current_pos;
+						current_annotation[annotation_pos]++;
+					}
+
+					prev_rank = current_rank;
+
+					var annotation_result = '', i;
+					if (config.trailingdot === true) {
+						annotation_result = '';
+						for (i = 0; i < current_annotation.length; i++) {
+							if (current_annotation[i] !== 0) {
+								annotation_result += (current_annotation[i] + '.');
+							}
+						}
+					} else {
+						annotation_result = current_annotation[0];
+						for (i = 1; i < current_annotation.length; i++) {
+							if (current_annotation[i] !== 0) {
+								annotation_result += ('.' + current_annotation[i]);
+							}
+						}
+					}
+					//We add a trailing non-breakable space to the annotation_result
+					//to separate the annotation from the heading's text.
+					annotation_result += '&nbsp;';
+					if (that.hasNote(this)) {
+						$(this).find('span[role=annotation]').html(annotation_result);
+					} else {
+						
+						that._prependAnnotation(annotation_result, this);
+					}
+				} else {
+					// no Content, so remove the Note, if there is one
+					if (that.hasNote(this)) {
+						that._saveRemoveAnnotations($(this).find('span[role=annotation]'));
+					}
+				}
+			});
+		}
+	});
 });