javascript fixes #641

darcs-hash:20051126124017-7ad00-7ea49b9ecdae1e7c0b7645245db6ecfc642aa89e.gz

2 files changed, 50 insertions, 46 deletions

diff --git a/lib/exe/js.php b/lib/exe/js.php
index fbcd9ad26..ca1d83948 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -71,7 +71,7 @@ function js_out(){
 
     // load files
     foreach($files as $file){
-        readfile($file);
+        @readfile($file);
     }
 
     // init stuff
diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index cdfed0a84..84cd067cc 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -125,15 +125,14 @@ function showPicker(pickerid,btn){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function initToolbar(tbid,edid,tb){
-		if(!document.getElementById){ return; }
+    if(!document.getElementById){ return; }
     var toolbar = document.getElementById(tbid);
     var cnt = tb.length;
     for(var i=0; i<cnt; i++){
-        // create new button and add to the toolbar
+        // create new button
         btn = createToolButton(tb[i]['icon'],
                                tb[i]['title'],
                                tb[i]['key']);
-        toolbar.appendChild(btn);
 
         // add button action dependend on type
         switch(tb[i]['type']){
@@ -147,20 +146,23 @@ function initToolbar(tbid,edid,tb){
                                         jsEscape(tb[i]['close'])+"','"+
                                         jsEscape(sample)+
                                     "');return false;}");
+                toolbar.appendChild(btn);
                 break;
             case 'insert':
                 eval("btn.onclick = function(){insertAtCarret('"+
                                         jsEscape(edid)+"','"+
                                         jsEscape(tb[i]['insert'])+
                                     "');return false;}");
+                toolbar.appendChild(btn);
                 break;
             case 'signature':
-								if(SIG!=''){
-		                eval("btn.onclick = function(){insertAtCarret('"+
-    		                                    jsEscape(edid)+"','"+
-        		                                jsEscape(SIG)+
-            		                        "');return false;}");
-								}
+                if(typeof(SIG) != 'undefined' && SIG != ''){
+                    eval("btn.onclick = function(){insertAtCarret('"+
+                                            jsEscape(edid)+"','"+
+                                            jsEscape(SIG)+
+                                        "');return false;}");
+                    toolbar.appendChild(btn);
+                }
                 break;
             case 'picker':
                 createPicker('picker'+i,
@@ -169,6 +171,7 @@ function initToolbar(tbid,edid,tb){
                              edid);
                 eval("btn.onclick = function(){showPicker('picker"+i+
                                     "',this);return false;}");
+                toolbar.appendChild(btn);
                 break;
             case 'mediapopup':
                 eval("btn.onclick = function(){window.open('"+
@@ -176,6 +179,7 @@ function initToolbar(tbid,edid,tb){
                                         jsEscape(tb[i]['name'])+"','"+
                                         jsEscape(tb[i]['options'])+
                                     "');return false;}");
+                toolbar.appendChild(btn);
                 break;
         } // end switch
     } // end for
@@ -341,44 +345,44 @@ function changeCheck(msg){
  * Sets focus to the editbox as well
  */
 function initChangeCheck(msg){
-		if(!document.getElementById){ return false; }
-		// add change check for links
-		var links = document.getElementsByTagName('a');
-		for(var i=0; i < links.length; i++){
-				if(links[i].className.indexOf('JSnocheck') == -1){
-						links[i].onclick = function(){return changeCheck(msg);};
-						links[i].onkeypress = function(){return changeCheck(msg);};
-				}
-		}
-		// add change check for forms
+    if(!document.getElementById){ return false; }
+    // add change check for links
+    var links = document.getElementsByTagName('a');
+    for(var i=0; i < links.length; i++){
+        if(links[i].className.indexOf('JSnocheck') == -1){
+            links[i].onclick = function(){return changeCheck(msg);};
+            links[i].onkeypress = function(){return changeCheck(msg);};
+        }
+    }
+    // add change check for forms
     var forms = document.forms;
     for(i=0; i < forms.length; i++){
-				if(forms[i].className.indexOf('JSnocheck') == -1){
-		        forms[i].onsubmit = function(){return changeCheck(msg);};
-				}
+        if(forms[i].className.indexOf('JSnocheck') == -1){
+            forms[i].onsubmit = function(){return changeCheck(msg);};
+        }
     }
 
-		// reset change memory var on submit
-		var btn_save        = document.getElementById('edbtn_save');
-		btn_save.onclick    = function(){ textChanged = false; };
-		btn_save.onkeypress = function(){ textChanged = false; };
-		var btn_prev        = document.getElementById('edbtn_preview');
-		btn_prev.onclick    = function(){ textChanged = false; };
-		btn_prev.onkeypress = function(){ textChanged = false; };
-
-		// add change memory setter
-		var edit_text   = document.getElementById('wikitext');
-		edit_text.onchange = function(){
-				textChanged = true; //global var
-				summaryCheck();
-		};
-		edit_text.onkeyup  = summaryCheck;
-		var summary = document.getElementById('summary');
-		summary.onchange = summaryCheck;
-		summary.onkeyup  = summaryCheck;
-
-		// set focus
-		edit_text.focus();
+    // reset change memory var on submit
+    var btn_save        = document.getElementById('edbtn_save');
+    btn_save.onclick    = function(){ textChanged = false; };
+    btn_save.onkeypress = function(){ textChanged = false; };
+    var btn_prev        = document.getElementById('edbtn_preview');
+    btn_prev.onclick    = function(){ textChanged = false; };
+    btn_prev.onkeypress = function(){ textChanged = false; };
+
+    // add change memory setter
+    var edit_text   = document.getElementById('wikitext');
+    edit_text.onchange = function(){
+        textChanged = true; //global var
+        summaryCheck();
+    };
+    edit_text.onkeyup  = summaryCheck;
+    var summary = document.getElementById('summary');
+    summary.onchange = summaryCheck;
+    summary.onkeyup  = summaryCheck;
+
+    // set focus
+    edit_text.focus();
 }
 
 /**
@@ -389,9 +393,9 @@ function initChangeCheck(msg){
 function summaryCheck(){
     var sum = document.getElementById('summary');
     if(sum.value === ''){
-      	sum.className='missing';
+        sum.className='missing';
     }else{
-      	sum.className='edit';
+        sum.className='edit';
     }
 }