Merge pull request #523 from webgme/issue/515_export_in_safari

Fixes #515
webgme · Aug 31, 2015 · 06c80a4 · 06c80a4
2 parents f16879c + 49fd994
commit 06c80a4
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 14 deletions.
diff --git a/src/client/js/Controls/PropertyGrid/Widgets/AssetWidget.js b/src/client/js/Controls/PropertyGrid/Widgets/AssetWidget.js
@@ -18,7 +18,7 @@ define([
         INPUT_FILE_UPLOAD = $('<input type="file" />'),
         //MAX_FILE_SIZE = 100000000,
         ASSET_WIDGET_BASE = $('<div class="asset-widget" />'),
-        ASSET_LINK = $('<a href="" target="_blank"/>');
+        ASSET_LINK = $('<a href="" target="_self"/>');
 
     AssetWidget = function (propertyDesc) {
         AssetWidget.superclass.call(this, propertyDesc);

diff --git a/src/client/js/Dialogs/PluginResults/PluginResultsDialog.js b/src/client/js/Dialogs/PluginResults/PluginResultsDialog.js
@@ -31,7 +31,7 @@ define(['js/util',
     //jscs:disable maximumLineLength
         RESULT_ARTIFACTS_BASE = $('<div class="artifacts collapse"><div class="artifacts-title">Generated artifacts</div><div class="artifacts-body"><ul></ul></div></div>'),
     //jscs:enable maximumLineLength
-        ARTIFACT_ENTRY_BASE = $('<li><a href="#" target="_blank">Loading...</a></li>'),
+        ARTIFACT_ENTRY_BASE = $('<li><a href="#" target="_self">Loading...</a></li>'),
         MESSAGE_PREFIX = 'Message #';
 
     PluginResultsDialog = function () {

diff --git a/src/client/js/Panels/Header/ProjectNavigatorController.js b/src/client/js/Panels/Header/ProjectNavigatorController.js
@@ -16,7 +16,8 @@ define([
     'common/storage/util',
     'isis-ui-components/simpleDialog/simpleDialog',
     'text!js/Dialogs/Projects/templates/DeleteDialogTemplate.html',
-    'text!js/Dialogs/Projects/templates/TransferDialogTemplate.html'
+    'text!js/Dialogs/Projects/templates/TransferDialogTemplate.html',
+    'js/Utils/SaveToDisk'
 ], function (Logger,
              CONSTANTS,
              ng,
@@ -27,7 +28,8 @@ define([
              StorageUtil,
              ConfirmDialog,
              DeleteDialogTemplate,
-             TransferDialogTemplate) {
+             TransferDialogTemplate,
+             saveToDisk) {
     'use strict';
 
 
@@ -446,7 +448,7 @@ define([
                 transferProjectModal = self.$simpleDialog.open({
                     dialogTitle: 'Transfer',
                     dialogContentTemplate: 'TransferDialogTemplate.html',
-                    controller: function ( $scope, $modalInstance, dialogTitle, dialogContentTemplate) {
+                    controller: function ($scope, $modalInstance, dialogTitle, dialogContentTemplate) {
 
                         $scope.dialogTitle = dialogTitle;
                         $scope.dialogContentTemplate = dialogContentTemplate;
@@ -468,7 +470,7 @@ define([
                         };
 
                         $scope.cancel = function () {
-                            $modalInstance.dismiss( 'cancel' );
+                            $modalInstance.dismiss('cancel');
                         };
 
                         $scope.setNewOwnerId = function (ownerId) {
@@ -658,7 +660,7 @@ define([
                 self.gmeClient.getExportProjectBranchUrl(data.projectId,
                     data.branchId, data.projectId + '_' + data.branchId, function (err, url) {
                         if (!err && url) {
-                            window.open(url);
+                            saveToDisk(url);
                         } else {
                             self.logger.error('Failed to get project export url for', data);
                         }

diff --git a/src/client/js/Utils/SaveToDisk.js b/src/client/js/Utils/SaveToDisk.js
@@ -0,0 +1,34 @@
+/*globals define*/
+/*jshint node: true, browser: true, bitwise: false*/
+
+/**
+ * @author kecso / https://github.com/kecso
+ */
+define(function () {
+    'use strict';
+
+    var saveToDisk = function (fileURL, fileName) {
+        // for non-IE
+        if (!window.ActiveXObject) {
+            var save = document.createElement('a');
+            save.href = fileURL;
+            save.target = '_self';
+            //save.download = fileName || 'unknown';
+
+            var event = document.createEvent('Event');
+            event.initEvent('click', true, true);
+            save.dispatchEvent(event);
+            (window.URL || window.webkitURL).revokeObjectURL(save.href);
+        }
+
+        // for IE
+        else if (!!window.ActiveXObject && document.execCommand) {
+            var _window = window.open(fileURL, '_self');
+            _window.document.close();
+            _window.document.execCommand('SaveAs', true, fileName || fileURL)
+            _window.close();
+        }
+    };
+
+    return saveToDisk;
+});
diff --git a/src/server/standalone.js b/src/server/standalone.js
@@ -852,24 +852,20 @@ function StandAloneServer(gmeConfig) {
                 logger.error('worker/simpleResult err', err);
                 res.sendStatus(500);
             } else {
-                res.header('Content-Disposition', 'attachment;filename=\'' + filename + '\'');
+                res.header('Content-Disposition', 'attachment;filename=' + filename);
                 res.json(result);
             }
         });
     }
 
     __app.get('/worker/simpleResult/:resultId', function (req, res) {
-        var filename = 'simpleResult-' + req.params.resultId + '.json';
+        var filename = 'simpleResult-' + req.params.resultId;
         sendSimpleResult(res, req.params.resultId, filename);
     });
 
     // FIXME: filename should be in query string
     __app.get('/worker/simpleResult/:resultId/:filename', function (req, res) {
-        var filename = req.params.filename;
-        if (filename.indexOf('.json') === -1) {
-            filename += '.json';
-        }
-        sendSimpleResult(res, req.params.resultId, filename);
+        sendSimpleResult(res, req.params.resultId, req.params.filename);
     });