aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorJohn Mayhew2012-02-16 17:25:30 -0800
committerJohn Mayhew2012-02-16 17:25:30 -0800
commit9bba936942dcc6cbda66d72110548e29866285d3 (patch)
tree97d5a13e7e7ea6723ee91cab68f1f4e8fc427a88 /js/stage
parenta66bf533daccc3b850b7af12d7fd335fbd406beb (diff)
parentf0590347bc5fe810838b14a6035fbef35b5616c5 (diff)
downloadninja-9bba936942dcc6cbda66d72110548e29866285d3.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
index cd19f361..46d74e13 100755
--- a/js/stage/stage-view.reel/stage-view.js
+++ b/js/stage/stage-view.reel/stage-view.js
@@ -198,14 +198,14 @@ exports.StageView = Montage.create(Component, {
198 }, 198 },
199 showRulers:{ 199 showRulers:{
200 value:function(){ 200 value:function(){
201 this.application.ninja.rulerTop.style.display = "block"; 201 this.application.ninja.rulerTop.style.background = "url('../images/temp/ruler-top.png')";
202 this.application.ninja.rulerLeft.style.display = "block"; 202 this.application.ninja.rulerLeft.style.background = "url('../images/temp/ruler-left.png')";
203 } 203 }
204 }, 204 },
205 hideRulers:{ 205 hideRulers:{
206 value:function(){ 206 value:function(){
207 this.application.ninja.rulerTop.style.display = "none"; 207 this.application.ninja.rulerTop.style.background = "rgb(128,128,128)";
208 this.application.ninja.rulerLeft.style.display = "none"; 208 this.application.ninja.rulerLeft.style.background = "rgb(128,128,128)";
209 } 209 }
210 }, 210 },
211 211