Merge branch 'hotfix' into dev

Author: npomaroli

Jenkinsfile

@@ -16,14 +16,10 @@ pipeline {
 		kubernetes {
 			label env.BUILD_TAG
 			defaultContainer 'build'
-			yaml """
+			yaml ocpWorker("""
 apiVersion: v1
 kind: Pod
 spec:
-  volumes:
-  - name: cache
-    hostPath:
-      path: /opt/kubernetes/cache
   containers:
   - name: build
     image: """ + buildEnvironmentDockerImage("build/Dockerfile", null, "build") + """
@@ -33,39 +29,30 @@ spec:
     tty: true
     resources:
       requests:
-        cpu: 1
-        memory: 256Mi
-    volumeMounts:
-    - mountPath: /home/jenkins/.m2/repository
-      name: cache
-      subPath: maven
-    - mountPath: /home/jenkins/.cache/npm
-      name: cache
-      subPath: npm
-    env:
-      - name: DOCKER_HOST
-        value: tcp://127.0.0.1:2375
+        cpu: '0'
+        memory: '0'
+      limits:
+        cpu: '0'
+        memory: '0'
+  - name: docker
+  - name: jnlp
   - name: selenium
     image: selenium/standalone-chrome:3.141.59
-    imagePullPolicy: Always
     tty: true
     ports:
-    - containerPort: 4444
-      name: selenium
-      protocol: TCP
+      - containerPort: 4444
+        name: selenium
+        protocol: TCP
     resources:
       requests:
-        cpu: 1
-        memory: 1024Mi
-  - name: docker
-    image: docker:18-dind
-    imagePullPolicy: Always
-    securityContext:
-      privileged: true
-    tty: true
+        cpu: '0'
+        memory: '0'
+      limits:
+        cpu: '0'
+        memory: '0'
   imagePullSecrets:
-  - name: docker-jenkinsbuilds-apa-it
-"""
+    - name: docker-jenkinsbuilds-apa-it
+""")
 		}
 	}
 

build/assembly/changelog-entries.xml

@@ -0,0 +1,17 @@
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>changelog-entries</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<fileSets>
+		<fileSet>
+			<directory>${project.basedir}/build/changelog/entries</directory>
+			<outputDirectory>/</outputDirectory>
+			<filtered>false</filtered>
+		</fileSet>
+	</fileSets>
+	<includeBaseDirectory>false</includeBaseDirectory>
+</assembly>

build/changelog/entries/2023/12528.SUP-14863.bugfix

@@ -0,0 +1 @@
+Fix jumping caret: When inserting text into an empty table cell the caret was jumping unexpectedly in the Chrome browser.

build/changelog/entries/2023/12529.SUP-15210.bugfix

@@ -0,0 +1,2 @@
+When a list element contains a break at the end you could not end the list by pressing enter two times. This is because the cursor could not be placed after the break, because the break is invisible. This fix makes breaks as last elements visible.
+

build/changelog/entries/2023/12530.GPU-883.enhancement

@@ -0,0 +1 @@
+GPU-883: Improved visibility of editable content by always showing an outline around them.

build/changelog/mappings/1.4.61.json

@@ -0,0 +1,8 @@
+{
+  "version": "1.4.61",
+  "date": "21.02.2023",
+  "changeLogEntryFileNames": [
+    "12528.SUP-14863.bugfix"
+  ],
+  "genericProperties": {}
+}

build/changelog/mappings/1.5.0.json

@@ -0,0 +1,9 @@
+{
+  "version": "1.5.0",
+  "date": "27.06.2023",
+  "changeLogEntryFileNames": [
+    "12530.GPU-883.enhancement",
+    "12529.SUP-15210.bugfix"
+  ],
+  "genericProperties": {}
+}

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>org.alohaeditor</groupId>
 	<artifactId>alohaeditor</artifactId>
-	<version>1.4.61-SNAPSHOT</version>
+	<version>1.5.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Aloha Editor</name>
 	<url>http://aloha-editor.org</url>
@@ -258,7 +258,7 @@
 			<plugin>
 				<groupId>ro.isdc.wro4j</groupId>
 				<artifactId>wro4j-maven-plugin</artifactId>
