.../edit_aloha/css/drupal.aloha.edit-rtl.css       |    9 ++
 core/modules/edit_aloha/css/drupal.aloha.edit.css  |   25 ++++
 core/modules/edit_aloha/edit_aloha.info            |    7 +
 core/modules/edit_aloha/edit_aloha.module          |   35 +++++
 .../edit_aloha/js/createjs/drupalalohawidget.js    |  156 ++++++++++++++++++++
 .../Plugin/edit/processed_text_editor/Aloha.php    |   43 ++++++
 6 files changed, 275 insertions(+)

diff --git a/core/modules/edit_aloha/css/drupal.aloha.edit-rtl.css b/core/modules/edit_aloha/css/drupal.aloha.edit-rtl.css
new file mode 100644
index 0000000..e4a8ca1
--- /dev/null
+++ b/core/modules/edit_aloha/css/drupal.aloha.edit-rtl.css
@@ -0,0 +1,9 @@
+/**
+ * @file
+ * RTL styles for Aloha Editor UI when used by the Edit module.
+ */
+
+.edit-toolbar .aloha-toolbar-panels button {
+  border-left: inherit;
+  border-right: 0;
+}
diff --git a/core/modules/edit_aloha/css/drupal.aloha.edit.css b/core/modules/edit_aloha/css/drupal.aloha.edit.css
new file mode 100644
index 0000000..c8f291c
--- /dev/null
+++ b/core/modules/edit_aloha/css/drupal.aloha.edit.css
@@ -0,0 +1,25 @@
+/**
+ * @file
+ * Styles for Aloha Editor UI when used by the Edit module.
+ */
+
+/**
+ * Ensures multi-row toolbars work well.
+ *
+ * This indeed implies that it is broken on the back-end ('aloha-for-textareas')
+ * so it warrants a todo. However, it's not a trivial problem to solve: on the
+ * back-end the common case is to have a very wide, single-row AE toolbar.
+ * Because there is no box-shadow around it, we need a border. But a bottom-
+ * border for buttons and a bottom-border for the .aloha-toolbar-panels
+ * container implies *double* borders, which is ugly. For now I've chosen to
+ * have a pretty common case on the back-end, at the cost of a broken multi-row
+ * experience (lack of bottom border).
+ *
+ * @todo See above. CSS wizardry needed.
+ */
+
+.edit-toolbar .aloha-toolbar-panels button {
+  border: 1px solid #aaa;
+  border-top: 0;
+  border-left: 0; /* LTR */
+}
diff --git a/core/modules/edit_aloha/edit_aloha.info b/core/modules/edit_aloha/edit_aloha.info
new file mode 100644
index 0000000..30dfece
--- /dev/null
+++ b/core/modules/edit_aloha/edit_aloha.info
@@ -0,0 +1,7 @@
+name = Aloha Editor integration for Edit
+description = Make Aloha Editor work with in-place editing.
+package = User interface
+core = 8.x
+
+dependencies[] = edit
+dependencies[] = aloha
diff --git a/core/modules/edit_aloha/edit_aloha.module b/core/modules/edit_aloha/edit_aloha.module
new file mode 100644
index 0000000..077c3f9
--- /dev/null
+++ b/core/modules/edit_aloha/edit_aloha.module
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @file
+ * This module only exists temporarily, until Aloha has been committed to Drupal
+ * core. Once Edit is also committed to core, this "edit_aloha" module can be
+ * merged with the Aloha module.
+ */
+
+/**
+ * Implements hook_library_info().
+ */
+function edit_aloha_library_info() {
+  $module_path = drupal_get_path('module', 'edit_aloha');
+  $options = array(
+    'scope' => 'footer',
+    'attributes' => array('defer' => TRUE),
+  );
+  $libraries['aloha.edit'] = array(
+    'title' => 'Integrate Aloha Editor with the Edit module.',
+    'version' => ALOHA_VERSION,
+    'js' => array(
+      $module_path . '/js/createjs/drupalalohawidget.js' => $options,
+    ),
+    'css' => array(
+      $module_path . '/css/drupal.aloha.edit.css' => array(),
+    ),
+    'dependencies' => array(
+      array('aloha', 'aloha'),
+      array('edit', 'edit')
+    )
+  );
+  return $libraries;
+}
+
diff --git a/core/modules/edit_aloha/js/createjs/drupalalohawidget.js b/core/modules/edit_aloha/js/createjs/drupalalohawidget.js
new file mode 100644
index 0000000..d020e8c
--- /dev/null
+++ b/core/modules/edit_aloha/js/createjs/drupalalohawidget.js
@@ -0,0 +1,156 @@
+/**
+ * @file
+ * Override of Create.js' default Aloha Editor widget.
+ *
+ * NOTE: This does in fact use zero code of jQuery.create.alohaWidget.
+ */
+(function (jQuery, Drupal, drupalSettings) {
+
+"use strict";
+
+  jQuery.widget('Drupal.drupalAlohaWidget', jQuery.Create.alohaWidget, {
+
+    // @todo BLOCKED_ON(Create.js/VIE.js, how to restore original content when canceling editing)
+    // Actually use this when restoring original content, but for that we
+    // first need to know how to restore content in a Create.js context
+    originalTransformedContent: null,
+
+    /**
+     * Implements jQuery UI widget factory's _init() method.
+     *
+     * @todo: POSTPONED_ON(Create.js, https://github.com/bergie/create/issues/142)
+     * Get rid of this once that issue is solved.
+     */
+    _init: function() {},
+
+    /**
+     * Implements Create's _initialize() method.
+     */
+    _initialize: function() {
+      this._bindEvents();
+
+      // Immediately initialize Aloha, this can take some time. By doing it now
+      // already, it will most likely already be ready when the user actually
+      // wants to use Aloha Editor.
+      Drupal.aloha.init();
+    },
+
+    /**
+     * Binds to events.
+     *
+     * @todo: POSTPONED_ON(Aloha Editor, https://github.com/alohaeditor/Aloha-Editor/issues/693)
+     * Get rid of this helper function and move it into _initialize() once that
+     * issue is solved. Also see http://drupal.org/node/1725032.
+     */
+    _bindEvents: function() {
+      var that = this;
+
+      // Sets the state to 'activated' upon clicking the element.
+      this.element.on("click.edit", function(event) {
+        event.stopPropagation();
+        event.preventDefault();
+        that.options.activating();
+      });
+
+      // Sets the state to 'changed' whenever the content has changed.
+      this.element.on('aloha-content-changed', function(event, $alohaEditable, data) {
+        if (!data.editable.isModified()) {
+          return true;
+        }
+        that.options.changed(data.editable.getContents());
+        data.editable.setUnmodified();
+      });
+    },
+
+    /**
+     * Makes this PropertyEditor widget react to state changes.
+     */
+    stateChange: function(from, to) {
+      switch (to) {
+        case 'inactive':
+          break;
+        case 'candidate':
+          if (from !== 'inactive') {
+            Drupal.aloha.detach(this.element);
+            this._removeValidationErrors();
+            this._cleanUp();
+            this._bindEvents();
+          }
+          break;
+        case 'highlighted':
+          break;
+        case 'activating':
+          // When transformation filters have been been applied to the processed
+          // text of this field, then we'll need to load a re-rendered version of
+          // it without the transformation filters.
+          if (this.options.widget.element.hasClass('edit-text-with-transformation-filters')) {
+            this.originalTransformedContent = this.element.html();
+
+            var that = this;
+            Drupal.edit.util.loadRerenderedProcessedText({
+              $editorElement: this.element,
+              propertyID: Drupal.edit.util.calcPropertyID(this.options.entity, this.options.property),
+              callback: function (rerendered) {
+                that.element.html(rerendered);
+                that.options.activated();
+              }
+            });
+          }
+          // When no transformation filters have been applied: start WYSIWYG
+          // editing immediately!
+          else {
+            this.options.activated();
+          }
+          break;
+        case 'active':
+          // Attach Aloha Editor with this field's text format.
+          var formatID = this.options.widget.element.attr('data-edit-text-format');
+          var format = drupalSettings.aloha.formats[formatID];
+          // Let the custom Aloha Editor UI for Drupal know that it should
+          // render the Aloha Editor toolbar into Edit's toolbar.
+          this.element.attr('data-edit-aloha-toolbar-custom-location', 'true');
+          Drupal.aloha.attach(this.element, format);
+          Drupal.aloha.activate(this.element, format);
+          break;
+        case 'changed':
+          break;
+        case 'saving':
+          this._removeValidationErrors();
+          break;
+        case 'saved':
+          break;
+        case 'invalid':
+          break;
+      }
+    },
+
+    /**
+     * Removes validation errors' markup changes, if any.
+     *
+     * Note: this only needs to happen for type=direct, because for type=direct,
+     * the property DOM element itself is modified; this is not the case for
+     * type=form.
+     */
+    _removeValidationErrors: function() {
+      this.element
+        .removeClass('edit-validation-error')
+        .next('.edit-validation-errors').remove();
+    },
+
+    /**
+     * Cleans up after the widget has been saved.
+     *
+     * Note: this is where the Create.Storage and accompanying Backbone.sync
+     * abstractions "leak" implementation details. That is only the case because
+     * we have to use Drupal's Form API as a transport mechanism. It is
+     * unfortunately a stateful transport mechanism, and that's why we have to
+     * clean it up here. This clean-up is only necessary when canceling the
+     * editing of a property after having attempted to save at least once.
+     */
+    _cleanUp: function() {
+      Drupal.edit.util.form.unajaxifySaving(jQuery('#edit_backstage form .edit-form-submit'));
+      jQuery('#edit_backstage form').remove();
+    }
+  });
+
+})(jQuery, Drupal, drupalSettings);
diff --git a/core/modules/edit_aloha/lib/Drupal/edit_aloha/Plugin/edit/processed_text_editor/Aloha.php b/core/modules/edit_aloha/lib/Drupal/edit_aloha/Plugin/edit/processed_text_editor/Aloha.php
new file mode 100644
index 0000000..8af151e
--- /dev/null
+++ b/core/modules/edit_aloha/lib/Drupal/edit_aloha/Plugin/edit/processed_text_editor/Aloha.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Definition of \Drupal\edit_aloha\Plugin\edit\processed_text_editor\Aloha.
+ */
+
+namespace Drupal\edit_aloha\Plugin\edit\processed_text_editor;
+
+use Drupal\edit\Plugin\ProcessedTextEditorBase;
+use Drupal\Core\Annotation\Plugin;
+use Drupal\Core\Annotation\Translation;
+
+/**
+ * Defines an Aloha Editor-based WYSIWYG PropertyEditor widget for Create.js.
+ *
+ * @Plugin(
+ *   id = "aloha",
+ *   title = @Translation("Aloha Editor"),
+ *   library = {
+ *     "module" = "edit_aloha",
+ *     "name" = "aloha.edit"
+ *   },
+ *   propertyEditorName = "drupalAlohaWidget"
+ * )
+ */
+class Aloha extends ProcessedTextEditorBase {
+
+  /**
+   * Implements \Drupal\edit\Plugin\ProcessedTextEditorBase::addJsSettings().
+   */
+  function addJsSettings() {
+    aloha_add_format_settings();
+  }
+
+  /**
+   * Implements \Drupal\edit\Plugin\ProcessedTextEditorBase::checkFormatCompatibility().
+   */
+  function checkFormatCompatibility($format_id) {
+    return aloha_check_format_compatibility($format_id);
+  }
+
+}