aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-20 11:30:48 -0700
committerJose Antonio Marquez2012-06-20 11:30:48 -0700
commit2496e0d0b0ac5f8c53b12de77f0feda69ce4a2f4 (patch)
tree5dbae52e9961fa870c5ea15f97511572f209f9d2 /js
parent4d2a5acd1631f0cf4e38f127c886f481668ddce0 (diff)
parent4fb904eb5660cac28e2085d4aedce8fa249339b5 (diff)
downloadninja-2496e0d0b0ac5f8c53b12de77f0feda69ce4a2f4.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.js30
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js9
-rwxr-xr-xjs/components/menu/menu.reel/menu.html3
-rwxr-xr-xjs/components/menu/menu.reel/menu.js9
-rwxr-xr-xjs/panels/color/colorpopup-manager.js56
5 files changed, 31 insertions, 76 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
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;
10exports.MenuItem = Montage.create(Component, { 10exports.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 "bindings": { 46 "bindings": {
47 "data": {"<-": "@repetition.objectAtCurrentIteration"} 47 "data": {"<-": "@repetition.objectAtCurrentIteration"},
48 "menuIsActive": {"<-": "@owner.active"}
48 } 49 }
49 }, 50 },
50 51
diff --git a/js/components/menu/menu.reel/menu.js b/js/components/menu/menu.reel/menu.js
index 50d3f0bc..1560100a 100755
--- a/js/components/menu/menu.reel/menu.js
+++ b/js/components/menu/menu.reel/menu.js
@@ -83,19 +83,12 @@ exports.Menu = Montage.create(Component, {
83 83
84 handleMousedown: { 84 handleMousedown: {
85 value: function(evt) { 85 value: function(evt) {
86
87 if(this.active && (this.getZIndex(evt.target) < 9000 || evt.target.id === "topMenu")) { 86 if(this.active && (this.getZIndex(evt.target) < 9000 || evt.target.id === "topMenu")) {
88 this._activeEntry.deselect(); 87 this._activeEntry.deselect();
89 this._activeEntry = null; 88 this._activeEntry = null;
90 this.active = false; 89 this.active = false;
91 90 this.element.ownerDocument.removeEventListener('mousedown', this, false);
92 //console.log(this.rep.objects[1]);
93 //this.controller.content[1].header = "BLAH";
94 } 91 }
95
96// console.log(evt.target.style['z-index']);
97// console.log(this.getZIndex(evt.target));
98
99 } 92 }
100 }, 93 },
101 94
diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index 529ec1c8..4667f2b4 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -29,49 +29,27 @@ exports.ColorPopupManager = Montage.create(Component, {
29 enumerable: false, 29 enumerable: false,
30 value: function () { 30 value: function () {
31 //////////////////////////////////////////////////////////// 31 ////////////////////////////////////////////////////////////
32 //TODO: Improve logic on handling closing the popup 32 //Closing popups on resize
33 ////////////////////////////////////////////////////////////
34 //Hiding popup on any panel(s) actions
35 this.eventManager.addEventListener("panelOrderChanged", function (e) {
36 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
37 }.bind(this));
38 //
39 this.eventManager.addEventListener("panelClose", function (e) {
40 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
41 }.bind(this));
42 //
43 this.eventManager.addEventListener("panelCollapsed", function (e) {
44 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
45 }.bind(this));
46 //
47 this.eventManager.addEventListener("panelSelected", function (e) {
48 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
49 }.bind(this));
50 //
51 this.eventManager.addEventListener("togglePanel", function (e) {
52 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
53 }.bind(this));
54 //
55 this.eventManager.addEventListener("panelResizing", function (e) {
56 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
57 }.bind(this));
58 //
59 this.eventManager.addEventListener("panelResizedStart", function (e) {
60 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
61 }.bind(this));
62 //
63 this.eventManager.addEventListener("panelResizedEnd", function (e) {
64 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
65 }.bind(this)); </