-				<version>1.4.7</version>
+				<version>1.6.3</version>
 				<executions>
 					<!-- Full version of aloha (With jquery and requirejs) -->
 					<execution>
@@ -405,6 +405,20 @@
 							</descriptors>
 						</configuration>
 					</execution>
+					<execution>
+						<id>changelog</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<attach>true</attach>
+							<appendAssemblyId>true</appendAssemblyId>
+							<descriptors>
+								<descriptor>${project.basedir}/build/assembly/changelog-entries.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>

src/css/aloha-core.css

@@ -4,13 +4,14 @@
 
 .aloha-editable {
 	min-height: 1.2em;
-	outline: none;
 }
+
 .aloha-editable ::selection,
 .aloha-editable ::-moz-selection {
 	background: #80B5F2;
 	color: white;
 }
+
 .aloha-textarea {
 	overflow: hidden;
 	border:1px solid #ccc;

src/plugins/common/block/css/block.css

@@ -6,14 +6,10 @@
 	padding: 4px;
 	width: 100%;
 }
-.aloha-editable-active .aloha-block, .aloha-block.aloha-block-highlighted {
-	cursor: pointer;
-	box-shadow: 0 0 0px 3px #FFE767; /* We use box-shadow because of a Firefox rendering bug with "outline" */
-}
-.aloha-block.aloha-block-active, .aloha-block.aloha-block-active:hover {
-	box-shadow: 0 0 0px 3px #80B5F2; /* We use box-shadow because of a Firefox rendering bug with "outline" */
-}
 
