aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorEric Guzman2012-06-21 14:21:40 -0700
committerEric Guzman2012-06-21 14:21:40 -0700
commit1830a7cf4150087ee12711ea75f1162e6e3c2934 (patch)
treec83aa5f7938fa36416792a231e7cfd7cfbfadab0 /js
parentda85f402b9a8c4e1142d7e43120e5991285b89d5 (diff)
parent9ba766f77c56619cd977fce59cf1a000cbb9ecc8 (diff)
downloadninja-1830a7cf4150087ee12711ea75f1162e6e3c2934.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'js')
-rw-r--r--js/components/toolbar.reel/toolbar.html3
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html3
-rw-r--r--js/panels/objects/object.reel/object.js11
-rwxr-xr-xjs/stage/binding-view.reel/binding-hud.reel/binding-hud.css1
-rwxr-xr-xjs/stage/binding-view.reel/binding-hud.reel/binding-hud.js3
5 files changed, 15 insertions, 6 deletions
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html
index 51e7ebec..c23e082f 100644
--- a/js/components/toolbar.reel/toolbar.html
+++ b/js/components/toolbar.reel/toolbar.html
@@ -19,8 +19,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
19 }, 19 },
20 20
21 "buttonList": { 21 "buttonList": {
22 "module": "montage/ui/repetition.reel", 22 "prototype" : "montage/ui/repetition.reel",
23 "name": "Repetition",
24 "properties": { 23 "properties": {
25 "element": {"#": "repetition"} 24 "element": {"#": "repetition"}
26 }, 25 },
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index ed6e8463..820348d2 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -74,8 +74,7 @@
74 }, 74 },
75 75
76 "panel_6": { 76 "panel_6": {
77 "module": "js/panels/Panel.reel", 77 "prototype": "js/panels/Panel.reel",
78 "name": "Panel",
79 "properties": { 78 "properties": {
80 "element": {"#": "panel_6"} 79 "element": {"#": "panel_6"}
81 }, 80 },
diff --git a/js/panels/objects/object.reel/object.js b/js/panels/objects/object.reel/object.js
index 6f8f5c92..1426f800 100644
--- a/js/panels/objects/object.reel/object.js
+++ b/js/panels/objects/object.reel/object.js
@@ -16,6 +16,17 @@ exports.Object = Montage.create(Component, {
16 iconElement : { value: null }, 16 iconElement : { value: null },
17 type : { value: null }, 17 type : { value: null },
18 18
19
20 _name : { value: null },
21 name: {
22 get: function() {
23 return this._name;
24 },
25 set: function(val) {
26 this.name = val;
27 }
28 },
29
19 _sourceObject : { value: null }, 30 _sourceObject : { value: null },
20 sourceObject : { 31 sourceObject : {
21 get: function() { 32 get: function() {
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
index ef1423c4..680f9183 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
@@ -100,6 +100,5 @@
100 100
101 101
102.hudRepetition { 102.hudRepetition {
103 max-height:54px;
104 overflow: hidden; 103 overflow: hidden;
105} \ No newline at end of file 104} \ No newline at end of file
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
index 52bc7236..9918b06d 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
@@ -25,7 +25,7 @@ exports.BindingHud = Montage.create(Component, {
25 value: null 25 value: null
26 }, 26 },
27 scrollSpace: { 27 scrollSpace: {
28 value: 3 28 value: 8
29 }, 29 },
30 currentScrollDirection: { 30 currentScrollDirection: {
31 value: null 31 value: null
@@ -198,6 +198,7 @@ exports.BindingHud = Montage.create(Component, {
198 this.scrollDown.addEventListener("mouseover", this); 198 this.scrollDown.addEventListener("mouseover", this);
199 this.scrollUp.addEventListener("mouseout", this); 199 this.scrollUp.addEventListener("mouseout", this);
200 this.scrollDown.addEventListener("mouseout", this); 200 this.scrollDown.addEventListener("mouseout", this);
201 this.optionsRepeater.element.style.maxHeight = (this.scrollSpace * 18) + "px"
201 this.scrollUp.style.display = "block"; 202 this.scrollUp.style.display = "block";
202 this.scrollDown.style.display = "block"; 203 this.scrollDown.style.display = "block";
203 } 204 }