locomotive-aloha-rails 0.20.1.2 → 0.20.1.3

data/vendor/assets/javascripts/aloha/plugins/common/image/vendor/jcrop/jquery.jcrop.css

@@ -19,6 +19,17 @@
 	*height: 9px;
 }
 
+.cnr-crop-apply {
+	background-image: url(../../img/crop-buttons.gif) !important;
+	background-position: -2px -2px !important;
+}
+
+
+.cnr-crop-cancel {
+	background-image: url(../../img/crop-buttons.gif) !important;
+	background-position: 23px -2px !important;
+}
+
 .jcrop-tracker { width: 100%; height: 100%; }
 
 .custom .jcrop-vline,

data/vendor/assets/javascripts/aloha/plugins/common/link/extra/linklist.js

@@ -48,6 +48,13 @@ function ( Aloha, jQuery ) {
 		 * additional properties to the items
 		 */
 		init: function () {
+
+                        if ( typeof Aloha.settings.repositories !== 'undefined'
+                                        && typeof Aloha.settings.repositories.linklist !== 'undefined' 
+					&& typeof Aloha.settings.repositories.linklist.data !== 'undefined' ) {
+                                urlset = Aloha.settings.repositories.linklist.data;
+                        }
+
 			// Add ECMA262-5 Array method filter if not supported natively.
 			// But we will be very conservative and add to this single array
 			// object so that we do not tamper with the native Array prototype
@@ -69,11 +76,6 @@ function ( Aloha, jQuery ) {
 				};
 			}
 			
-			if ( typeof Aloha.settings.repositories != 'undefined' 
-					&& typeof Aloha.settings.repositories.linklist.data != 'undefined' ) {
-				urlset = Aloha.settings.repositories.linklist.data;
-			}
-			
 			var l = urlset.length;
 			
 			// generate folder structure
@@ -224,4 +226,4 @@ function ( Aloha, jQuery ) {
 		
 	} ) )();
 
-} );
+} );

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

@@ -272,10 +272,8 @@ define( [
 					foundMarkup = that.findLinkMarkup( rangeObject );
 					
 					if ( foundMarkup ) {
-						that.insertLinkButton.hide();
-						that.formatLinkButton.setPressed( true );
-						FloatingMenu.setScope( 'link' );
-
+						that.toggleLinkScope( true );
+						
 						// remember the current tab selected by the user
 						var currentTab = FloatingMenu.userActivatedTab;
 
@@ -306,9 +304,11 @@ define( [
 								}
 							}, 200 );
 						}
+						Aloha.trigger( 'aloha-link-selected' );
 					} else {
-						that.formatLinkButton.setPressed( false );
+						that.toggleLinkScope( false );
 						that.hrefField.setTargetObject( null );
+						Aloha.trigger( 'aloha-link-unselected' );
 					}
 				}
 				
@@ -316,6 +316,25 @@ define( [
 			} );
 		},
 
