From b222d89c838ff61f681ef903174bfbfd80e2c8e0 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Tue, 12 Jan 2021 20:33:15 +0100
Subject: [PATCH] Unset old activation key

---
 src/block_manager/view/BlockView.js  | 2 +-
 src/block_manager/view/BlocksView.js | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/block_manager/view/BlockView.js b/src/block_manager/view/BlockView.js
index 8987a3441..b6f00816d 100644
--- a/src/block_manager/view/BlockView.js
+++ b/src/block_manager/view/BlockView.js
@@ -102,7 +102,7 @@ export default Backbone.View.extend({
 
       if (model.get('activate') || oldActive) {
         result.trigger('active');
-        result.set(oldKey, 0);
+        result.unset(oldKey);
       }
 
       if (model.get('select')) {
diff --git a/src/block_manager/view/BlocksView.js b/src/block_manager/view/BlocksView.js
index 853f5dea8..41591b86d 100644
--- a/src/block_manager/view/BlocksView.js
+++ b/src/block_manager/view/BlocksView.js
@@ -81,13 +81,15 @@ export default Backbone.View.extend({
    * @private
    */
   onDrop(model) {
-    const em = this.em;
+    const { em } = this;
     em.runDefault();
 
     if (model && model.get) {
-      if (model.get('activeOnRender')) {
+      const oldActive = 'activeOnRender';
+
+      if (model.get(oldActive)) {
         model.trigger('active');
-        model.set('activeOnRender', 0);
+        model.unset(oldActive);
       }
 
       em.trigger('block:drag:stop', model);