103 files changed, 5663 insertions, 1258 deletions
diff --git a/js/components/controllers/tree-controller.js b/js/components/controllers/tree-controller.js
index 1e9222fd..cb95ca1d 100644
--- a/js/components/controllers/tree-controller.js
+++ b/js/components/controllers/tree-controller.js
@@ -23,6 +23,16 @@ var Montage = require("montage").Montage,
 */
 var TreeController = exports.TreeController = Montage.create(ObjectController, /** @lends module:montage/ui/controller/tree-controller.TreeController# */ {
+    _delegate : { value: null },
+    delegate : {
+        get: function() {
+            return this._delegate;
+        },
+        set: function(value) {
+            this._delegate = value;
+        }
+    },
    rootKey : {
        value: null
    },
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
index dad93b31..103e418f 100644
--- a/js/components/editable.reel/editable.js
+++ b/js/components/editable.reel/editable.js
@@ -40,7 +40,9 @@ exports.Editable = Montage.create(Component, {
            this._element.addEventListener('keydown', this, false);
            this._element.addEventListener('keyup', this, false);
            this._element.addEventListener('input', this, false);
-            
+            this._element.addEventListener('paste', this, false);
            if(this.startOnEvent) {
                this._element.addEventListener(this.startOnEvent, this, false);
            }
@@ -126,7 +128,7 @@ exports.Editable = Montage.create(Component, {
                if(this.stopOnBlur) {
                    //console.log('adding mousedown event listener');
                    ///// Simulate blur on editable node by listening to the doc
-                    document.addEventListener('mouseup', this, false);
+                    document.addEventListener('mousedown', this, false);
                }
                
                this._sendEvent('start');
@@ -135,16 +137,17 @@ exports.Editable = Montage.create(Component, {
        }
    },
    stop : {
-        value: function() {
+        value: function(eventData) {

diff --git a/js/components/controllers/tree-controller.js b/js/components/controllers/tree-controller.js index 1e9222fd..cb95ca1d 100644 --- a/js/components/controllers/tree-controller.js +++ b/js/components/controllers/tree-controller.js
@@ -23,6 +23,16 @@ var Montage = require("montage").Montage,
23	*/	23	*/
24	var TreeController = exports.TreeController = Montage.create(ObjectController, /** @lends module:montage/ui/controller/tree-controller.TreeController# */ {	24	var TreeController = exports.TreeController = Montage.create(ObjectController, /** @lends module:montage/ui/controller/tree-controller.TreeController# */ {
25		25
		26	_delegate : { value: null },
		27	delegate : {
		28	get: function() {
		29	return this._delegate;
		30	},
		31	set: function(value) {
		32	this._delegate = value;
		33	}
		34	},
		35
26	rootKey : {	36	rootKey : {
27	value: null	37	value: null
28	},	38	},


diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js index dad93b31..103e418f 100644 --- a/js/components/editable.reel/editable.js +++ b/js/components/editable.reel/editable.js
@@ -40,7 +40,9 @@ exports.Editable = Montage.create(Component, {
40	this._element.addEventListener('keydown', this, false);	40	this._element.addEventListener('keydown', this, false);
41	this._element.addEventListener('keyup', this, false);	41	this._element.addEventListener('keyup', this, false);
42	this._element.addEventListener('input', this, false);	42	this._element.addEventListener('input', this, false);
43		43	this._element.addEventListener('paste', this, false);
		44
		45
44	if(this.startOnEvent) {	46	if(this.startOnEvent) {
45	this._element.addEventListener(this.startOnEvent, this, false);	47	this._element.addEventListener(this.startOnEvent, this, false);
46	}	48	}
@@ -126,7 +128,7 @@ exports.Editable = Montage.create(Component, {
126	if(this.stopOnBlur) {	128	if(this.stopOnBlur) {
127	//console.log('adding mousedown event listener');	129	//console.log('adding mousedown event listener');
128	///// Simulate blur on editable node by listening to the doc	130	///// Simulate blur on editable node by listening to the doc
129	document.addEventListener('mouseup', this, false);	131	document.addEventListener('mousedown', this, false);
130	}	132	}
131		133
132	this._sendEvent('start');	134	this._sendEvent('start');
@@ -135,16 +137,17 @@ exports.Editable = Montage.create(Component, {
135	}	137	}
136	},	138	},
137	stop : {	139	stop : {
138	value: function() {	140	value: function(eventData) {
139	this._isEditable = this._element.contentEditable = false;