From 1e8d954560bc7e475d73ce9e4df82ffeb2492c80 Mon Sep 17 00:00:00 2001 From: John McLear Date: Mon, 3 Dec 2012 14:28:25 +0000 Subject: [PATCH] best I can do with this temporary fix for IE --- src/static/js/pad.js | 10 ++++++---- src/static/js/pad_utils.js | 16 +++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/static/js/pad.js b/src/static/js/pad.js index cace9bf7..9ad701b3 100644 --- a/src/static/js/pad.js +++ b/src/static/js/pad.js @@ -51,18 +51,20 @@ var randomString = require('./pad_utils').randomString; var hooks = require('./pluginfw/hooks'); -function createCookie(name, value, days, path) -{ +function createCookie(name, value, days, path){ /* Warning Internet Explorer doesn't use this it uses the one from pad_utils.js */ if (days) { var date = new Date(); date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); var expires = "; expires=" + date.toGMTString(); } - else var expires = ""; + else{ + var expires = ""; + } - if(!path) + if(!path){ // If the path isn't set then just whack the cookie on the root path path = "/"; + } //Check if the browser is IE and if so make sure the full path is set in the cookie if(navigator.appName=='Microsoft Internet Explorer'){ diff --git a/src/static/js/pad_utils.js b/src/static/js/pad_utils.js index 7c97b035..82f7fcad 100644 --- a/src/static/js/pad_utils.js +++ b/src/static/js/pad_utils.js @@ -39,26 +39,24 @@ function randomString(len) return randomstring; } -function createCookie(name, value, days, path) -{ +function createCookie(name, value, days, path){ /* Used by IE */ if (days) { var date = new Date(); date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); var expires = "; expires=" + date.toGMTString(); } - else var expires = ""; + else{ + var expires = ""; + } - if(!path) + if(!path){ // IF the Path of the cookie isn't set then just create it on root path = "/"; - - // This fixes an issue with IE not wanting to store cookies for Auth #1234. It's a temp fix because - // Really we should be storing the cookie on teh document.location path and not modifying the fsking URL to contain a password! - // document.cookie = name + "=" + value + expires + "; path=" + "/"; + } //Check if the browser is IE and if so make sure the full path is set in the cookie if(navigator.appName=='Microsoft Internet Explorer'){ - document.cookie = name + "=" + value + expires + "; path="+document.location; + document.cookie = name + "=" + value + expires + "; path=/"; /* Note this bodge fix for IE is temporary until auth is rewritten */ } else{ document.cookie = name + "=" + value + expires + "; path=" + path;