Merge branch 'master' of github.com:Motorola-Mobility/ninja

2 files changed, 13 insertions, 3 deletions

diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index bbf53144..6b74b04f 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
                 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.1"},
-                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.4"}
+                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.5"}
         ]
 }
\ No newline at end of file
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index 200eb703..914b2105 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -117,11 +117,21 @@ exports.CloudPopup = Montage.create(Component, {
     downloadCloudApp: {
         enumerable: false,
         value: function() {
+            //Creating an empty anchor to link to download file
+            var link = document.createElement('a'), evt = document.createEvent("MouseEvents");
+            link.download = 'Ninja-Local-Cloud';
+            this.element.appendChild(link);
+            //Creating a fake click event to init file download
+            evt.initMouseEvent("click", true, true, window, 1, 0, 0, 0, 0,false, false, false, false, 0, null);
+            //Setting proper download file based on OS
             if(this._os === 'mac') {
-                location.href = '/ninja_localcloud_for_mac.zip';
+                link.href = '/ninja_localcloud_for_mac.zip';
+                link.dispatchEvent(evt);
             } else if (this._os === 'windows') {
-                location.href = '/ninja_localcloud_for_windows.zip';
+                link.href = '/ninja_localcloud_for_windows.zip';
+                link.dispatchEvent(evt);
             } else {
+                //Alerting user their OS is not supported
                 alert('Your operating system is not supported by the Ninja Local Cloud App.');
             }
         }