mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 16:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

check for soffice before removing export paths

Browse source
This commit is contained in:
Chris Birk 2015-12-17 21:54:04 -06:00
parent e98821cef7
commit 7f517eca0b
3 changed files with 51 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/static/js/pad_impexp.js
View file

@ -1,5 +1,5 @@
/**
* This code is mostly from the old Etherpad. Please help us to comment this code.
* This code is mostly from the old Etherpad. Please help us to comment this code.
* This helps other people to understand this code better and helps them to improve it.
* TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
*/
@ -46,7 +46,7 @@ var padimpexp = (function()
$('#importmessagefail').fadeOut("fast");
var ret = window.confirm(html10n.get("pad.impexp.confirmimport"));
if (ret)
{
{
currentImportTimer = window.setTimeout(function()
{
if (!currentImportTimer)
@ -61,7 +61,7 @@ var padimpexp = (function()
{
disabled: true
}).val(html10n.get("pad.impexp.importing"));
window.setTimeout(function()
{
$('#importfileinput').attr(
@ -104,7 +104,7 @@ var padimpexp = (function()
function importErrorMessage(status)
{
var msg="";
if(status === "convertFailed"){
msg = html10n.get("pad.impexp.convertFailed");
} else if(status === "uploadFailed"){
@ -112,7 +112,7 @@ var padimpexp = (function()
} else if(status === "padHasData"){
msg = html10n.get("pad.impexp.padHasData");
}
function showError(fade)
{
$('#importmessagefail').html('<strong style="color: red">'+html10n.get('pad.impexp.importfailed')+':</strong> ' + (msg || html10n.get('pad.impexp.copypaste','')))[(fade ? "fadeIn" : "show")]();
@ -206,9 +206,11 @@ var padimpexp = (function()
// activate action to import in the form
$("#importform").attr('action', pad_root_url + "/import");
//hide stuff thats not avaible if abiword is disabled
if(clientVars.abiwordAvailable == "no")
console.log(clientVars);
//hide stuff thats not avaible if abiword/soffice is disabled
if(clientVars.exportAvailable == "no")
{
$("#exportworda").remove();
$("#exportpdfa").remove();
@ -216,13 +218,13 @@ var padimpexp = (function()
$("#importmessageabiword").show();
}
else if(clientVars.abiwordAvailable == "withoutPDF")
else if(clientVars.exportAvailable == "withoutPDF")
{
$("#exportpdfa").remove();
$("#exportworda").attr("href", pad_root_path + "/export/doc");
$("#exportopena").attr("href", pad_root_path + "/export/odt");
$("#importexport").css({"height":"142px"});
$("#importexportline").css({"height":"142px"});
}
@ -232,7 +234,7 @@ var padimpexp = (function()
$("#exportpdfa").attr("href", pad_root_path + "/export/pdf");
$("#exportopena").attr("href", pad_root_path + "/export/odt");
}
addImportFrames();
$("#importfileinput").change(fileInputUpdated);
$('#importform').unbind("submit").submit(fileInputSubmit);