From 3c8918818124000cb1ba7f327b10acafc395df71 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Fri, 12 Apr 2013 00:08:19 -0700
Subject: [PATCH] Issue #1967728 by Wim Leers: Fixed In-place editing toolbars
 in DOM not removed after stopping in-place editing.

---
 core/modules/edit/js/theme.js              |  2 +-
 core/modules/edit/js/views/toolbar-view.js | 25 ----------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/core/modules/edit/js/theme.js b/core/modules/edit/js/theme.js
index f2452bab2ec..7bef55385e9 100644
--- a/core/modules/edit/js/theme.js
+++ b/core/modules/edit/js/theme.js
@@ -66,7 +66,7 @@ Drupal.theme.editModal = function(settings) {
  */
 Drupal.theme.editToolbarContainer = function(settings) {
   var html = '';
-  html += '<div id="' + settings.id + '" class="edit-toolbar-container edit-animate-invisible edit-animate-only-visibility">';
+  html += '<div id="' + settings.id + '" class="edit-toolbar-container">';
   html += '  <div class="edit-toolbar-heightfaker edit-animate-fast">';
   html += '    <div class="edit-toolbar primary" />';
   html += '  </div>';
diff --git a/core/modules/edit/js/views/toolbar-view.js b/core/modules/edit/js/views/toolbar-view.js
index 20753524ada..f4b2123b5e7 100644
--- a/core/modules/edit/js/views/toolbar-view.js
+++ b/core/modules/edit/js/views/toolbar-view.js
@@ -408,31 +408,6 @@ Drupal.edit.views.ToolbarView = Backbone.View.extend({
     else {
       this.$el.insertBefore(this.editor.element);
     }
-
-    var that = this;
-    // Animate the toolbar into visibility.
-    setTimeout(function () {
-      that.$el.removeClass('edit-animate-invisible');
-    }, 0);
-  },
-
-  remove: function () {
-    if (!this.$el) {
-      return;
-    }
-
-    // Remove after animation.
-    var that = this;
-    var $el = this.$el;
-    this.$el
-      .addClass('edit-animate-invisible')
-      // Prevent this toolbar from being detected *while* it is being removed.
-      .removeAttr('id')
-      .find('.edit-toolbar .edit-toolgroup')
-      .addClass('edit-animate-invisible')
-      .on(Drupal.edit.util.constants.transitionEnd, function (e) {
-        $el.remove();
-      });
   },
 
   /**