aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui/cloudpopup.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-02-13 16:19:21 -0800
committerAnanya Sen2012-02-13 16:19:21 -0800
commitb58dafe332fb57210f3d059a518a3d183c222631 (patch)
tree09fd958b0f7f3f51dc88e613e7764bdfc642b742 /js/io/ui/cloudpopup.reel
parentf3dc624fa464a79fd8e8cec1ddd16ed2109bda23 (diff)
parentf70701db069a10dc5195605fc378a022125b434f (diff)
downloadninja-b58dafe332fb57210f3d059a518a3d183c222631.tar.gz
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Diffstat (limited to 'js/io/ui/cloudpopup.reel')
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.html2
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.js3
2 files changed, 4 insertions, 1 deletions
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index 8e65a705..2c1c169a 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -50,7 +50,7 @@
50 50
51 <h4>Install Ninja Cloud App</h4> 51 <h4>Install Ninja Cloud App</h4>
52 52
53 <p>Donec congue lacinia dui, a porttitor lectus condimentum laoreet. Nunc eu ullamcorper orci. Quisque eget odio ac lectus.</p> 53 <p>The Local Cloud App is required to run Ninja. Please download and unzip the file. Start the Local Cloud and copy/paste the server URL into the field above. Click the ‘Test’ button to verify the connection.</p>
54 54
55 <div class="cloud_icon"></div> 55 <div class="cloud_icon"></div>
56 56
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index 1344661b..e5bad98e 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -51,6 +51,9 @@ exports.CloudPopup = Montage.create(Component, {
51 this._os = 'windows'; 51 this._os = 'windows';
52 } else if (navigator.appVersion.indexOf("Mac")!=-1) { 52 } else if (navigator.appVersion.indexOf("Mac")!=-1) {
53 this._os = 'mac'; 53 this._os = 'mac';
54 } else {
55 //Alternate message for no OS detected (probably Linux)
56 this.element.getElementsByTagName('section')[0].style.display = 'none';
54 } 57 }
55 } 58 }
56 }, 59 },