+		/**
+		 * lets you toggle the link scope to true (link buttons are visible)
+		 * or false (link buttons are hidden)
+		 * @param show bool true to show link buttons, false otherwise
+		 */
+		toggleLinkScope: function ( show ) {
+			if ( show ) {
+				this.insertLinkButton.hide();
+				this.hrefField.show();
+				this.removeLinkButton.show();
+				this.formatLinkButton.setPressed( true );
+			} else {
+				this.insertLinkButton.show();
+				this.hrefField.hide();
+				this.removeLinkButton.hide();
+				this.formatLinkButton.setPressed( false );
+			}
+		},
+		
 		/**
 		 * Add event handlers to the given link object
 		 * @param link object
@@ -393,9 +412,6 @@ define( [
 				1
 			);
 			
-			// add the new scope for links
-			FloatingMenu.createScope( 'link', 'Aloha.continuoustext' );
-			
 			this.hrefField = new Aloha.ui.AttributeField( {
 				'name': 'href',
 				'width': 320,
@@ -406,7 +422,7 @@ define( [
 			this.hrefField.setObjectTypeFilter( this.objectTypeFilter );
 			// add the input field for links
 			FloatingMenu.addButton(
-				'link',
+				'Aloha.continuoustext',
 				this.hrefField,
 				i18n.t( 'floatingmenu.tab.link' ),
 				1
@@ -422,7 +438,7 @@ define( [
 			} );
 			// add a button for removing the currently set link
 			FloatingMenu.addButton(
-				'link',
+				'Aloha.continuoustext',
 				this.removeLinkButton,
 				i18n.t( 'floatingmenu.tab.link' ),
 				1

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

@@ -1 +1,5 @@
-define({"button.createulist.tooltip":"Unsortierte Liste einf\u00fcgen","button.createolist.tooltip":"Sortierte Liste einf\u00fcgen"});
+define({"button.createulist.tooltip":"Unsortierte Liste einf\u00fcgen",
+"button.createolist.tooltip":"Sortierte Liste einf\u00fcgen",
+"button.indentlist.tooltip":"Liste niedriger schieben",
+"button.outdentlist.tooltip":"Liste h\u00F6her schieben",
+"floatingmenu.tab.list":"Liste"});

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

@@ -84,8 +84,6 @@ function ( Aloha, Plugin, jQuery, Commands, console ) {
 				pasteDivContents = pasteDivContents.substring( 6 );
 			}
 			
-			pasteDivContents = jQuery.trim( pasteDivContents );
-			
 			// Detects a situation where we are about to paste into a selection
 			// that looks like this: <p> [</p>...
 			// The nbsp inside the <p> node was placed there to make the empty
@@ -142,7 +140,7 @@ function ( Aloha, Plugin, jQuery, Commands, console ) {
 			
 			jQuery( 'body' ).append( $pasteDiv );
 			
-			// subscribe to the event editableCreated to redirect paste events
+			// subscribe to the event aloha-editable-created to redirect paste events
 			// into our hidden pasteDiv
 			// TODO: move to paste command
 			// http://support.mozilla.com/en-US/kb/Granting%20JavaScript%20access%20to%20the%20clipboard
@@ -186,8 +184,9 @@ function ( Aloha, Plugin, jQuery, Commands, console ) {
 						window.setTimeout( function () {
 							getPastedContent();
 							Aloha.activeEditable.smartContentChange( event );
-							event.stopPropagation();
 						}, 10 );
+						
+						event.stopPropagation();
 					} );
 				}
 			} );

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

@@ -115,7 +115,6 @@ function (jQuery, Utils) {
 			// Disabled the dragging of content, since it makes cell selection difficult
 			this.wrapper.get( 0 ).ondragstart = function () { return false };
 		}
-
 		return this;
 	};
 
@@ -126,14 +125,17 @@ function (jQuery, Utils) {
 	 * @return void
 	 */
 	TableCell.prototype.deactivate = function() {
-		var wrapper = this.obj.children('.aloha-table-cell-editable');
+		var wrapper = jQuery(this.obj.children('.aloha-table-cell-editable'));
 
 		if (wrapper.length) {
-			// get the inner html of the contenteditable div
-			var innerHtml = wrapper.html();
-
+			// unwrap cell contents without re-creating dom nodes
+			wrapper.parent().append(
+				wrapper.contents()
+			);
+			
 			// remove the contenteditable div and its attached events
 			wrapper.remove();
+			
 
 			// remove the click event of the
 			this.obj.unbind('click');
@@ -141,10 +143,6 @@ function (jQuery, Utils) {
 			if (jQuery.trim(this.obj.attr('class')) == '') {
 				this.obj.removeAttr('class');
 			}
-
-			// set the inner html of the contenteditable div as html for the table-data
-			// field
-			this.obj.html(innerHtml);
 		}
 	}
 
@@ -203,7 +201,7 @@ function (jQuery, Utils) {
 		this.hasFocus = false;
 
 		// remove "active class"
-		this.obj.removeClass('aloha-table-cell-active');
+		this.obj.removeClass('aloha-table-cell_active');
 	};
 
 	/**
@@ -228,20 +226,23 @@ function (jQuery, Utils) {
 	 */
 	TableCell.prototype._startCellSelection = function(){
 		if(!this.tableObj.selection.cellSelectionMode){
-
+			
 			//unselect currently selected cells
 			this.tableObj.selection.unselectCells();
 
 			// activate cell selection mode
 			this.tableObj.selection.cellSelectionMode = true; 
-
+			
 			//bind a global mouseup event handler to stop cell selection
 			var that = this;
 			jQuery('body').bind('mouseup.cellselection', function(){
 				that._endCellSelection();
+				
 			});
 
 			this.tableObj.selection.baseCellPosition = [this._virtualY(), this._virtualX()];
+			
+			
 		}
 	};
 

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

@@ -156,6 +156,32 @@ define( [
 					0 !== TablePlugin.activeTable.selection.selectedCells.length ) {
 				TablePlugin.updateFloatingMenuScope();
 			}
+
+			// check if selected cells are split/merge able and set button status
+			if ( typeof TablePlugin.activeTable !== 'undefined' &&
+				TablePlugin.activeTable.selection ) {
+
+				if ( TablePlugin.activeTable.selection.cellsAreSplitable() ) {
+					that.btnSplitcells.enable();
+					that.btnRowsplitcells.enable();
+					that.btnTablesplitcells.enable();
+				} else {
+					that.btnSplitcells.disable();
+					that.btnRowsplitcells.disable();
+					that.btnTablesplitcells.disable();
+				}
+
+				if ( TablePlugin.activeTable.selection.cellsAreMergeable() ) {
+					that.btnMergecells.enable();
+					that.btnRowmergecells.enable();
+					that.btnTablemergecells.enable();
+				} else {
+					that.btnMergecells.disable();
+					that.btnRowmergecells.disable();
+					that.btnTablemergecells.disable();
+				}
+			}
+
 		});
 
 		Aloha.bind( 'aloha-selection-changed', function (event, rangeObject) {
@@ -200,6 +226,14 @@ define( [
 
 		// subscribe for the 'editableActivated' event to activate all tables in the editable
 		Aloha.bind( 'aloha-editable-activated', function (event, props) {
+			// disable all split / merge buttons
+			that.btnSplitcells.disable();
+			that.btnRowsplitcells.disable();
+			that.btnTablesplitcells.disable();
+			that.btnMergecells.disable();
+			that.btnRowmergecells.disable();
+			that.btnTablemergecells.disable();
+
 			props.editable.obj.find('table').each(function () {
 				// shortcut for TableRegistry
 				var tr = TablePlugin.TableRegistry;
@@ -576,10 +610,7 @@ define( [
 		  1
       );
     
-    	// Add merge/split cells buttons
-      FloatingMenu.addButton(
-		  this.name + '.row',
-		  new Aloha.ui.Button({
+	this.btnRowmergecells = new Aloha.ui.Button({
 			  'name' : 'rowmergecells',
 			  'iconClass' : 'aloha-button aloha-button-merge-cells',
 			  'size' : 'small',
@@ -590,14 +621,17 @@ define( [
 					  that.activeTable.selection.mergeCells();
 				  }
 			  }
-		  }),
+		  });
+
+		// Add merge/split cells buttons
+      FloatingMenu.addButton(
+		  this.name + '.row',
+		  this.btnRowmergecells,
 		  i18n.t('floatingmenu.tab.table'),
 		  1
       );
 
-      FloatingMenu.addButton(
-		  this.name + '.row',
-		  new Aloha.ui.Button({
+	this.btnRowsplitcells = new Aloha.ui.Button({
 			  'name' : 'rowsplitcells',
 			  'iconClass' : 'aloha-button aloha-button-split-cells',
 			  'size' : 'small',
@@ -608,7 +642,11 @@ define( [
 					  that.activeTable.selection.splitCells();
 				  }
 			  }
-		  }),
+		  });
+
+      FloatingMenu.addButton(
+		  this.name + '.row',
+		  this.btnRowsplitcells,
 		  i18n.t('floatingmenu.tab.table'),
 		  1
       );
@@ -626,16 +664,19 @@ define( [
 					  var sc = that.activeTable.selection.selectedCells;
 					  // if a selection was made, transform the selected cells
 					  for (var i = 0; i < sc.length; i++) {
-						  for (var j = 0; j < sc[i].length; j++) {
-							  // remove all row formattings
-							  for (var f = 0; f < that.rowConfig.length; f++) {
-								  jQuery(sc[i][j]).removeClass(that.rowConfig[f].cssClass);
-							  }
-							  // set new style 
-							  jQuery(sc[i][j]).addClass(itemConf.cssClass);
-						  }
+						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);
+								}
+							}
+							
+						}
 					  }
-					  
 					  // selection could have changed.
 					  that.activeTable.selectRows();
 				  }
@@ -651,21 +692,18 @@ define( [
 			  iconClass: 'aloha-button aloha-button-removeFormat',
 			  wide: true,
 			  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++) {
-						  for (var j = 0; j < sc[i].length; j++) {
-							  for (var f = 0; f < that.rowConfig.length; f++) {
-								  jQuery(sc[i][j]).removeClass(that.rowConfig[f].cssClass);
-							  }
-						  }
-					  }
-					  
-					  // selection could have changed.
-					  that.activeTable.selectRows();
-				  }
-			  }
+				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++) {
+						for (var f = 0; f < that.rowConfig.length; f++) {
+							jQuery(sc[i]).removeClass(that.rowConfig[f].cssClass);
+						}
+					}
+					// selection could have changed.
+					that.activeTable.selectRows();
+				}
+ 			  }
 		  });
       }
     
@@ -801,10 +839,7 @@ define( [
       1
     );
     
-    // Add merge/split cells buttons
-    FloatingMenu.addButton(
-      this.name + '.column',
-      new Aloha.ui.Button({
+	this.btnTablemergecells = new Aloha.ui.Button({
     	  	'name' : 'tablemergecells',
 			'iconClass' : 'aloha-button aloha-button-merge-cells',
 			'size' : 'small',
@@ -815,14 +850,17 @@ define( [
 					that.activeTable.selection.mergeCells();
 				}
 			}
-		}),
+		});
+	
+    // Add merge/split cells buttons
+    FloatingMenu.addButton(
+      this.name + '.column',
+      this.btnTablemergecells,
       i18n.t('floatingmenu.tab.table'),
       1
     );
 
-    FloatingMenu.addButton(
-      this.name + '.column',
-      new Aloha.ui.Button({
+	this.btnTablesplitcells = new Aloha.ui.Button({
     	  	'name' : 'tablesplitcells',
 			'iconClass' : 'aloha-button aloha-button-split-cells',
 			'size' : 'small',
@@ -833,7 +871,11 @@ define( [
 					that.activeTable.selection.splitCells();
 				}
 			}
-		}),
+		});
+
+    FloatingMenu.addButton(
+      this.name + '.column',
+      this.btnTablesplitcells,
       i18n.t('floatingmenu.tab.table'),
       1
     );
@@ -852,13 +894,16 @@ define( [
 				var sc = that.activeTable.selection.selectedCells;
 				// if a selection was made, transform the selected cells
 				for (var i = 0; i < sc.length; i++) {
-					for (var j = 0; j < sc[i].length; j++) {
-						// remove all columnformattings
+					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++) {
-							jQuery(sc[i][j]).removeClass(that.columnConfig[f].cssClass);
+							if (that.columnConfig[f].cssClass != itemConf.cssClass) {
+								jQuery(sc[i]).removeClass(that.columnConfig[f].cssClass);
+							}
 						}
-						// set new style
-						jQuery(sc[i][j]).addClass(itemConf.cssClass);
 					}
 				}
 				// selection could have changed.
@@ -882,13 +927,10 @@ define( [
 				var sc = that.activeTable.selection.selectedCells;
 				// if a selection was made, transform the selected cells
 				for (var i = 0; i < sc.length; i++) {
-					for (var j = 0; j < sc[i].length; j++) {
-						for (var f = 0; f < that.columnConfig.length; f++) {
-							jQuery(sc[i][j]).removeClass(that.columnConfig[f].cssClass);
-						}
+					for (var f = 0; f < that.columnConfig.length; f++) {
+						jQuery(sc[i]).removeClass(that.columnConfig[f].cssClass);
 					}
 				}
-				
 				// selection could have changed.
 				that.activeTable.selectColumns();
 			}
@@ -1004,10 +1046,7 @@ define( [
       );
     };
 
-	// Add merge/split cells buttons
-    FloatingMenu.addButton(
-      this.name + '.cell',
-      new Aloha.ui.Button({
+	this.btnMergecells = new Aloha.ui.Button({
     	  	'name' : 'mergecells',
 			'iconClass' : 'aloha-button aloha-button-merge-cells',
 			'size' : 'small',
@@ -1018,14 +1057,17 @@ define( [
 					that.activeTable.selection.mergeCells();
 				}
 			}
-		}),
+		});
+
+	// Add merge/split cells buttons
+    FloatingMenu.addButton(
+      this.name + '.cell',
+      this.btnMergecells,
       i18n.t('floatingmenu.tab.table'),
       1
     );
 
-    FloatingMenu.addButton(
-      this.name + '.cell',
-      new Aloha.ui.Button({
+	this.btnSplitcells = new Aloha.ui.Button({
     	  	'name' : 'splitcells',
 			'iconClass' : 'aloha-button aloha-button-split-cells',
 			'size' : 'small',
@@ -1036,7 +1078,11 @@ define( [
 					that.activeTable.selection.splitCells();
 				}
 			}
-		}),
+		});
+
+    FloatingMenu.addButton(
+      this.name + '.cell',
+      this.btnSplitcells,
       i18n.t('floatingmenu.tab.table'),
       1
     );
@@ -1107,6 +1153,7 @@ define( [
 				1
 			);
 		}
+
 	};
 
 	/**