diff options
Diffstat (limited to 'js')
49 files changed, 2765 insertions, 2278 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 | ||
10 | exports.MenuEntry = Montage.create(Component, { | 10 | exports.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 |
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js index f9a625a3..3a5bf4ab 100755 --- a/js/components/menu/menu-item.reel/menu-item.js +++ b/js/components/menu/menu-item.reel/menu-item.js | |||
@@ -10,18 +10,15 @@ var Component = require("montage/ui/component").Component; | |||
10 | exports.MenuItem = Montage.create(Component, { | 10 | exports.MenuItem = Montage.create(Component, { |
11 | 11 | ||
12 | itemBackground: { | 12 | itemBackground: { |
13 | value: null, | 13 | value: null |
14 | serializable: true | ||
15 | }, | 14 | }, |
16 | 15 | ||
17 | itemText: { | 16 | itemText: { |
18 | value: null, | 17 | value: null |
19 | serializable: true | ||
20 | }, | 18 | }, |
21 | 19 | ||
22 | subMenu: { | 20 | subMenu: { |
23 | value: null, | 21 | value: null |
24 | serializable: true | ||
25 | }, | 22 | }, |
26 | 23 | ||
27 | data: { | 24 | data: { |
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html index f18c1a0f..98ffa92c 100755 --- a/js/components/menu/menu.reel/menu.html +++ b/js/components/menu/menu.reel/menu.html | |||
@@ -44,7 +44,8 @@ | |||
44 | "element": { "#": "menuItem" } | 44 | "element": { "#": "menuItem" } |
45 | }, | 45 | }, |
46 | "bindin |