From 109ebe7365ffdc9598eb67b3c208f7979e5f6e3a Mon Sep 17 00:00:00 2001 From: Roberto Tucci Date: Tue, 8 Mar 2016 12:43:54 +0100 Subject: [PATCH] [xliff-to-target] Fixed bug on js file download --- lib/Controller/xliffToTargetController.php | 1 + lib/View/xliffToTarget.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Controller/xliffToTargetController.php b/lib/Controller/xliffToTargetController.php index 5251001c85..6ae28cf4b3 100644 --- a/lib/Controller/xliffToTargetController.php +++ b/lib/Controller/xliffToTargetController.php @@ -26,6 +26,7 @@ public function doAction() { "type" => mime_content_type($file_path), "message" => "File downloaded! Check your download folder" )); + $this->_filename = $conversion['fileName']; } else { $this->error = true; $this->errorMessage = $conversion[0]['errorMessage']; diff --git a/lib/View/xliffToTarget.html b/lib/View/xliffToTarget.html index 43a1c056af..6c8e6dcfcf 100755 --- a/lib/View/xliffToTarget.html +++ b/lib/View/xliffToTarget.html @@ -787,7 +787,7 @@ /* END Editing */ }, complete: function ( e, data ) { - if ( !conversionFailed ) { + if ( conversionFailed == false || JSON.stringify(conversionFailed) === JSON.stringify({}) ) { console.log( 'completed!!!' ); var result = e.responseJSON; //JSON.parse( data.result ); saveAs( b64toBlob( result.fileContent ), result.fileName );