diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 20125d82c..dd34585d8 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -355,7 +355,6 @@ define([ APP.FM.handleFile(blob, data); }; - Messages.oo_login = 'Log in...'; // XXX var noLogin = false; var makeCheckpoint = function (force) { @@ -1120,12 +1119,12 @@ define([ var x2tSaveAndConvertData = function(data, filename, extension, finalFilename) { // Perform the x2t conversion - require(['/common/onlyoffice/x2t/x2t.js'], function() { // XXX why does this fail without an access-control-allow-origin header? + require(['/common/onlyoffice/x2t/x2t.js'], function() { // FIXME why does this fail without an access-control-allow-origin header? var x2t = window.Module; x2t.run(); if (x2tInitialized) { debug("x2t runtime already initialized"); - x2tSaveAndConvertDataInternal(x2t, data, filename, extension, finalFilename); // XXX shouldn't this return ? + return void x2tSaveAndConvertDataInternal(x2t, data, filename, extension, finalFilename); } x2t.onRuntimeInitialized = function() {