diff options
Diffstat (limited to 'js')
-rwxr-xr-x | js/io/ui/cloudpopup.reel/cloudpopup.js | 8 | ||||
-rwxr-xr-x | js/stage/stage-view.reel/stage-view.js | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js index e5bad98e..a2283d46 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.js +++ b/js/io/ui/cloudpopup.reel/cloudpopup.js | |||
@@ -88,7 +88,13 @@ exports.CloudPopup = Montage.create(Component, { | |||
88 | downloadCloudApp: { | 88 | downloadCloudApp: { |
89 | enumerable: false, | 89 | enumerable: false, |
90 | value: function() { | 90 | value: function() { |
91 | console.log(this._os); | 91 | if(this._os === 'mac') { |
92 | location.href = '/ninja_localcloud_for_mac.zip'; | ||
93 | } else if (this._os === 'windows') { | ||
94 | location.href = '/ninja_localcloud_for_windows.zip'; | ||
95 | } else { | ||
96 | alert('Your operating system is not supported by the Ninja Local Cloud App.'); | ||
97 | } | ||
92 | } | 98 | } |
93 | }, | 99 | }, |
94 | //////////////////////////////////////////////////////////////////// | 100 | //////////////////////////////////////////////////////////////////// |
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 | ||