locomotive-aloha-rails 0.23.2.1 → 0.23.2.2

data/vendor/assets/javascripts/aloha/plugins/common/ui/lib/port-helper-attribute-field.js

@@ -218,7 +218,7 @@ define([
 
 		function changeTargetBackground() {
 			var target = $(targetObject);
-			if (target && targetHighlightClass) {
+			if (targetHighlightClass) {
 				target.addClass(targetHighlightClass);
 			}
 
@@ -232,7 +232,7 @@ define([
 			restoreTargetBackground();
 
 			// set background color to give visual feedback which link is modified
-			if (target && target.context && target.context.style &&
+			if (target.context && target.context.style &&
 				target.context.style['background-color']) {
 				target.attr('data-original-background-color',
 							target.context.style['background-color']);
@@ -245,16 +245,12 @@ define([
 			if (targetHighlightClass) {
 				target.removeClass(targetHighlightClass);
 			}
-			if (noTargetHighlight || !target) {
+			if (noTargetHighlight) {
 				return;
 			}
 			// Remove the highlighting and restore original color if was set before
 			var color = target.attr('data-original-background-color');
-			if (color) {
-				target.css('background-color', color);
-			} else {
-				target.css('background-color', '');
-			}
+			target.css('background-color', color || '');
 			if (!target.attr('style')) {
 				target.removeAttr('style');
 			}

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

@@ -43,5 +43,6 @@ define({
 	"tab.table.label": "Tabelle",
 	"tab.col.label": "Tabellenspalte",
 	"tab.row.label": "Tabellenzeile",
+	"tab.cell.label": "Tabellenzelle",
 	"tab.wai-lang.label": "Sprachauszeichnung"
 });

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

@@ -37,13 +37,3 @@ box-shadow: 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 7px 0 rgba(0, 0, 0, 0.8) ins
 .aloha-cite-panel-btns button {
 	width: 100%;
 }
-
-.aloha-cite-panel-field input,
-.aloha-cite-panel-field textarea {
-	width: 190px;
-	padding: 5px;
-	color: #555;
-	font-family: Arial, sans-serif;
-	font-size: 12px;
-	line-height: 1em;
-}

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

@@ -226,16 +226,16 @@ define([
 						var additionalReferenceContainer = '';
 						
 						if (citePlugin.referenceContainer) {
-							additionalReferenceContainer = '<div class="{panel-label}">Note:</div> ' +
+							additionalReferenceContainer = '<label class="{panel-label}" for="{note-field}-textarea">Note</label> ' +
 															'<div class="{panel-field} {note-field}" ' +
 															'style="margin: 5px;">' +
-															'<textarea></textarea></div>';
+															'<textarea id="{note-field}-textarea"></textarea></div>';
 						}
 						
 						var content = this.setContent(renderTemplate(
-								'<div class="{panel-label}">Link:</div>' +
+								'<label class="{panel-label}" for="{link-field}-input">Link</label>' +
 								'<div class="{panel-field} {link-field}" ' + 
-								'style="margin: 5px;"><input type="text" /></div>' +
+								'style="margin: 5px;"><input type="text" id="{link-field}-input" /></div>' +
 								additionalReferenceContainer
 							)).content;
 

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

@@ -25,20 +25,19 @@
  * recipients can access the Corresponding Source.
  */
 define([
+	'aloha',
 	'jquery',
 	'aloha/plugin',
-	'i18n!headerids/nls/i18n',
-	'i18n!aloha/nls/i18n'
-],
-function(jQuery, Plugin, i18n, i18nCore) {
-	"use strict";
-
-	var
-		$ = jQuery,
-		GENTICS = window.GENTICS,
-		Aloha = window.Aloha;
-
+	'i18n!headerids/nls/i18n'
+], function (
+	Aloha,
+	jQuery,
+	Plugin,
+	i18n
+) {
+	'use strict';
 
+	var $ = jQuery;
 
 	// namespace prefix for this plugin
     var ns = 'aloha-headerids';
@@ -61,7 +60,30 @@ function(jQuery, Plugin, i18n, i18nCore) {
         $.each(arguments, function () { strBldr.push(this == '' ? prx : prx + '-' + this); });
         return jQuery.trim(strBldr.join(' '));
     };
-    
+
+	/**
+	 * Returns a jQuery collection of all heading elements in the given editable
+	 * which are safe to have their ids automatically set.
+	 *
+	 * Do not include heading elements which are annotated with the class
+	 * "aloha-customized" because these have had their ids manually set.
+	 *
+	 * Do not include heading elements which are Aloha editables or blocks because
+	 * implementations often use the ids of these elements to track them in the
+	 * DOM.
+	 *
+	 * @param {jQuery.<HTMLElement>} $editable
+	 * @return {jQuery.<HTMLHeadingElement>} A jQuery container with a
+	 *                                       collection of zero or more heading
+	 *                                       elements.
+	 */
+	function getHeadingElements($element) {
+		return (
+			$element.find('h1,h2,h3,h4,h5,h6')
+			        .not('.aloha-customized,.aloha-editable,.aloha-block')
+		);
+	}
+
 	return Plugin.create('headerids', {
 		_constructor: function(){
 			this._super('headerids');
@@ -86,31 +108,61 @@ function(jQuery, Plugin, i18n, i18nCore) {
 				that.initSidebar(Aloha.Sidebar.right);
 			});
 		},
-		
-		check: function(editable) {
-			var that = this;
-			var config = that.getEditableConfig(editable);
 
-			if(jQuery.inArray('true',config) === -1) {
-				// Return if the plugin should do nothing in this editable
-				return false;
+		/**
+		 * Automatically sets the id attribute of heading elements in the given
+		 * editable element wherever it is safe to do so.
+		 *
+		 * @TODO: This function should be removed from being a plugin method and
+		 *        made a local closure function.
+		 *
+		 * @TODO: Rename to setHeadingIds()
+		 *
+		 * @param {jQuery.<HTMLElement>} $editable
+		 */
+		check: function($editable) {
+			var plugin = this;
+			if($.inArray('true', plugin.getEditableConfig($editable)) > -1) {
+				getHeadingElements($editable).each(function (i, heading) {
+					plugin.processH(heading);
+				});
 			}
-
-			jQuery(editable).find('h1, h2, h3, h4, h5, h6').not('.aloha-customized').each(function(){ 
-				that.processH(this); 
-			});
-
 		},
-		
-		processH: function(h) {
-			var that = this;
-			jQuery(h).attr('id',that.sanitize(jQuery(h).text()));
+
+		/**
+		 * Automatically sets the id of the given heading element to a sanitized
+		 * version of the element's content text string.
+		 *
+		 * @TODO: Rename to setHeadingId()
+		 *
+		 * @TODO: Make this function a local closure function rather than a
+		 *        plugin method.
+		 *
+		 * @param {HTMLHeadingElement} heading One of the six HTML heading
+		 *                                     elements.
+		 */
+		processH: function (heading) {
+			var $heading = $(heading);
+			$heading.attr('id', this.sanitize($heading.text()));
 		},
-				
-		sanitize: function(str) {
-			return (str.replace(/[^a-z0-9]+/gi,'_'));
+
+		/**
+		 * Tranforms the given string into a ideal HTMLElement id attribute
+		 * string by replacing non-alphanumeric characters with an underscore.
+		 *
+		 * @TODO: This method should be removed from being a plugin method and
+		 *        made into a local closure function.
+		 *
+		 * @TODO: The regular expression should be defined once (as a constant)
+		 *        outside of the scope of this function.
+		 *
+		 * @param {String} str
+		 * @return {String} Santized copy of `str`.
+		 */
+		sanitize: function (str) {
+			return str.replace(/[^a-z0-9]+/gi, '_');
 		},
-		
+
 		//ns = headerids
 		initSidebar: function(sidebar) {
 			var pl = this;

data/vendor/assets/javascripts/aloha/plugins/extra/numerated-headers/nls/de/i18n.js

@@ -1,5 +1,6 @@
 define({
 	"headerids.label.target": "Ziel",
 	"headerids.button.reset": "Zurücksetzen",
-	"headerids.button.set": "Setzen"
+	"headerids.button.set": "Setzen",
+	"button.numeratedHeaders.tooltip": "Nummerierung von Überschriften umschalten"
 });

data/vendor/assets/javascripts/aloha/plugins/extra/numerated-headers/nls/i18n.js

@@ -2,7 +2,8 @@ define({
 	"root":  {
 		"headerids.label.target": "Target",
 		"headerids.button.reset": "Reset",
-		"headerids.button.set": "Set"
+		"headerids.button.set": "Set",
+		"button.numeratedHeaders.tooltip": "Toggle header numeration"
 	},
 		"ca": true,
 		"de": true,

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: locomotive-aloha-rails
 version: !ruby/object:Gem::Version
+  version: 0.23.2.2
   prerelease: 
-  version: 0.23.2.1
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.13
-  name: actionpack
+  type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.2
-  name: rake
+  type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
@@ -120,6 +120,7 @@ files:
 - vendor/assets/javascripts/aloha/lib/require.js
 - vendor/assets/javascripts/aloha/lib/text.js
 - vendor/assets/javascripts/aloha/lib/util/arrays.js
+- vendor/assets/javascripts/aloha/lib/util/boundary-markers.js
 - vendor/assets/javascripts/aloha/lib/util/browser.js
 - vendor/assets/javascripts/aloha/lib/util/class.js
 - vendor/assets/javascripts/aloha/lib/util/dom.js
@@ -882,19 +883,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: -1843757229484811642
-      version: '0'
+      hash: 558321058196106502
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: -1843757229484811642
-      version: '0'
+      hash: 558321058196106502
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23