diff options
| author | John McLear <john@mclear.co.uk> | 2015-01-05 17:15:38 +0000 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2015-01-05 17:15:38 +0000 |
| commit | c0078abc756ea809e3cff8ea3b2b50cac571d2dc (patch) | |
| tree | 4827964e333252090dd1991129bc6b8f77aa03fa /src/static/js/pad_impexp.js | |
| parent | 1451eecaf077a62b76ea16f19f69cb613c8b3eba (diff) | |
| parent | 2e2dd688e97c61271d34a2af1446276db75523f8 (diff) | |
| download | etherpad-lite-c0078abc756ea809e3cff8ea3b2b50cac571d2dc.zip | |
Merge branch 'develop' of github.com:ether/etherpad-lite into fix/reimplement-ace-getAttributeOnSelection
Diffstat (limited to 'src/static/js/pad_impexp.js')
| -rw-r--r-- | src/static/js/pad_impexp.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js index 20cae2a0..77f1eb28 100644 --- a/src/static/js/pad_impexp.js +++ b/src/static/js/pad_impexp.js @@ -109,6 +109,8 @@ var padimpexp = (function() msg = html10n.get("pad.impexp.convertFailed"); } else if(status === "uploadFailed"){ msg = html10n.get("pad.impexp.uploadFailed"); + } else if(status === "padHasData"){ + msg = html10n.get("pad.impexp.padHasData"); } function showError(fade) @@ -198,6 +200,7 @@ var padimpexp = (function() // build the export links $("#exporthtmla").attr("href", pad_root_path + "/export/html"); + $("#exportetherpada").attr("href", pad_root_path + "/export/etherpad"); $("#exportplaina").attr("href", pad_root_path + "/export/txt"); // activate action to import in the form @@ -234,13 +237,13 @@ var padimpexp = (function() $('#importform').submit(fileInputSubmit); $('.disabledexport').click(cantExport); }, - handleFrameCall: function(status) + handleFrameCall: function(directDatabaseAccess, status) { if (status !== "ok") { importFailed(status); } - + if(directDatabaseAccess) pad.switchToPad(clientVars.padId); importDone(); }, disable: function() |