patch to allow user-added prefixes and modification to random pad names; correctly process uri-encoded utf-8 characters in pad names and page titles

This commit is contained in:
Wikinaut 2011-11-10 22:37:48 +01:00
parent 5bef51f468
commit bda20a38a4
4 changed files with 29 additions and 15 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before After
Before After

View file

@ -89,16 +89,6 @@
<link href="static/custom/index.css" rel="stylesheet"> <link href="static/custom/index.css" rel="stylesheet">
<script src="static/custom/index.js"></script> <script src="static/custom/index.js"></script>
<script> <script>
function go2Name()
{
var padname = document.getElementById("padname").value;
padname.length > 0 ? window.location = /** "p/" + **/ padname : alert("Please enter a name")
}
function go2Random()
{
window.location = /** "p/" + **/ randomPadName();
}
function randomPadName() function randomPadName()
{ {
@ -113,6 +103,30 @@
return randomstring; return randomstring;
} }
function go2Name()
{
var padname = document.getElementById("padname").value;
padname.length > 0 ? window.location = /** "p/" + **/ padname : alert("Please enter a name")
}
function go2Random()
{
var rnd = randomPadName();
var prefixedName = prompt( "You can prefix or modify your random pad name with some reasonable characters.\nSpecial characters will be removed or escaped.\n\n", "-"+rnd );
if ( prefixedName == "-" + rnd ) prefixedName = rnd;
var escPrefixedName = encodeURIComponent( prefixedName.replace( /\//, "" ) );
if ( prefixedName == null ) return;
if ( prefixedName == decodeURIComponent( escPrefixedName )
|| ( prefixedName != escPrefixedName
&& confirm( "You have used characters which are not allowed in Urls, and the padname will therefore be modified to "
+ decodeURIComponent( escPrefixedName )
+ ".\nDo you want to use this modifed name?" ) ) ) {
window.location = /** "p/" + **/ escPrefixedName;
} else {
return;
}
}
//start the costum js //start the costum js
if(typeof costumStart == "function") costumStart(); if(typeof costumStart == "function") costumStart();
</script> </script>

View file

@ -172,7 +172,7 @@ function handshake()
socket.once('connect', function() socket.once('connect', function()
{ {
var padId = document.location.pathname.substring(document.location.pathname.lastIndexOf("/") + 1); var padId = document.location.pathname.substring(document.location.pathname.lastIndexOf("/") + 1);
padId = unescape(padId); // unescape neccesary due to Safari and Opera interpretation of spaces padId = decodeURIComponent(padId);
document.title = document.title + " | " + padId; document.title = document.title + " | " + padId;

View file

@ -62,7 +62,7 @@
//get the padId out of the url //get the padId out of the url
var urlParts= document.location.pathname.split("/"); var urlParts= document.location.pathname.split("/");
padId = urlParts[urlParts.length-2]; padId = decodeURIComponent( urlParts[urlParts.length-2] );
//set the title //set the title
document.title = document.title + " | " + padId; document.title = document.title + " | " + padId;