locomotive-aloha-rails 0.23.2.1 → 0.23.2.2

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

@@ -42,14 +42,8 @@
 	padding-bottom: 5px;
 }
 
-.aloha-link-title-container fieldset  input[type=text]{
-	width:auto !important;
-	min-width:180px;
-}
-
-.aloha-link-target-container fieldset  input[type=text]{
-	width:auto !important;
-	min-width:180px;
+.aloha-link-target-container fieldset input[type=text], .aloha-link-title-container fieldset input[type=text] {
+	width: 90%;
 }
 
 .x-form-field.x-form-text.aloha-link-href-field {

data/vendor/assets/javascripts/aloha/plugins/common/table/lib/table-cell.js

@@ -62,6 +62,13 @@ function (jQuery, Utils) {
 
 		// attach events to the editable div-object
 		$wrapper.bind('focus', function ($event) {
+			// activate the button for splitting cells if the clicked cell has an active row- or colspan
+			if (Utils.colspan(cell.obj) > 1 || Utils.rowspan(cell.obj) > 1) {
+				cell.tableObj.tablePlugin._splitcellsButton.enable(true);
+			} else {
+				cell.tableObj.tablePlugin._splitcellsButton.enable(false);
+			}
+
 			// ugly workaround for ext-js-adapter problem in
 			// ext-jquery-adapter-debug.js:1020
 			if ($event.currentTarget) {

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

@@ -229,6 +229,96 @@ define([
 		return null;
 	}
 
+	/**
+	 * Sets the currently selected elements as headers of the table, or removes header-status
+	 * if the whole selection is already used as a header
+	 *
+	 * @param {Aloha.Table} table the table-object for which the headers are to be set
+	 * @param {string} scope for which the header should be used (i.e. 'row' or 'column')
+	 */
+	function toggleHeaderStatus(table, scope) {
+		var	i,
+			j,
+			allHeaders = table.selection.isHeader(),
+			domCell, // representation of the cell in the dom
+			tableCell, // table-cell object
+			bufferCell; // temporary buffer
+
+		for (i = 0; i < table.selection.selectedCells.length; i++) {
+			domCell = table.selection.selectedCells[i];
+
+			// tries to match the current cell with a cell-object in the table
+			for (j = 0; j < table.cells.length; j++) {
+				if (domCell === table.cells[j].obj[0]) {
+					cell = table.cells[j];
+					break;
+				}
+			}
+
+			// the transformed dom objects are first stored in a buffer, and only applied to
+			// the table-cell-object if a match was found
+			if (allHeaders) {
+				bufferCell = Aloha.Markup.transformDomObject(domCell, 'td').removeAttr('scope').get(0);
+			} else {
+				bufferCell = Aloha.Markup.transformDomObject(domCell, 'th').attr('scope', scope).get(0);
+			}
+
+			if (cell != null) {
+				// assign the changed dom-element to the table-cell
+				cell.obj[0] = bufferCell;
+
+				// reactivate the table cell in order to bind events to the changed dom object
+				// TODO: re-attaching event-handlers should be factored out into a utility function
+				// so we don't have to do the whole activation/deactivation process for the cells
+				cell.deactivate();
+				cell.activate();
+			}
+
+			// uncommented code-segment, presumably added to force IE to target the wrapper
+			// on mouse-down by applying a timeout after event propagation
+			jQuery(table.selection.selectedCells[i]).bind('mousedown', function (jqEvent) {
+				var wrapper = jQuery(this).children('div').eq(0);
+				window.setTimeout(function () {
+					wrapper.trigger( 'focus' );
+				}, 1);
+			});
+		}
+	}
+
+	/**
+	 * If the specified style is not already active in all selected cells, it is applied;
+	 * otherwise, it is removed from the cells
+	 *
+	 * @param {Array} config defined styles as defined in the configuration
+	 * @param {String} cssClass
+	 * @param {Array} sc the selection of target table cells
+	 */
+	function applyStyle(config, cssClass, sc) {
+		var appliedToAll = true;
+
+		for (var i = 0; i < sc.length; i++) {
+			if (jQuery(sc[i]).attr('class').indexOf(cssClass) < 0 ) {
+				appliedToAll = false;
+				break;
+			}
+		}
+
+		if (!appliedToAll) {
+			for (var i = 0; i < sc.length; i++) {
+				jQuery(sc[i]).addClass(cssClass);
+				for (var f = 0; f < config.length; f++) {
+					if (config[f].cssClass != cssClass) {
+						jQuery(sc[i]).removeClass(config[f].cssClass);
+					}
+				}
+			}
+		} else {
+			for (var i = 0; i < sc.length; i++) {
+				jQuery(sc[i]).removeClass(cssClass);
+			}
+		}
+	}
+
 	/**
 	 * Init method of the Table-plugin transforms all tables in the document
 	 *
@@ -551,8 +641,20 @@ define([
 			icon: "aloha-icon aloha-icon-splitcells",
 			scope: this.name + '.cell',
 			click: function() {
+				var activeCell;
 				if (TablePlugin.activeTable) {
-					TablePlugin.activeTable.selection.splitCells();
+					if (TablePlugin.activeTable.selection.selectedCells.length > 0) {
+						TablePlugin.activeTable.selection.splitCells();
+					} else {
+						// if there is currently no selection, the active cell is split instead
+						activeCell = TablePlugin.selectedOrActiveCells();
+						if (activeCell.length > 0) {
+							Utils.splitCell(activeCell, function () {
+								return TablePlugin.activeTable.newActiveCell().obj;
+							});
+							Aloha.trigger('aloha-table-selection-changed');
+						}
+					}
 				}
 			}
 		});
@@ -613,7 +715,7 @@ define([
 				click: function() {
 					if (that.activeTable) {
 						var tableObj = that.activeTable.obj;
-						tableObj.find('td').each(function() {
+						tableObj.find('td, th').each(function() {
 							jQuery(this).find('div').css('width', '');
 							jQuery(this).css('width', '');
 						});
@@ -678,44 +780,12 @@ define([
 			scope: this.name + '.row',
 			click: function() {
 				if (that.activeTable) {
-    				var selectedRowIdxs = that.activeTable.selection.selectedRowIdxs,
-    	  			cell,
-    	  			isHeader = that.activeTable.selection.isHeader(),
-    				allHeaders = true; // flag for header check
-
-    				// loop through selected cells, determine if any are not already headers
-    				for (var j = 0; j < that.activeTable.selection.selectedCells.length; j++) {
-    					cell = that.activeTable.selection.selectedCells[j];
-						if ( !isHeader ) {
-							allHeaders = false;
-							break;
-						}
-    				}
-
-    				// updated selected cells
-    				for (var j = 0; j < that.activeTable.selection.selectedCells.length; j++) {
-			    		cell = that.activeTable.selection.selectedCells[j];
-						if ( allHeaders ) {
-			        		cell = Aloha.Markup.transformDomObject( cell, 'td' ).removeAttr( 'scope' ).get(0);
-						} else {
-							cell = Aloha.Markup.transformDomObject( cell, 'th' ).attr( 'scope', 'col' ).get(0);
-						}
+					that.activeTable.refresh();
 
-						jQuery( that.activeTable.selection.selectedCells[j] ).bind( 'mousedown', function ( jqEvent ) {
-							var wrapper = jQuery(this).children('div').eq(0);
-							// lovely IE ;-)
-							window.setTimeout(function () {
-			            		wrapper.trigger( 'focus' );
-							}, 1);
-							// unselect cells
-						});
+					toggleHeaderStatus(that.activeTable, 'column');
 
-					}
-
-					// select the row
-					that.activeTable.refresh();
 					that.activeTable.selection.unselectCells();
-					that.activeTable.selection.selectRows( selectedRowIdxs );
+					that.activeTable.selection.selectRows(that.activeTable.selection.selectedRowIdxs);
 				}
 			}
 		});
@@ -730,22 +800,8 @@ define([
 				iconClass: 'aloha-icon aloha-row-layout ' + itemConf.iconClass,
 				click: function () {
 					if (that.activeTable) {
-						var sc = that.activeTable.selection.selectedCells;
-						// if a selection was made, transform the selected cells
-						for (var i = 0; i < sc.length; i++) {
-							if ( jQuery(sc[i]).attr('class').indexOf(itemConf.cssClass) > -1 ) {
-								jQuery(sc[i]).removeClass(itemConf.cssClass);
-							} else {
-								jQuery(sc[i]).addClass(itemConf.cssClass);
-								// remove all row formattings
-								for (var f = 0; f < that.rowConfig.length; f++) {
-									if (that.rowConfig[f].cssClass != itemConf.cssClass) {
-										jQuery(sc[i]).removeClass(that.rowConfig[f].cssClass);
-									}
-								}
+						applyStyle(that.rowConfig, itemConf.cssClass, that.activeTable.selection.selectedCells);
 
-							}
-						}
 						// selection could have changed.
 						that.activeTable.selectRows();
 					}
@@ -772,7 +828,7 @@ define([
 						// selection could have changed.
 						that.activeTable.selectRows();
 					}
- 				}
+				}
 			});
 		}
 
@@ -830,51 +886,18 @@ define([
 			}
 		});
 
-	    this._columnheaderButton = Ui.adopt("columnheader", ToggleButton, {
+		this._columnheaderButton = Ui.adopt("columnheader", ToggleButton, {
 			tooltip: i18n.t("button.columnheader.tooltip"),
 			icon: "aloha-icon aloha-icon-columnheader",
 			scope: this.name + '.column',
 			click: function() {
 				if (that.activeTable) {
-    				var
-    	  			selectedColumnIdxs = that.activeTable.selection.selectedColumnIdxs,
-    	  			cell,
-    	  			isHeader = that.activeTable.selection.isHeader(),
-    				allHeaders = true; // flag for header check
-
-    				// loop through selected cells, determine if any are not already headers
-    				for (var j = 0; j < that.activeTable.selection.selectedCells.length; j++) {
-    					cell = that.activeTable.selection.selectedCells[j];
-						if ( !isHeader ) {
-							allHeaders = false;
-							break;
-						}
-    				}
-
-    				// updated selected cells
-    				for (var j = 0; j < that.activeTable.selection.selectedCells.length; j++) {
-			    		cell = that.activeTable.selection.selectedCells[j];
-						if ( allHeaders ) {
-			        		cell = Aloha.Markup.transformDomObject( cell, 'td' ).removeAttr( 'scope' ).get(0);
-						} else {
-			        		cell = Aloha.Markup.transformDomObject( cell, 'th' ).attr( 'scope', 'row' ).get(0);
-						}
-
-						jQuery( that.activeTable.selection.selectedCells[j] ).bind( 'mousedown', function ( jqEvent ) {
-							var wrapper = jQuery(this).children('div').eq(0);
-							// lovely IE ;-)
-							window.setTimeout(function () {
-			            		wrapper.trigger( 'focus' );
-							}, 1);
-							// unselect cells
-						});
+					that.activeTable.refresh();
 
-					}
+					toggleHeaderStatus(that.activeTable, 'row');
 
-					// select the column
-					that.activeTable.refresh();
 					that.activeTable.selection.unselectCells();
-					that.activeTable.selection.selectColumns( selectedColumnIdxs );
+					that.activeTable.selection.selectColumns(that.activeTable.selection.selectedColumnIdxs);
 				}
 			}
 		});
@@ -889,21 +912,8 @@ define([
 				iconClass : 'aloha-icon aloha-column-layout ' + itemConf.iconClass,
 				click	  : function (x,y,z) {
 					if (that.activeTable) {
-						var sc = that.activeTable.selection.selectedCells;
-						// if a selection was made, transform the selected cells
-						for (var i = 0; i < sc.length; i++) {
-							if ( jQuery(sc[i]).attr('class').indexOf(itemConf.cssClass) > -1 ) {
-								jQuery(sc[i]).removeClass(itemConf.cssClass);
-							} else {
-								jQuery(sc[i]).addClass(itemConf.cssClass);
-								// remove all column formattings
-								for (var f = 0; f < that.columnConfig.length; f++) {
-									if (that.columnConfig[f].cssClass != itemConf.cssClass) {
-										jQuery(sc[i]).removeClass(that.columnConfig[f].cssClass);
-									}
-								}
-							}
-						}
+						applyStyle(that.columnConfig, itemConf.cssClass, that.activeTable.selection.selectedCells);
+
 						// selection could have changed.
 						that.activeTable.selectColumns();
 					}
@@ -960,22 +970,7 @@ define([
 				iconClass : 'aloha-icon aloha-column-layout ' + itemConf.iconClass,
 				click	  : function (x,y,z) {
 					if (that.activeTable) {
-						var sc = that.selectedOrActiveCells();
-
-						// if a selection was made, transform the selected cells
-						for (var i = 0; i < sc.length; i++) {
-							if ( jQuery(sc[i]).attr('class').indexOf(itemConf.cssClass) > -1 ) {
-								jQuery(sc[i]).removeClass(itemConf.cssClass);
-							} else {
-								jQuery(sc[i]).addClass(itemConf.cssClass);
-								// remove all column formattings
-								for (var f = 0; f < that.cellConfig.length; f++) {
-									if (that.cellConfig[f].cssClass != itemConf.cssClass) {
-										jQuery(sc[i]).removeClass(that.cellConfig[f].cssClass);
-									}
-								}
-							}
-						}
+						applyStyle(that.cellConfig, itemConf.cssClass, that.selectedOrActiveCells());
 
 						that.setActiveCellStyle();
 					}
@@ -1066,10 +1061,18 @@ define([
 				click: function(){
 					// set table css class
 					if (that.activeTable) {
-						for (var f = 0; f < tableConfig.length; f++) {
-							that.activeTable.obj.removeClass(tableConfig[f].cssClass);
+						if (!that.activeTable.obj.hasClass(itemConf.cssClass)) {
+							for (var f = 0; f < tableConfig.length; f++) {
+								that.activeTable.obj.removeClass(tableConfig[f].cssClass);
+							}
+							that.activeTable.obj.addClass(itemConf.cssClass);
+							that.tableMSButton.setActiveItem(itemConf.cssClass);
+						} else {
+							for (var f = 0; f < tableConfig.length; f++) {
+								that.activeTable.obj.removeClass(tableConfig[f].cssClass);
+							}
+							that.tableMSButton.setActiveItem();
 						}
-						that.activeTable.obj.addClass(itemConf.cssClass);
 					}
 				}
 			});
@@ -1088,6 +1091,7 @@ define([
 						for (var f = 0; f < tableConfig.length; f++) {
 							that.activeTable.obj.removeClass(that.tableConfig[f].cssClass);
 						}
+						that.tableMSButton.setActiveItem();
 					}
 				}
 			});
@@ -1437,23 +1441,37 @@ define([
 		}
 	};
 
+	/**
+	 * Set the cell-style to match the active item, if all selected cells have the same style
+	 * TODO: Algorithm very similar to setActiveStyle in table.js, should be refactored
+	 */
 	TablePlugin.setActiveCellStyle = function() {
 		var that = this;
+		var allSelected = false;
+		var className;
 
 		// reset any selected cell styles
 		this.cellMSButton.setActiveItem();
 
 		var selectedCells = that.selectedOrActiveCells();
 
-		jQuery( selectedCells ).each( function() {
-			for (var k = 0; k < that.cellConfig.length; k++) {
-				if ( jQuery(this).hasClass(that.cellConfig[k].cssClass) ) {
-					that.cellMSButton.setActiveItem(that.cellConfig[k].name);
-					k = that.cellConfig.length;
-				}
+		for (var i = 0; i < that.cellConfig.length; i++) {
+			if (jQuery(selectedCells[0]).hasClass(that.cellConfig[i].cssClass) ) {
+				className = that.cellConfig[i].name;
+				allSelected = true;
+				break;
 			}
-		});
+		}
 
+		// if all selected cells have the same class, set it as active
+		jQuery(selectedCells).each(function(index) {
+			if (!jQuery(this).hasClass(className)) {
+				allSelected = false;
+			}
+		});
+		if (allSelected) {
+			this.cellMSButton.setActiveItem(className);
+		}
 	};
 
 	TablePlugin.selectedOrActiveCells = function() {

data/vendor/assets/javascripts/aloha/plugins/common/table/lib/table.js

@@ -195,6 +195,7 @@ define([
 		var table = tableObj.obj,
 
 			i,
+			j,
 		    row,
 		    rows = tableObj.getRows(),
 		    rowsNum = rows.length,
@@ -204,7 +205,7 @@ define([
 
 		    colsCount,
 		    maxColsCount = 0,
-		    cachedColsCounts = [],
+		    cachedColsCounts = [rowsNum],
 		    colsCountDiff,
 		    colSpan;
 
@@ -236,10 +237,23 @@ define([
 				colsCount += ( colSpan - 1 );
 			}
 
-			cachedColsCounts.push( colsCount );
+			// if a rowspan is set in the last element of the row, the row(s) below
+			// are supposed to have one less column for every colspan the element has
+			rowSpan = parseInt(cols.last().attr('rowspan'), 10);
+			if (rowSpan > 1) {
+				for (j = 1; j < rowSpan-1; j++) {
+					if (colSpan > 1) {
+						cachedColsCounts[i+j] += colSpan;
+					} else {
+						cachedColsCounts[i+j] += 1;
+					}
+				}
+			}
+
+			cachedColsCounts[i] += colsCount;
 
-			if ( colsCount > maxColsCount ) {
-				maxColsCount = colsCount;
+			if (cachedColsCounts[i] > maxColsCount) {
+				maxColsCount = cachedColsCounts[i];
 			}
 		}
 
@@ -254,6 +268,49 @@ define([
 		}
 	};
 
+	/**
+	 * If all of the selected cells have been set to the same predefined style,
+	 * then its style-button is toggled on. Otherwise, all style-buttons are toggled off.
+	 *
+	 * @param selectedCells the cells to be checked
+	 * @param config the list of styles as defined in the aloha-configuration
+	 * @param items the multisplit-toggle-items
+	 * @param button a multisplit-button
+	 *
+	 * @return void
+	 */
+	function setActiveStyle(selectedCells, config, items, button) {
+		var className;
+		var allSelected = false;
+
+		// activate all formatting buttons
+		for (var i = 0; i < items.length; i++) {
+			button.showItem(items[i].name);
+		}
+
+		// clear active style block
+		button.setActiveItem();
+
+		// select class of first element as reference
+		for (var i = 0; i < config.length; i++) {
+			if (jQuery(selectedCells[0]).hasClass(config[i].cssClass)) {
+				allSelected = true;
+				className = config[i].name;
+				break;
+			}
+		}
+
+		// if all selected cells have the same class, set it as active
+		jQuery(selectedCells).each(function(index) {
+			if (!jQuery(this).hasClass(className)) {
+				allSelected = false;
+			}
+		});
+		if (allSelected) {
+			button.setActiveItem(className);
+		}
+	}
+
 	/**
 	 * Transforms the existing dom-table into an editable aloha-table. In fact it
 	 * replaces the td-elements with equivalent TableCell-elements
@@ -1416,40 +1473,26 @@ define([
 	Table.prototype.selectColumns = function ( columns ) {
 		var columnsToSelect;
 
-		if ( columns ) {
+		if (columns) {
 			columnsToSelect = columns;
 		} else {
 			columnsToSelect = this.columnsToSelect;
 		}
 
-		// ====== BEGIN UI specific code - should be handled on event aloha-table-selection-changed by UI =======
-		// activate all column formatting button
-		for ( var i = 0; i < this.tablePlugin.columnMSItems.length; i++ ) {
-			this.tablePlugin.columnMSButton.showItem(this.tablePlugin.columnMSItems[i].name);
-		}
-
 		Scopes.setScope(this.tablePlugin.name + '.column');
-
+		this.selection.selectColumns(columnsToSelect);
 		this.tablePlugin._columnheaderButton.setState(this.selection.isHeader());
 
-		var rows = this.getRows();
+		// ====== BEGIN UI specific code - should be handled on event aloha-table-selection-changed by UI =======
 
-		// set the first class found as active item in the multisplit button
-		this.tablePlugin.columnMSButton.setActiveItem();
-		for (var k = 0; k < this.tablePlugin.columnConfig.length; k++) {
-			if ( jQuery(rows[0].cells[0]).hasClass(this.tablePlugin.columnConfig[k].cssClass) ) {
-				this.tablePlugin.columnMSButton.setActiveItem(this.tablePlugin.columnConfig[k].name);
-				k = this.tablePlugin.columnConfig.length;
-			}
-		}
+		setActiveStyle(this.selection.selectedCells, this.tablePlugin.columnConfig,
+				this.tablePlugin.columnMSItems,	this.tablePlugin.columnMSButton);
 
 		// ====== END UI specific code - should be handled by UI =======
 
 		// blur all editables within the table
 		this.obj.find('div.aloha-ui-table-cell-editable').blur();
 
-		this.selection.selectColumns( columnsToSelect );
-
 		this.selection.notifyCellsSelected();
 		this._removeCursorSelection();
 	};
@@ -1461,33 +1504,16 @@ define([
 	 */
 	Table.prototype.selectRows = function () {
 
-		// activate all row formatting button
-		for (var i = 0; i < this.tablePlugin.rowMSItems.length; i++ ) {
-			this.tablePlugin.rowMSButton.showItem(this.tablePlugin.rowMSItems[i].name);
-		}
+		Scopes.setScope(this.tablePlugin.name + '.row');
+		this.selection.selectRows(this.rowsToSelect);
+		this.tablePlugin._rowheaderButton.setState(this.selection.isHeader());
 
-		for (var i = 0; i < this.rowsToSelect.length; i++) {
-			var rowId = this.rowsToSelect[i];
-			var rowCells = jQuery(this.getRows()[rowId].cells).toArray();
-			if (i == 0) {
-				// set the first class found as active item in the multisplit button
-				for (var j = 0; j < rowCells.length; j++) {
-					this.tablePlugin.rowMSButton.setActiveItem();
-					for ( var k = 0; k < this.tablePlugin.rowConfig.length; k++) {
-						if (jQuery(rowCells[j]).hasClass(this.tablePlugin.rowConfig[k].cssClass) ) {
-							this.tablePlugin.rowMSButton.setActiveItem(this.tablePlugin.rowConfig[k].name);
-							k = this.tablePlugin.rowConfig.length;
-						}
-					}
-				}
-			}
-		}
+		// ====== BEGIN UI specific code - should be handled on event aloha-table-selection-changed by UI =======
 
-		//    TableSelection.selectionType = 'row';
-		Scopes.setScope(this.tablePlugin.name + '.row');
+		setActiveStyle(this.selection.selectedCells, this.tablePlugin.rowConfig,
+				this.tablePlugin.rowMSItems, this.tablePlugin.rowMSButton);
 
-		this.selection.selectRows( this.rowsToSelect );
-		this.tablePlugin._rowheaderButton.setState(this.selection.isHeader());
+		// ====== END UI specific code - should be handled by UI =======
 
 		// blur all editables within the table
 		this.obj.find('div.aloha-ui-table-cell-editable').blur();
@@ -1532,6 +1558,10 @@ define([
 		// remove the "selection class" from all td and th in the table
 		this.obj.find('td, th').removeClass(this.get('classCellSelected'));
 		this.obj.find('td, th').removeClass('aloha-table-cell_active');
+
+		// remove cursor-styles
+		this.obj.find('td, th').css('cursor', '');
+
 		this.obj.unbind();
 		this.obj.children('tbody').unbind();