Merge pull request #85 from Lyonard/xliff-to-target-fix

[xliff-to-target] Fixed bug on js file download
matecat · Mar 8, 2016 · bd5ef21 · bd5ef21
2 parents 48ae30c + 109ebe7
commit bd5ef21
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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 );