From b12b167116b757e1a945c05f45991d0ed385aed3 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 16 Feb 2012 11:39:25 -0800 Subject: Fixing the load document event being fired twice. Signed-off-by: Valerio Virgillito --- js/io/document/html-document.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/io') diff --git a/js/io/document/html-document.js b/js/io/document/html-document.js index 88cfec67..f4757438 100755 --- a/js/io/document/html-document.js +++ b/js/io/document/html-document.js @@ -455,7 +455,8 @@ exports.HTMLDocument = Montage.create(BaseDocument, { } } - this.callback(this); + // Remving this callback and using the callback from the css load + // this.callback(this); } }, -- cgit v1.2.3 From b88cfa79ed80a7eb473f4959b10b7f1d565b80f4 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Thu, 16 Feb 2012 15:21:33 -0800 Subject: Adding Cloud app download URLs --- js/io/ui/cloudpopup.reel/cloudpopup.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'js/io') diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js index e5bad98e..62f7e522 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 === 'win') { + location.href = '/ninja_localcloud_for_windows.zip'; + } else { + alert('Your operating system is not supported by the Ninja Local Cloud App.'); + } } }, //////////////////////////////////////////////////////////////////// -- cgit v1.2.3 From 25020fb66c38029dd57d3d90fedf9bde98b5d383 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Thu, 16 Feb 2012 15:48:48 -0800 Subject: Cloud download windows bug fix --- js/io/ui/cloudpopup.reel/cloudpopup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/io') diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js index 62f7e522..a2283d46 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.js +++ b/js/io/ui/cloudpopup.reel/cloudpopup.js @@ -90,7 +90,7 @@ exports.CloudPopup = Montage.create(Component, { value: function() { if(this._os === 'mac') { location.href = '/ninja_localcloud_for_mac.zip'; - } else if (this._os === 'win') { + } 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.'); -- cgit v1.2.3