aboutsummaryrefslogtreecommitdiff
path: root/js/stage
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/stage
parentda85f402b9a8c4e1142d7e43120e5991285b89d5 (diff)
parent9ba766f77c56619cd977fce59cf1a000cbb9ecc8 (diff)
downloadninja-1830a7cf4150087ee12711ea75f1162e6e3c2934.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'js/stage')
-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
2 files changed, 2 insertions, 2 deletions
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 }