From 7b8d48467feed49883e9331804bff466be6783d5 Mon Sep 17 00:00:00 2001
From: Peter 'Pita' Martischka <petermartischka@googlemail.com>
Date: Tue, 23 Aug 2011 18:36:38 +0100
Subject: [PATCH] added proper embed parameter support, fixes #116

---
 static/js/pad_impexp.js | 18 +++++++++---------
 static/pad.html         |  2 +-
 static/timeslider.html  |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/static/js/pad_impexp.js b/static/js/pad_impexp.js
index efa8a6a46..8224fce56 100644
--- a/static/js/pad_impexp.js
+++ b/static/js/pad_impexp.js
@@ -231,9 +231,9 @@ var padimpexp = (function()
     init: function()
     {
       // build the export links
-      $("#exporthtmla").attr("href", document.location.href + "/export/html");
-      $("#exportplaina").attr("href", document.location.href + "/export/txt");
-      $("#exportwordlea").attr("href", document.location.href + "/export/wordle");
+      $("#exporthtmla").attr("href", document.location.pathname + "/export/html");
+      $("#exportplaina").attr("href", document.location.pathname + "/export/txt");
+      $("#exportwordlea").attr("href", document.location.pathname + "/export/wordle");
       
       //hide stuff thats not avaible if abiword is disabled
       if(clientVars.abiwordAvailable == "no")
@@ -249,8 +249,8 @@ var padimpexp = (function()
       {
         $("#exportpdfa").remove();
         
-        $("#exportworda").attr("href", document.location.href + "/export/doc");
-        $("#exportopena").attr("href", document.location.href + "/export/odt");
+        $("#exportworda").attr("href", document.location.pathname + "/export/doc");
+        $("#exportopena").attr("href", document.location.pathname + "/export/odt");
         
         $("#importexport").css({"height":"142px"});
         $("#importexportline").css({"height":"142px"});
@@ -259,11 +259,11 @@ var padimpexp = (function()
       }
       else
       {
-        $("#exportworda").attr("href", document.location.href + "/export/doc");
-        $("#exportpdfa").attr("href", document.location.href + "/export/pdf");
-        $("#exportopena").attr("href", document.location.href + "/export/odt");
+        $("#exportworda").attr("href", document.location.pathname + "/export/doc");
+        $("#exportpdfa").attr("href", document.location.pathname + "/export/pdf");
+        $("#exportopena").attr("href", document.location.pathname + "/export/odt");
         
-        $("#importform").get(0).setAttribute('action', document.location.href + "/import"); 
+        $("#importform").get(0).setAttribute('action', document.location.pathname + "/import"); 
       }
     
       $("#impexp-close").click(function()
diff --git a/static/pad.html b/static/pad.html
index 55b9f82a9..980905e99 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -96,7 +96,7 @@
   </a>
 </li>
 <li class="separator"></li>
-<li id="timesliderlink" onClick="document.location = document.location+ '/timeslider'">
+<li id="timesliderlink" onClick="document.location = document.location.pathname+ '/timeslider'">
   <a title="Show the history of this pad">
     <div class="buttonicon" style="background-position:0px -218px"></div>
   </a>
diff --git a/static/timeslider.html b/static/timeslider.html
index 5f3f1b7db..4dbf8d939 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -271,7 +271,7 @@
               <!-- termporary place holder--> 
               <a id = "returnbutton">Return to pad</a>
               <script>
-                $("#returnbutton").attr("href", document.location.href.substring(0,document.location.href.lastIndexOf('/timeslider')));
+                $("#returnbutton").attr("href", document.referrer);
               </script>
             </div>