36 files changed, 3164 insertions, 332 deletions
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
index 0b7a171e..c6416693 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
@@ -36,14 +36,14 @@ exports.Leaf = Montage.create(TreeNode, {
    handleEvent : {
        value: function(e) {
            var delegateMethod = this.delegateEventMap[e._event.type];
-            this.callDelegateMethod(delegateMethod);
+            this.callDelegateMethod(delegateMethod, e);
        }
    },
    callDelegateMethod : {
-        value: function(methodName) {
+        value: function(methodName, evt) {
            var delegate = this.treeView.contentController.delegate;
            if(delegate && typeof delegate[methodName] === 'function') {
-                delegate[methodName](this.sourceObject);
+                delegate[methodName](this.sourceObject, evt);
            }
        }
    },
@@ -60,6 +60,7 @@ exports.Leaf = Montage.create(TreeNode, {
    delegateEventMap : {
        value: {
            'click'     : 'handleNodeActivation',
+            'dblclick'  : 'handleDblclick',
            'dragstart' : 'handleDragStart',
            'dragend'   : 'handleDragEnd'
        }
diff --git a/js/controllers/elements/component-controller.js b/js/controllers/elements/component-controller.js
index 458e6b46..33b9b79a 100644
--- a/js/controllers/elements/component-controller.js
+++ b/js/controllers/elements/component-controller.js
@@ -9,4 +9,45 @@ var Montage = require("montage/core/core").Montage,
 exports.ComponentController = Montage.create(ElementController, {
+    getProperty: {
+        value: function(el, prop) {
+            switch(prop) {
+                case "label":
+                    return this.application.ninja.currentDocument.getComponentFromElement(el).label;
+                    break;
+                case "enabled":
+                    return this.application.ninja.currentDocument.getComponentFromElement(el).enabled;
+                    break;
+                case "disabled":
+                    return this.application.ninja.currentDocument.getComponentFromElement(el).disabled;
+                    break;
+                case "value":
+                    return this.application.ninja.currentDocument.getComponentFromElement(el).value;
+                    break;
+                default:
+                    return ElementController.getProperty(el, prop, true);
+            }
+        }
+    },
+    setProperty: {
+        value: function(el, p, value) {
+            switch(p) {
+                case "label":
+                    this.application.ninja.currentDocument.getComponentFromElement(el).label = value;
+                    break;
+                case "enabled":
+                    this.application.ninja.currentDocument.getComponentFromElement(el).enabled = value;
+                    break;
+                case "disabled":
+                    this.application.ninja.currentDocument.getComponentFromElement(el).disabled = value;
+                    break;
+                case "value":
+                    this.application.ninja.currentDocument.getComponentFromElement(el).value = value;
+                    break;
+                default:
+                    ElementController.setProperty(el, p, value);
+            }
+        }
+    }
 });
diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js
index dd3507c2..393d29fe 100644
--- a/js/io/document/html-document.js
+++ b/js/io/document/html-document.js
@@ -27,6 +27,7 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
    _initialUserDocument: { value: null, enumerable: false },
    _htmlSource: {value: "<html></html>", enumerable: false},
    _glData: {value: null, enumerable: false },
+    _userComponents: { value: {}, enumarable: false},
    _elementCounter: { value: 1, enumerable: false },
    _snapping : { value: true, enumerable: false },
@@ -108,23 +109,11 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
        }
    },
-    _userComponentSet: {
+    userComponents: {
-        value: {},
+        get: function() {
-        writable: true,
+            return this._userComponents;
-        enumerable:true
+        }
    },
-//    userComponentSet:{
-//        enumerable: true,
-//        get: function() {
-//            return this._userComponentSet;
-//        },
-//        set: function(value) {
-//            this._userComponentSet = value;
-//            this._drawUserComponentsOnOpen();
-//        }
-//    },
-//
 //    _drawUserComponentsOnOpen:{
 //        value:function(){
 //            for(var i in this._userComponentSet){
@@ -191,6 +180,29 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
        set: function(value) { this._zoomFactor = value; }
    },
+    /**
+     * Add a reference to a component instance to the userComponents hash using the
+     * element UUID
+     */
+    setComponentInstance: {
+        value: function(instance, el) {
+            this.userComponents[el.uuid] = instance;
+        }
+    },
+    /**
+     * Returns the component instance obj from the element
+     */
+    getComponentFromElement: {
+        value: function(el) {
+            if(el) {
+                if(el.uuid) return this.userComponents[el.uuid];
+            } else {
+                return null;
+            }
+        }
+    },
    //****************************************//
    // PUBLIC METHODS
    initialize: {
@@ -353,9 +365,6 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
                        this.callback(this);

diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js index 0b7a171e..c6416693 100644 --- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js +++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
@@ -36,14 +36,14 @@ exports.Leaf = Montage.create(TreeNode, {
36	handleEvent : {	36	handleEvent : {
37	value: function(e) {	37	value: function(e) {
38	var delegateMethod = this.delegateEventMap[e._event.type];	38	var delegateMethod = this.delegateEventMap[e._event.type];
39	this.callDelegateMethod(delegateMethod);	39	this.callDelegateMethod(delegateMethod, e);
40	}	40	}
41	},	41	},
42	callDelegateMethod : {	42	callDelegateMethod : {
43	value: function(methodName) {	43	value: function(methodName, evt) {
44	var delegate = this.treeView.contentController.delegate;	44	var delegate = this.treeView.contentController.delegate;
45	if(delegate && typeof delegate[methodName] === 'function') {	45	if(delegate && typeof delegate[methodName] === 'function') {
46	delegate[methodName](this.sourceObject);	46	delegate[methodName](this.sourceObject, evt);
47	}	47	}
48	}	48	}
49	},	49	},
@@ -60,6 +60,7 @@ exports.Leaf = Montage.create(TreeNode, {
60	delegateEventMap : {	60	delegateEventMap : {
61	value: {	61	value: {
62	'click' : 'handleNodeActivation',	62	'click' : 'handleNodeActivation',
		63	'dblclick' : 'handleDblclick',
63	'dragstart' : 'handleDragStart',	64	'dragstart' : 'handleDragStart',
64	'dragend' : 'handleDragEnd'	65	'dragend' : 'handleDragEnd'
65	}	66	}


diff --git a/js/controllers/elements/component-controller.js b/js/controllers/elements/component-controller.js index 458e6b46..33b9b79a 100644 --- a/js/controllers/elements/component-controller.js +++ b/js/controllers/elements/component-controller.js
@@ -9,4 +9,45 @@ var Montage = require("montage/core/core").Montage,
9		9
10	exports.ComponentController = Montage.create(ElementController, {	10	exports.ComponentController = Montage.create(ElementController, {
11		11
		12	getProperty: {
		13	value: function(el, prop) {
		14	switch(prop) {
		15	case "label":
		16	return this.application.ninja.currentDocument.getComponentFromElement(el).label;
		17	break;
		18	case "enabled":
		19	return this.application.ninja.currentDocument.getComponentFromElement(el).enabled;
		20	break;
		21	case "disabled":
		22	return this.application.ninja.currentDocument.getComponentFromElement(el).disabled;
		23	break;
		24	case "value":
		25	return this.application.ninja.currentDocument.getComponentFromElement(el).value;
		26	break;
		27	default:
		28	return ElementController.getProperty(el, prop, true);
		29	}
		30	}
		31	},
		32
		33	setProperty: {
		34	value: function(el, p, value) {
		35	switch(p) {
		36	case "label":
		37	this.application.ninja.currentDocument.getComponentFromElement(el).label = value;
		38	break;
		39	case "enabled":
		40	this.application.ninja.currentDocument.getComponentFromElement(el).enabled = value;
		41	break;
		42	case "disabled":
		43	this.application.ninja.currentDocument.getComponentFromElement(el).disabled = value;
		44	break;
		45	case "value":
		46	this.application.ninja.currentDocument.getComponentFromElement(el).value = value;
		47	break;
		48	default:
		49	ElementController.setProperty(el, p, value);
		50	}
		51	}
		52	}
12	});	53	});


diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js index dd3507c2..393d29fe 100644 --- a/js/io/document/html-document.js +++ b/js/io/document/html-document.js
@@ -27,6 +27,7 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
27	_initialUserDocument: { value: null, enumerable: false },	27	_initialUserDocument: { value: null, enumerable: false },
28	_htmlSource: {value: "<html></html>", enumerable: false},	28	_htmlSource: {value: "<html></html>", enumerable: false},
29	_glData: {value: null, enumerable: false },	29	_glData: {value: null, enumerable: false },
		30	_userComponents: { value: {}, enumarable: false},
30		31
31	_elementCounter: { value: 1, enumerable: false },	32	_elementCounter: { value: 1, enumerable: false },
32	_snapping : { value: true, enumerable: false },	33	_snapping : { value: true, enumerable: false },
@@ -108,23 +109,11 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
108	}	109	}
109	},	110	},
110		111
111	_userComponentSet: {	112	userComponents: {
112	value: {},	113	get: function() {
113	writable: true,	114	return this._userComponents;
114	enumerable:true	115	}
115	},	116	},
116
117	// userComponentSet:{
118	// enumerable: true,
119	// get: function() {
120	// return this._userComponentSet;
121	// },
122	// set: function(value) {
123	// this._userComponentSet = value;
124	// this._drawUserComponentsOnOpen();
125	// }
126	// },
127	//
128	// _drawUserComponentsOnOpen:{	117	// _drawUserComponentsOnOpen:{
129	// value:function(){	118	// value:function(){
130	// for(var i in this._userComponentSet){	119	// for(var i in this._userComponentSet){
@@ -191,6 +180,29 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
191	set: function(value) { this._zoomFactor = value; }	180	set: function(value) { this._zoomFactor = value; }
192	},	181	},
193		182
		183	/**
		184	* Add a reference to a component instance to the userComponents hash using the
		185	* element UUID
		186	*/
		187	setComponentInstance: {
		188	value: function(instance, el) {
		189	this.userComponents[el.uuid] = instance;
		190	}
		191	},
		192
		193	/**
		194	* Returns the component instance obj from the element
		195	*/
		196	getComponentFromElement: {
		197	value: function(el) {
		198	if(el) {
		199	if(el.uuid) return this.userComponents[el.uuid];
		200	} else {
		201	return null;
		202	}
		203	}
		204	},
		205
194	//****************************************//	206	//****************************************//
195	// PUBLIC METHODS	207	// PUBLIC METHODS
196	initialize: {	208	initialize: {
@@ -353,9 +365,6 @@ var HTMLDocument = exports.HTMLDocument = Montage.create(baseDocumentModule.Base
353	this.callback(this);	365	this.callback(this);