From 816b6d36fed12f4000f3959cf69fdc163cb61094 Mon Sep 17 00:00:00 2001
From: Adam Hoenich <adam.hoenich@acquia.com>
Date: Fri, 24 Feb 2017 12:35:54 -0500
Subject: [PATCH 1/3] Fixing a random failure.

---
 tests/features/media/browser_embed_code.feature | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/features/media/browser_embed_code.feature b/tests/features/media/browser_embed_code.feature
index 2bd3814e6..3689047e8 100644
--- a/tests/features/media/browser_embed_code.feature
+++ b/tests/features/media/browser_embed_code.feature
@@ -53,6 +53,8 @@ Feature: Creating media assets from within the media browser using embed codes
     When I visit "/entity-browser/iframe/media_browser"
     And I click "Create embed"
     And I enter "The quick brown fox gets eaten by hungry lions." for "input"
+    # The change event, which triggers AJAX, is fired after 600 milliseconds.
+    And I wait 1 second
     And I wait for AJAX to finish
     And I press "Place"
     Then I should see the error message "No media types can be matched to this input."

From 8ee994d010251e5df0775fa567f7292c4d8a9f29 Mon Sep 17 00:00:00 2001
From: Adam Hoenich <adam.hoenich@acquia.com>
Date: Fri, 24 Feb 2017 12:42:52 -0500
Subject: [PATCH 2/3] Doing it for another test as well.

---
 tests/features/media/browser_embed_code.feature | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/features/media/browser_embed_code.feature b/tests/features/media/browser_embed_code.feature
index 3689047e8..aef784529 100644
--- a/tests/features/media/browser_embed_code.feature
+++ b/tests/features/media/browser_embed_code.feature
@@ -65,5 +65,7 @@ Feature: Creating media assets from within the media browser using embed codes
     When I visit "/entity-browser/iframe/media_browser"
     And I click "Create embed"
     And I enter "https://twitter.com/webchick/status/824051274353999872" for "input"
+    # The change event, which triggers AJAX, is fired after 600 milliseconds.
+    And I wait 1 second
     And I wait for AJAX to finish
     Then the "#entity" element should be empty

From b9d2cf35df8de8e91d2e2bc1c9566d360452f404 Mon Sep 17 00:00:00 2001
From: Adam Hoenich <adam.hoenich@acquia.com>
Date: Mon, 6 Mar 2017 12:42:10 -0500
Subject: [PATCH 3/3] Fixed verbiage.

---
 .../src/Form/NodeRevisionRevertForm.php       | 44 +++++++++++++++++++
 .../src/Routing/RouteSubscriber.php           |  6 +++
 2 files changed, 50 insertions(+)
 create mode 100644 modules/lightning_features/lightning_workflow/src/Form/NodeRevisionRevertForm.php

diff --git a/modules/lightning_features/lightning_workflow/src/Form/NodeRevisionRevertForm.php b/modules/lightning_features/lightning_workflow/src/Form/NodeRevisionRevertForm.php
new file mode 100644
index 000000000..095cdc500
--- /dev/null
+++ b/modules/lightning_features/lightning_workflow/src/Form/NodeRevisionRevertForm.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Drupal\lightning_workflow\Form;
+
+use Drupal\node\Form\NodeRevisionRevertForm as BaseForm;
+
+/**
+ * Changes verbiage in the core node revision revert form.
+ */
+class NodeRevisionRevertForm extends BaseForm {
+
+  /**
+   * Determines if the revision is a forward revision.
+   *
+   * @return bool
+   *   TRUE if the revision is a forward revision, FALSE otherwise.
+   */
+  protected function isForwardRevision() {
+    /** @var \Drupal\node\NodeInterface $node */
+    $node = $this->nodeStorage->load($this->revision->id());
+    return $this->revision->getRevisionId() > $node->getRevisionId();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    if ($this->isForwardRevision()) {
+      $date = $this->dateFormatter->format($this->revision->getRevisionCreationTime());
+      return $this->t('Are you sure you want to switch to the revision from %revision-date?', ['%revision-date' => $date]);
+    }
+    else {
+      return parent::getQuestion();
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->isForwardRevision() ? $this->t('Switch') : parent::getConfirmText();
+  }
+
+}
diff --git a/modules/lightning_features/lightning_workflow/src/Routing/RouteSubscriber.php b/modules/lightning_features/lightning_workflow/src/Routing/RouteSubscriber.php
index 8bcff95be..d1a65a9dd 100644
--- a/modules/lightning_features/lightning_workflow/src/Routing/RouteSubscriber.php
+++ b/modules/lightning_features/lightning_workflow/src/Routing/RouteSubscriber.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Routing\RouteSubscriberBase;
 use Drupal\lightning_workflow\Controller\PanelizerIPEController;
+use Drupal\lightning_workflow\Form\NodeRevisionRevertForm;
 use Symfony\Component\Routing\RouteCollection;
 
 /**
@@ -19,6 +20,11 @@ protected function alterRoutes(RouteCollection $collection) {
     if ($route) {
       $route->setDefault('_controller', PanelizerIPEController::class . '::revertToDefault');
     }
+
+    $route = $collection->get('node.revision_revert_confirm');
+    if ($route) {
+      $route->setDefault('_form', NodeRevisionRevertForm::class);
+    }
   }
 
 }