diff options
author | Jonathan Duran | 2012-03-29 07:27:27 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-03-29 07:27:27 -0700 |
commit | ab730848419a0b72c4c2747a3c928f2c8cc763e7 (patch) | |
tree | 6b48b82604e194016ca048ad912f8015de719999 /js/stage/stage-view.reel | |
parent | 06f247d881f4cfd790d635c6e310ae7f97724339 (diff) | |
parent | 3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff) | |
download | ninja-ab730848419a0b72c4c2747a3c928f2c8cc763e7.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/stage/stage-view.reel')
-rwxr-xr-x | js/stage/stage-view.reel/stage-view.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js index ad67cada..1f471431 100755 --- a/js/stage/stage-view.reel/stage-view.js +++ b/js/stage/stage-view.reel/stage-view.js | |||
@@ -200,14 +200,18 @@ exports.StageView = Montage.create(Component, { | |||
200 | }, | 200 | }, |
201 | showRulers:{ | 201 | showRulers:{ |
202 | value:function(){ | 202 | value:function(){ |
203 | this.application.ninja.rulerTop.style.background = "url('../images/temp/ruler-top.png')"; | 203 | this.application.ninja.rulerTop.style.display = "block"; |
204 | this.application.ninja.rulerLeft.style.background = "url('../images/temp/ruler-left.png')"; | 204 | this.application.ninja.rulerLeft.style.display = "block"; |
205 | // this.application.ninja.rulerTop.style.background = "url('../images/temp/ruler-top.png')"; | ||
206 | // this.application.ninja.rulerLeft.style.background = "url('../images/temp/ruler-left.png')"; | ||
205 | } | 207 | } |
206 | }, | 208 | }, |
207 | hideRulers:{ | 209 | hideRulers:{ |
208 | value:function(){ | 210 | value:function(){ |
209 | this.application.ninja.rulerTop.style.background = "rgb(128,128,128)"; | 211 | this.application.ninja.rulerTop.style.display = "none"; |
210 | this.application.ninja.rulerLeft.style.background = "rgb(128,128,128)"; | 212 | this.application.ninja.rulerLeft.style.display = "none"; |
213 | // this.application.ninja.rulerTop.style.background = "rgb(128,128,128)"; | ||
214 | // this.application.ninja.rulerLeft.style.background = "rgb(128,128,128)"; | ||
211 | } | 215 | } |
212 | }, | 216 | }, |
213 | 217 | ||