+.aloha-block {
+    cursor: pointer;
+}
 
 /* IE8 will use outline for highlighting */
 .aloha-ie8 .aloha-block:hover {

src/plugins/common/highlighteditables/css/highlighteditables.css

@@ -5,10 +5,18 @@
 * Licensed unter the terms of http://www.aloha-editor.com/license.html
 */
 
-.aloha-editable-highlight {
-	outline: #FFE767 solid 5px !important;
+.aloha-editable,
+.aloha-block {
+    outline: #0096dc dotted 2px;
 }
 
-.aloha-editable-active, .aloha-editable-active[contenteditable=true]:focus {
-	outline: #80B5F2 solid 5px !important;
+.aloha-editable .aloha-editable,
+.aloha-editable .aloha-block {
+	outline-color: #d6d6d6;
+}
+
+.aloha-editable-active,
+.aloha-editable-active[contenteditable=true]:focus,
+.aloha-block.aloha-block-active {
+	outline-style: solid;
 }

src/plugins/common/highlighteditables/lib/highlighteditables-plugin.js

@@ -82,20 +82,13 @@ define('highlighteditables/highlighteditables-plugin', [
 			* fades all highlighted editables
 			*/
 			fade: function () {
-				var
-					i, editable,
-					animateEnd = function () {
-						jQuery(this).css('outline', '');
-					};
+				var i,
+					editable;
 				for (i = 0; i < Aloha.editables.length; i++) {
 					editable = Aloha.editables[i].obj;
 					if (editable.hasClass('aloha-editable-highlight')) {
 						// IE8 fix - hardcode 5px because editable.css('outlineWidth') sometimes causes a javascript error
-						editable.css('outline', editable.css('outlineColor') + ' ' + editable.css('outlineStyle') + ' 5px')
-							.removeClass('aloha-editable-highlight')
-							.animate({
-								outlineWidth : '0px'
-							}, 300, 'swing', animateEnd);
+						editable.removeClass('aloha-editable-highlight');
 					}
 				}
 			}

src/plugins/common/list/css/list.css

@@ -73,6 +73,13 @@
    margin-left: 15px;
 }
 
+/**
+* Make <br> visible on line ending of <li> elements
+*/
+.aloha-block li:after {
+   content:'\0200B'
+}
+
 /**
 * Predefined list styles
 **/

src/plugins/common/table/lib/table-cell.js

@@ -417,7 +417,7 @@ define([
 	 * Starts the cell selection mode
 	 */
 	TableCell.prototype._startCellSelection = function () {
-		if(!this.tableObj.selection.cellSelectionMode) {
+		if (!this.tableObj.selection.cellSelectionMode) {
 
 			//unselect currently selected cells
 			this.tableObj.selection.unselectCells();
@@ -427,7 +427,7 @@ define([
 
 			//bind a global mouseup event handler to stop cell selection
 			var that = this;
-			jQuery('body').bind('mouseup.cellselection', function(event) {
+			jQuery('body').bind('mouseup.cellselection', function (event) {
 				that._endCellSelection();
 			});
 
@@ -438,7 +438,7 @@ define([
 	/**
 	 * Ends the cell selection mode
 	 */
-	TableCell.prototype._endCellSelection = function() {
+	TableCell.prototype._endCellSelection = function () {
 		if (this.tableObj.selection.cellSelectionMode) {
 			Utils.selectAnchorContents(this.tableObj.selection.selectedCells);
 
@@ -474,13 +474,13 @@ define([
 			"left": left
 		};
 	};
-	
+
 	/**
 	 * Toggles selection of cell.
 	 * This works only when cell selection mode is active.
 	 */
-	TableCell.prototype._selectCellRange = function() {
-		if(this.tableObj.selection.resizeMode || !this.tableObj.selection.cellSelectionMode) {
+	TableCell.prototype._selectCellRange = function () {
+		if (this.tableObj.selection.resizeMode || !this.tableObj.selection.cellSelectionMode) {
 			return;
 		}
 
@@ -528,7 +528,7 @@ define([
 		if (!jQuery.browser.msie) {
 			var s = window.getSelection();
 			// WebKit
-			if (s.setBaseAndExtent /*&& e> 0 */ ) {
+			if (s.setBaseAndExtent /*&& e> 0 */) {
 				s.setBaseAndExtent(e, 0, e, Math.max(0, e.innerText.length - 1));
 			}
 			// Firefox and Opera
@@ -582,30 +582,24 @@ define([
 	};
 
 	/**
-	 * The key-up event for the editable-div in the td-field. Just check if the div
-	 * is empty and insert an  
+	 * The key-up event for the editable-div in the td-field.
 	 *
 	 * @param jqEvent
 	 *            the jquery-event object
 	 * @return void
 	 */
-	TableCell.prototype._editableKeyUp = function (jqEvent) {
-		//TODO do we need to check for empty cells and insert a space?
-		//this._checkForEmptyEvent(jqEvent);
-	};
+	TableCell.prototype._editableKeyUp = function (jqEvent) {};
 
 	/**
-	 * The key-down event for the ediable-div in the td-field. Check if the the div
-	 * is empty and insert an &nbsp. Furthermore if cells are selected, unselect
-	 * them.
+	 * The key-down event for the ediable-div in the td-field.
 	 *
 	 * @param jqEvent
 	 *            the jquery-event object
 	 * @return void
 	 */
 	TableCell.prototype._editableKeyDown = function (jqEvent) {
 		var KEYCODE_TAB = 9;
-		this._checkForEmptyEvent(jqEvent);
+
 		if (this.obj[0] === this.tableObj.obj.find('tr:last td:last')[0]) {
 			// only add a row on a single key-press of tab (so check that alt-,
 			// shift- or ctrl-key are NOT pressed)
@@ -624,30 +618,6 @@ define([
 		}
 	};
 
-	/**
-	 * The custom keyup event for a table-cell Checks if the cell is empty and
-	 * inserts a space (\u00a0)
-	 *
-	 * @param e
-	 *            the event object which is given by jquery
-	 * @return void
-	 */
-	TableCell.prototype._checkForEmptyEvent = function (jqEvent) {
-		var $wrapper = jQuery(this.wrapper),
-			text = $wrapper.text();
-
-		if ($wrapper.children().length > 0) {
-			return;
-		}
-
-		// if empty insert a blank space and blur and focus the wrapper
-		if (text === '') {
-			this.wrapper.text('');
-			this.wrapper.get(0).blur();
-			this.wrapper.get(0).focus();
-		}
-	};
-
 	/**
 	 * Given a cell, will return the container element of the contents
 	 * of the cell. The container element may be the given cell itself,