Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 7 insertions, 1 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, {
     downloadCloudApp: {
         enumerable: false,
         value: function() {
-                console.log(this._os);
+                if(this._os === 'mac') {
+                        location.href = '/ninja_localcloud_for_mac.zip';
+                } else if (this._os === 'windows') {
+                        location.href = '/ninja_localcloud_for_windows.zip';
+                } else {
+                        alert('Your operating system is not supported by the Ninja Local Cloud App.');
+                }
         }
     },
     ////////////////////////////////////////////////////////////////////