diff --git a/static/js/pad2.js b/static/js/pad2.js index f57656c5..fddd9622 100644 --- a/static/js/pad2.js +++ b/static/js/pad2.js @@ -21,13 +21,6 @@ var socket; $(document).ready(function() { handshake(); -// This is a temporary location, Peter to move - $("#exporthtmla").attr("href", document.location.href + "/export/html"); - $("#exportplaina").attr("href", document.location.href + "/export/txt"); - $("#exportworda").attr("href", document.location.href + "/export/doc"); - $("#exportpdfa").attr("href", document.location.href + "/export/pdf"); - $("#exportopena").attr("href", document.location.href + "/export/odt"); - $("#exportwordlea").attr("href", document.location.href + "/export/wordle"); }); $(window).unload(function() @@ -35,18 +28,6 @@ $(window).unload(function() pad.dispose(); }); -// Wordle code, Peter to move -function loadCont(){ - padUrl = location.pathname; - padHost = location.host; - var padUrl = "http://" + padHost + padUrl + "/export/txt"; - $.get(padUrl, function(data) { - $('.result').html(data); - $('#text').html(data); - $('#wordlepost').submit(); - }); -} - function createCookie(name, value, days) { if (days) diff --git a/static/js/pad_impexp.js b/static/js/pad_impexp.js index 261a3138..964eced6 100644 --- a/static/js/pad_impexp.js +++ b/static/js/pad_impexp.js @@ -230,6 +230,14 @@ var padimpexp = (function() var self = { init: function() { + // build the export links + $("#exporthtmla").attr("href", document.location.href + "/export/html"); + $("#exportplaina").attr("href", document.location.href + "/export/txt"); + $("#exportworda").attr("href", document.location.href + "/export/doc"); + $("#exportpdfa").attr("href", document.location.href + "/export/pdf"); + $("#exportopena").attr("href", document.location.href + "/export/odt"); + $("#exportwordlea").attr("href", document.location.href + "/export/wordle"); + $("#importform").get(0).setAttribute('action', document.location.href + "/import"); $("#impexp-close").click(function() @@ -264,6 +272,19 @@ var padimpexp = (function() $("#impexp-disabled-clickcatcher").hide(); $("#import").css('opacity', 1); $("#impexp-export").css('opacity', 1); + }, + export2Wordle: function() + { + padUrl = location.pathname; + padHost = location.host; + var padUrl = "http://" + padHost + padUrl + "/export/txt"; + + $.get(padUrl, function(data) + { + $('.result').html(data); + $('#text').html(data); + $('#wordlepost').submit(); + }); } }; return self; diff --git a/static/pad.html b/static/pad.html index 09251abd..03cec903 100644 --- a/static/pad.html +++ b/static/pad.html @@ -234,7 +234,7 @@ We removed this feature cause its not worth the space it needs in the editbar
Microsoft Word
PDF
OpenDocument
-
Wordle
+
Wordle