aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu-entry.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-06-20 09:54:57 -0700
committerJonathan Duran2012-06-20 09:54:57 -0700
commit2713506b753bc39fec8bca8c027d21c45dc2e489 (patch)
treeeb6c0621cadbf0a87d8a97613ab11a231e377a8e /js/components/menu/menu-entry.reel
parent2c60886f68e955195e7e024e0787965e972f0d81 (diff)
parentfcb6309915161d16a74a4385b905742f35b7d62d (diff)
downloadninja-2713506b753bc39fec8bca8c027d21c45dc2e489.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'js/components/menu/menu-entry.reel')
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.js30
1 files changed, 8 insertions, 22 deletions
diff --git a/js/components/menu/menu-entry.reel/menu-entry.js b/js/components/menu/menu-entry.reel/menu-entry.js
index b9c546ed..0f5503f6 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.js
+++ b/js/components/menu/menu-entry.reel/menu-entry.js
@@ -9,18 +9,15 @@ var Component = require("montage/ui/component").Component;
9 9
10exports.MenuEntry = Montage.create(Component, { 10exports.MenuEntry = Montage.create(Component, {
11 topHeader: { 11 topHeader: {
12 value: null, 12 value: null
13 serializable: true
14 }, 13 },
15 14
16 topHeaderText: { 15 topHeaderText: {
17 value: null, 16 value: null
18 serializable: true
19 }, 17 },
20 18
21 subEntries: { 19 subEntries: {
22 value: null, 20 value: null
23 serializable: true
24 }, 21 },
25 22
26 // Reference to the parent Menu component 23 // Reference to the parent Menu component
@@ -36,8 +33,7 @@ exports.MenuEntry = Montage.create(Component, {
36 if(value !== this._menu) { 33 if(value !== this._menu) {
37 this._menu = value; 34 this._menu = value;
38 } 35 }
39 }, 36 }
40 serializable: true
41 }, 37 },
42 38
43 _data: { 39 _data: {
@@ -52,8 +48,7 @@ exports.MenuEntry = Montage.create(Component, {
52 if(this._data !== value) { 48 if(this._data !== value) {
53 this._data = value; 49 this._data = value;
54 } 50 }
55 }, 51 }
56 serializable: true
57 }, 52 },
58 53
59 select: { 54 select: {
@@ -79,22 +74,20 @@ exports.MenuEntry = Montage.create(Component, {
79 return this._menuIsActive; 74 return this._menuIsActive;
80 }, 75 },
81 set: function(value) { 76 set: function(value) {
82 if(value) this.topHeader.addEventListener("mouseover", this, false); 77 if(value) this.element.addEventListener("mouseover", this, false);
83 } 78 }
84 }, 79 },
85 80
86 handleClick: { 81 captureMousedown: {
87 value: function(event) { 82 value: function(event) {
88 // TODO: Hack! Rework this! 83 // TODO: Hack! Rework this!
89 this.parentComponent.ownerComponent.toggleActivation(this); 84 this.parentComponent.ownerComponent.toggleActivation(this);
90// this._menu.toggleActivation(this);
91 } 85 }
92 }, 86 },
93 87
94 handleMouseover: { 88 handleMouseover: {
95 value: function(event) { 89 value: function(event) {
96 this.parentComponent.ownerComponent.activeEntry = this; 90 this.parentComponent.ownerComponent.activeEntry = this;
97// this._menu.activeEntry = this;
98 } 91 }
99 }, 92 },
100 93
@@ -105,14 +98,7 @@ exports.MenuEntry = Montage.create(Component, {
105 98
106 this.topHeaderText.innerHTML = this.data.header; 99 this.topHeaderText.innerHTML = this.data.header;
107 100
108 this.element.addEventListener("click", this, false); 101 this.element.addEventListener("mousedown", this, true);
109
110 Object.defineBinding(this, "menuIsActive", {
111 boundObject: this._menu,
112 boundObjectPropertyPath: "active",
113 oneway: true
114 });
115
116 } 102 }
117 } 103 }
118}); \ No newline at end of file 104}); \ No newline at end of file