More work on Javascript and CSS dispatchers

darcs-hash:20051029185222-7ad00-c184ab3496539f3027407c7d17e8770a1849546a.gz

1 files changed, 28 insertions, 22 deletions

diff --git a/lib/scripts/script.js b/lib/scripts/script.js
index 180f2dcd5..b91859265 100644
--- a/lib/scripts/script.js
+++ b/lib/scripts/script.js
@@ -6,8 +6,8 @@
  * Some browser detection
  */
 var clientPC  = navigator.userAgent.toLowerCase(); // Get client info
-var is_gecko  = ((clientPC.indexOf('gecko')!=-1) && (clientPC.indexOf('spoofer')==-1)
-                && (clientPC.indexOf('khtml') == -1) && (clientPC.indexOf('netscape/7.0')==-1));
+var is_gecko  = ((clientPC.indexOf('gecko')!=-1) && (clientPC.indexOf('spoofer')==-1) &&
+                (clientPC.indexOf('khtml') == -1) && (clientPC.indexOf('netscape/7.0')==-1));
 var is_safari = ((clientPC.indexOf('AppleWebKit')!=-1) && (clientPC.indexOf('spoofer')==-1));
 var is_khtml  = (navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled ));
 if (clientPC.indexOf('opera')!=-1) {
@@ -23,10 +23,11 @@ if (clientPC.indexOf('opera')!=-1) {
  */
 function findPosX(object){
   var curleft = 0;
+  var obj;
   if(typeof(object) == 'object'){
-    var obj = object;
+    obj = object;
   }else{
-    var obj = document.getElementById(object);
+    obj = document.getElementById(object);
   }
   if (obj.offsetParent){
     while (obj.offsetParent){
@@ -47,10 +48,11 @@ function findPosX(object){
  */
 function findPosY(object){
   var curtop = 0;
+  var obj;
   if(typeof(object) == 'object'){
-    var obj = object;
+    obj = object;
   }else{
-    var obj = document.getElementById(object);
+    obj = document.getElementById(object);
   }
   if (obj.offsetParent){
     while (obj.offsetParent){
@@ -72,7 +74,7 @@ function findPosY(object){
 function jsEscape(text){
     var re=new RegExp("\\\\","g");
     text=text.replace(re,"\\\\");
-    var re=new RegExp("'","g");
+    re=new RegExp("'","g");
     text=text.replace(re,"\\'");
     re=new RegExp('"',"g");
     text=text.replace(re,'"');
@@ -150,8 +152,8 @@ function showTocToggle(showtxt,hidetxt) {
 
     document.writeln('<div class=\'toctoggle\'><a href="javascript:toggleToc()" class="toc">' +
     '<span id="showlink" style="display:none;">' + show + '</span>' +
-    '<span id="hidelink">' + hide + '</span>'
-    + '</a></div>');
+    '<span id="hidelink">' + hide + '</span>' +
+    '</a></div>');
   }
 }
 
@@ -200,12 +202,14 @@ function getCookie(name) {
   var begin = dc.indexOf("; " + prefix);
   if (begin == -1) {
     begin = dc.indexOf(prefix);
-    if (begin != 0) return null;
-  } else
+    if (begin !== 0){ return null; }
+  } else {
     begin += 2;
+  }
   var end = document.cookie.indexOf(";", begin);
-  if (end == -1)
+  if (end == -1){
     end = dc.length;
+  }
   return unescape(dc.substring(begin + prefix.length, end));
 }
 
@@ -217,8 +221,9 @@ function getCookie(name) {
 function fixDate(date) {
   var base = new Date(0);
   var skew = base.getTime();
-  if (skew > 0)
+  if (skew > 0){
     date.setTime(date.getTime() - skew);
+  }
 }
 
 /*
@@ -258,16 +263,17 @@ function fnt(id, e, evt) {
     }
     
     // does the footnote tooltip already exist?
-    var fnt = document.getElementById('insitu-fn'+id);
-    if (!fnt) {
+    var fnote = document.getElementById('insitu-fn'+id);
+    var footnote;
+    if (!fnote) {
         // if not create it...
     
         // locate the footnote anchor element
         var a = document.getElementById( "fn"+id );    
-        if (!a) return;
+        if (!a){ return; }
         
         // anchor parent is the footnote container, get its innerHTML
-        var footnote = new String (a.parentNode.innerHTML);
+        footnote = new String (a.parentNode.innerHTML);
         
         // strip the leading footnote anchors and their comma separators
         footnote = footnote.replace(/<a\s.*?href=\".*\#fnt\d+\".*?<\/a>/gi, '');
@@ -276,7 +282,7 @@ function fnt(id, e, evt) {
         // prefix ids on any elements with "insitu-" to ensure they remain unique
         footnote = footnote.replace(/\bid=\"(.*?)\"/gi,'id="insitu-$1');
    	} else {
-        var footnote = new String(fnt.innerHTML);
+        footnote = new String(fnt.innerHTML);
     }
     
     // activate the tooltip
@@ -289,13 +295,13 @@ function fnt(id, e, evt) {
  * Add the edit window size controls
  */
 function initSizeCtl(ctlid,edid){
-		if(!document.getElementById) return;
+		if(!document.getElementById){ return; }
 
     var ctl      = document.getElementById(ctlid);
     var textarea = document.getElementById(edid);
 
     var hgt = getCookie('DokuWikisizeCtl');
-    if(hgt == null){
+    if(hgt === null || hgt === ''){
       textarea.style.height = '300px';
     }else{
       textarea.style.height = hgt;
@@ -319,7 +325,7 @@ function sizeCtl(edid,val){
   var height = parseInt(textarea.style.height.substr(0,textarea.style.height.length-2));
   height += val;
   textarea.style.height = height+'px';
-  
+
   var now = new Date();
   fixDate(now);
   now.setTime(now.getTime() + 365 * 24 * 60 * 60 * 1000); //expire in a year
@@ -330,7 +336,7 @@ function sizeCtl(edid,val){
  * Handler to close all open Popups
  */
 function closePopups(){
-  if(!document.getElementById) return;
+  if(!document.getElementById){ return; }
 
   var divs = document.getElementsByTagName('div');
   for(var i=0; i < divs.length; i++){