From b03c466d725afd61a746007145d8e562dff3a1a5 Mon Sep 17 00:00:00 2001
From: Alexander Wunschik <dev@wunschik.net>
Date: Fri, 4 Nov 2016 20:31:19 +0100
Subject: [PATCH] Revert "Timeline: options.editable to override item.editable"

---
 lib/timeline/component/ItemSet.js   | 3 ++-
 lib/timeline/component/item/Item.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/timeline/component/ItemSet.js b/lib/timeline/component/ItemSet.js
index b7c28eb0..9329263a 100644
--- a/lib/timeline/component/ItemSet.js
+++ b/lib/timeline/component/ItemSet.js
@@ -1217,7 +1217,8 @@ ItemSet.prototype._onDragStart = function (event) {
   if (item && (item.selected || this.options.itemsAlwaysDraggable)) {
 
     if (!this.options.editable.updateTime &&
-        !this.options.editable.updateGroup) {
+        !this.options.editable.updateGroup &&
+        !item.editable) {
       return;
     }
 
diff --git a/lib/timeline/component/item/Item.js b/lib/timeline/component/item/Item.js
index 900377cd..79535a93 100644
--- a/lib/timeline/component/item/Item.js
+++ b/lib/timeline/component/item/Item.js
@@ -146,7 +146,8 @@ Item.prototype.repositionY = function() {
  * @protected
  */
 Item.prototype._repaintDeleteButton = function (anchor) {
-  var editable = this.options.editable.remove &&
+  var editable = (this.options.editable.remove || 
+                  this.data.editable === true) &&
                  this.data.editable !== false;
 
   if (this.selected && editable && !this.dom.deleteButton) {