From: <jon...@us...> - 2008-08-21 18:11:05
|
Revision: 14457 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=14457&view=rev Author: jonnybradley Date: 2008-08-21 18:11:15 +0000 (Thu, 21 Aug 2008) Log Message: ----------- [FIX] Renamed overLIB's windowWidth function to olWindowWidth to avoid conflict with PHP Layers Menu windowWidth variable. (overLIB was last updated in 2005, so probably won't get overwritten any time soon, i'll try and send a message to the developer to ask if this is ok) Modified Paths: -------------- trunk/lib/overlib.js Modified: trunk/lib/overlib.js =================================================================== --- trunk/lib/overlib.js 2008-08-21 17:58:04 UTC (rev 14456) +++ trunk/lib/overlib.js 2008-08-21 18:11:15 UTC (rev 14457) @@ -540,7 +540,7 @@ theObj.top = theObj.left = ((olIe4&&!olOp) ? 0 : -10000) + (!olNs4 ? 'px' : 0); layerWrite(lyrContent); wd = (olNs4 ? over.clip.width : over.offsetWidth); - if (wd > (ww=windowWidth())) { + if (wd > (ww=olWindowWidth())) { lyrContent=lyrContent.replace(/\ /g, ' '); o3_width=ww; o3_wrap=0; @@ -563,7 +563,7 @@ // HORIZONTAL PLACEMENT, re-arranged to work in Safari if (o3_frame.innerWidth) widthFix=18; - iwidth = windowWidth(); + iwidth = olWindowWidth(); // Horizontal scroll offset winoffset=(olIe4) ? eval('o3_frame.'+docRoot+'.scrollLeft') : o3_frame.pageXOffset; @@ -1108,7 +1108,7 @@ } // get Browser window width -function windowWidth() { +function olWindowWidth() { var w; if (o3_frame.innerWidth) w=o3_frame.innerWidth; else if (eval('o3_frame.'+docRoot)&&eval("typeof o3_frame."+docRoot+".clientWidth=='number'")&&eval('o3_frame.'+docRoot+'.clientWidth')) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |