From 411a43cdc5a4df21dc72045fbb5ca88ee86a1f4f Mon Sep 17 00:00:00 2001
From: yotamberk <yotamberk@gmail.com>
Date: Thu, 16 Feb 2017 17:42:02 +0200
Subject: [PATCH] fix(timeline): #2679 TypeError: Cannot read property
 'hasOwnProperty' of null (#2735)

* Fix redraw order
* Fix error when option is not defined
* Allow template labels
* Add .travis.yml file
* Add experiment travis code
* Fix react example
* Fix bug in item editable
---
 lib/timeline/component/item/Item.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/timeline/component/item/Item.js b/lib/timeline/component/item/Item.js
index e41ef781..b54d9d6d 100644
--- a/lib/timeline/component/item/Item.js
+++ b/lib/timeline/component/item/Item.js
@@ -41,7 +41,7 @@ function Item (data, conversion, options) {
     }
     else if(typeof options.editable === 'object') {
       this.editable = {};
-      util.selectiveExtend(['updateTime', 'updateGroup', 'remove'], this.editable, data.editable);
+      util.selectiveExtend(['updateTime', 'updateGroup', 'remove'], this.editable, options.editable);
     };
   }
 }