fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed merge conflicts

This commit is contained in:
Kai Hermann 2011-08-30 16:47:16 +02:00 committed by Peter 'Pita' Martischka
parent f465ebaab9
commit 5838e7ee7f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
static/timeslider.html
View File

@ -271,7 +271,11 @@
<!-- termporary place holder--> <!-- termporary place holder-->
<a id = "returnbutton">Return to pad</a> <a id = "returnbutton">Return to pad</a>
<script> <script>
$("#returnbutton").attr("href", document.referrer); if(document.referrer.length > 0 && document.referrer.substring(document.referrer.lastIndexOf("/")-1,document.referrer.lastIndexOf("/")) === "p") {
$("#returnbutton").attr("href", document.referrer);
} else {
$("#returnbutton").attr("href", document.location.href.substring(0,document.location.href.lastIndexOf("/")));
}
</script> </script>
</div> </div>