mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of https://github.com/Pita/etherpad-lite

Browse source
This commit is contained in:
John McLear 2011-11-28 20:48:16 +00:00
commit c8bfd21c03
4 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
static/js/ace2_common.js
View file

@ -76,10 +76,13 @@ function isArray(testObject)
if (typeof exports !== "undefined")
{
var navigator = {userAgent: "node-js"};
userAgent = "node-js";
}
else
{
userAgent = navigator.userAgent.toLowerCase();
}
// Figure out what browser is being used (stolen from jquery 1.2.1)
userAgent = navigator.userAgent.toLowerCase();
var browser = {
version: (userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/) || [])[1],
safari: /webkit/.test(userAgent),

2
static/js/pad2.js
View file

@ -174,7 +174,7 @@ function handshake()
function sendClientReady(isReconnect)
{
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); // unescape neccesary due to Safari and Opera interpretation of spaces
if(!isReconnect)
document.title = document.title + " | " + padId;