From: <ru...@us...> - 2009-06-05 09:13:45
|
Revision: 6901 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6901&view=rev Author: rurban Date: 2009-06-05 09:13:42 +0000 (Fri, 05 Jun 2009) Log Message: ----------- protect against wrong or old folder state cookies Modified Paths: -------------- trunk/themes/default/wikicommon.js Modified: trunk/themes/default/wikicommon.js =================================================================== --- trunk/themes/default/wikicommon.js 2009-06-05 09:11:20 UTC (rev 6900) +++ trunk/themes/default/wikicommon.js 2009-06-05 09:13:42 UTC (rev 6901) @@ -69,6 +69,7 @@ // Todo: onloadhook to re-establish folder state in pure js, no cookies. same for toc. function showHideFolder(id) { var div = document.getElementById(id+'-body'); + if ( div == null) return; var img = document.getElementById(id+'-img'); var expires = new Date(); // 30 days expires.setTime(expires.getTime() + (30 * 24 * 60 * 60 * 1000)); @@ -93,9 +94,10 @@ var cookieStr = "folder_"+id+"="; var cookiePos = document.cookie.indexOf(cookieStr); if (cookiePos > -1) { - document.getElementById(id+'-body').style.display = document.cookie.charAt(cookiePos + cookieStr.length) == "C" ? 'block' : 'none'; - showHideFolder(id) - } + var body = document.getElementById(id+'-body'); + if (body) body.style.display = document.cookie.charAt(cookiePos + cookieStr.length) == "C" ? 'block' : 'none'; + showHideFolder(id); + } } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |