diff options
author | Ananya Sen | 2012-03-28 14:21:35 -0700 |
---|---|---|
committer | Ananya Sen | 2012-03-28 14:21:35 -0700 |
commit | 2c794eca1b01743b0221af4341835d3608185dd3 (patch) | |
tree | 96c3bedfc5afe4b12ad0c3b261dda493c80fb3c1 /js/stage | |
parent | 0d83ad4dc08448e016c79ae739e84c3d71552b56 (diff) | |
parent | 3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff) | |
download | ninja-2c794eca1b01743b0221af4341835d3608185dd3.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Codeview-improvements
Diffstat (limited to 'js/stage')
-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 66a18964..bee12838 100755 --- a/js/stage/stage-view.reel/stage-view.js +++ b/js/stage/stage-view.reel/stage-view.js | |||
@@ -204,14 +204,18 @@ exports.StageView = Montage.create(Component, { | |||
204 | }, | 204 | }, |
205 | showRulers:{ | 205 | showRulers:{ |
206 | value:function(){ | 206 | value:function(){ |
207 | this.application.ninja.rulerTop.style.background = "url('../images/temp/ruler-top.png')"; | 207 | this.application.ninja.rulerTop.style.display = "block"; |
208 | this.application.ninja.rulerLeft.style.background = "url('../images/temp/ruler-left.png')"; | 208 | this.application.ninja.rulerLeft.style.display = "block"; |
209 | // this.application.ninja.rulerTop.style.background = "url('../images/temp/ruler-top.png')"; | ||
210 | // this.application.ninja.rulerLeft.style.background = "url('../images/temp/ruler-left.png')"; | ||
209 | } | 211 | } |
210 | }, | 212 | }, |
211 | hideRulers:{ | 213 | hideRulers:{ |
212 | value:function(){ | 214 | value:function(){ |
213 | this.application.ninja.rulerTop.style.background = "rgb(128,128,128)"; | 215 | this.application.ninja.rulerTop.style.display = "none"; |
214 | this.application.ninja.rulerLeft.style.background = "rgb(128,128,128)"; | 216 | this.application.ninja.rulerLeft.style.display = "none"; |
217 | // this.application.ninja.rulerTop.style.background = "rgb(128,128,128)"; | ||
218 | // this.application.ninja.rulerLeft.style.background = "rgb(128,128,128)"; | ||
215 | } | 219 | } |
216 | }, | 220 | }, |
217 | 221 | ||