StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2e216835: am 9220b6e6: am 0dd70276: am 6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603

Browse Source 
* commit '2e216835ee6d35e1c7b692f9982c1bd34b8ce703':
  followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug: 17781603
This commit is contained in:
smain@google.com
2014-11-18 16:42:50 +00:00
committed by Android Git Automerger
parent 8de0a3d31a 2e216835ee
commit ff62239b02
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/droiddoc/templates-sdk/assets/js/docs.js
View File

@@ -658,7 +658,7 @@ function toggleFullscreen(enable) {
setTimeout(updateSidenavFixedWidth,delay); // need to wait a moment for css to switch setTimeout(updateSidenavFixedWidth,delay); // need to wait a moment for css to switch
enabled = false; enabled = false;
} }
writeCookie("fullscreen", enabled, null, null); writeCookie("fullscreen", enabled, null);
setNavBarLeftPos(); setNavBarLeftPos();
resizeNav(delay); resizeNav(delay);
updateSideNavPosition(); updateSideNavPosition();
@@ -819,7 +819,7 @@ function reInitScrollbars() {
function saveNavPanels() { function saveNavPanels() {
var basePath = getBaseUri(location.pathname); var basePath = getBaseUri(location.pathname);
var section = basePath.substring(1,basePath.indexOf("/",1)); var section = basePath.substring(1,basePath.indexOf("/",1));
writeCookie("height", resizePackagesNav.css("height"), section, null); writeCookie("height", resizePackagesNav.css("height"), section);
} }
@@ -900,12 +900,10 @@ function readCookie(cookie) {
return 0; return 0;
} }
function writeCookie(cookie, val, section, age) { function writeCookie(cookie, val, section) {
if (val==undefined) return; if (val==undefined) return;
section = section == null ? "_" : "_"+section+"_"; section = section == null ? "_" : "_"+section+"_";
if (age == null) { var age = 2*365*24*60*60; // set max-age to 2 years
var age = 2*365*24*60*60; // set max-age to 2 years
}
var cookieValue = cookie_namespace + section + cookie + "=" + val var cookieValue = cookie_namespace + section + cookie + "=" + val
+ "; max-age=" + age +"; path=/"; + "; max-age=" + age +"; path=/";
document.cookie = cookieValue; document.cookie = cookieValue;
@@ -1147,9 +1145,7 @@ function swapNav() {
nav_pref = NAV_PREF_TREE; nav_pref = NAV_PREF_TREE;
init_default_navtree(toRoot); init_default_navtree(toRoot);
} }
var date = new Date(); writeCookie("nav", nav_pref, "reference");
date.setTime(date.getTime()+(10*365*24*60*60*1000)); // keep this for 10 years
writeCookie("nav", nav_pref, "reference", date.toGMTString());
$("#nav-panels").toggle(); $("#nav-panels").toggle();
$("#panel-link").toggle(); $("#panel-link").toggle();
@@ -1217,11 +1213,7 @@ function changeNavLang(lang) {
} }
function changeLangPref(lang, submit) { function changeLangPref(lang, submit) {
var date = new Date(); writeCookie("pref_lang", lang, null);
expires = date.toGMTString(date.setTime(date.getTime()+(10*365*24*60*60*1000)));
// keep this for 50 years
//alert("expires: " + expires)
writeCookie("pref_lang", lang, null, expires);
// ####### TODO: Remove this condition once we're stable on devsite ####### // ####### TODO: Remove this condition once we're stable on devsite #######
// This condition is only needed if we still need to support legacy GAE server // This condition is only needed if we still need to support legacy GAE server
@@ -2730,10 +2722,7 @@ function changeApiLevel() {
selectedLevel = parseInt($("#apiLevelSelector option:selected").val()); selectedLevel = parseInt($("#apiLevelSelector option:selected").val());
toggleVisisbleApis(selectedLevel, "body"); toggleVisisbleApis(selectedLevel, "body");
var date = new Date(); writeCookie(API_LEVEL_COOKIE, selectedLevel, null);
date.setTime(date.getTime()+(10*365*24*60*60*1000)); // keep this for 10 years
var expiration = date.toGMTString();
writeCookie(API_LEVEL_COOKIE, selectedLevel, null, expiration);
if (selectedLevel < minLevel) { if (selectedLevel < minLevel) {
var thing = ($("#jd-header").html().indexOf("package") != -1) ? "package" : "class"; var thing = ($("#jd-header").html().indexOf("package") != -1) ? "package" : "class";