Merge pull request #2258 from almende/revert-2256-timeline-editableOverride

Revert "Timeline: options.editable to override item.editable"

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;
     }
 

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) {