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

Import works now on the server side

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-07-21 20:13:58 +01:00
parent 4b268f9579
commit b13fbbfd73
7 changed files with 235 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

19
static/js/pad_impexp.js
View file

@ -24,9 +24,9 @@ var padimpexp = (function()
function addImportFrames()
{
$("#impexp-import .importframe").remove();
$('#impexp-import').append(
$('<iframe style="display: none;" name="importiframe" class="importframe"></iframe>'));
$("#import .importframe").remove();
var iframe = $('<iframe style="display: none;" name="importiframe" class="importframe"></iframe>');
$('#import').append(iframe);
}
function fileInputUpdated()
@ -64,7 +64,7 @@ var padimpexp = (function()
$('#importmessagefail').fadeOut("fast");
var ret = window.confirm("Importing a file will overwrite the current text of the pad." + " Are you sure you want to proceed?");
if (ret)
{
{
hidePanelCall = paddocbar.hideLaterIfNoOtherInteraction();
currentImportTimer = window.setTimeout(function()
{
@ -88,6 +88,11 @@ var padimpexp = (function()
}, 0);
$('#importarrow').stop(true, true).hide();
$('#importstatusball').show();
$("#import .importframe").load(function()
{
importDone();
});
}
return ret;
}
@ -225,6 +230,8 @@ var padimpexp = (function()
var self = {
init: function()
{
$("#importform").get(0).setAttribute('action', document.location.href + "/import");
$("#impexp-close").click(function()
{
paddocbar.setShownPanel(null);
@ -249,13 +256,13 @@ var padimpexp = (function()
disable: function()
{
$("#impexp-disabled-clickcatcher").show();
$("#impexp-import").css('opacity', 0.5);
$("#import").css('opacity', 0.5);
$("#impexp-export").css('opacity', 0.5);
},
enable: function()
{
$("#impexp-disabled-clickcatcher").hide();
$("#impexp-import").css('opacity', 1);
$("#import").css('opacity', 1);
$("#impexp-export").css('opacity', 1);
}
};

4
static/pad.html
View file

@ -208,7 +208,7 @@ We removed this feature cause its not worth the space it needs in the editbar
<div id="import">
Import from text file, HTML, Word, or RTF:<br/><br/>
<form id="importform" method="post" action="import" target="imporiframe" enctype="multipart/form-data">
<form id="importform" method="post" action="" target="importiframe" enctype="multipart/form-data">
<div class="importformdiv" id="importformfilediv">
<input type="file" name="file" size="20" id="importfileinput" />
<div class="importmessage" id="importmessagefail"></div>
@ -222,7 +222,7 @@ We removed this feature cause its not worth the space it needs in the editbar
<img alt="" id="importarrow" src="/static/img/leftarrow.png" align="top" />
</span>
</div>
</form>
</form>
</div>
<div id="importexportline"></div>