Winmerge added weird extra lines?

Removed those extra lines.

diff --git a/lib/javascript.php b/lib/javascript.php
index 79496bcd038d7ef3d354f44ba69136a75e8ef396..22fbf70eab28a846e657bc2da3cc5d02509ad852 100644 (file)
--- a/lib/javascript.php
+++ b/lib/javascript.php
@@ -11,173 +11,89 @@
 
 <!-- //hide
 
-
-
 function popUpProperties(inobj) {
-
   op = window.open();
-
   op.document.open('text/plain');
-
   for (objprop in inobj) {
-
     op.document.write(objprop + ' => ' + inobj[objprop] + '\n');
-
   }
-
   op.document.close();
-
 }
 
-
-
 function fillmessagebox(text) {
-
   document.form.message.value = text;
-
 }
 
-
-
 function openpopup(url,name,options,fullscreen) {
-
   fullurl = "<?php echo $CFG->wwwroot ?>" + url;
-
   windowobj = window.open(fullurl,name,options);
-
   if (fullscreen) {
-
      windowobj.moveTo(0,0);
-
      windowobj.resizeTo(screen.availWidth,screen.availHeight);
-
   }
-
   windowobj.focus();
-
   return false;
-
 }
 
-
-
 function copyrichtext(textname) {
-
 /// Legacy stub for old editor - to be removed soon
-
   return true;
-
 }
 
-
-
 function checkall() {
-
   void(d=document);
-
   void(el=d.getElementsByTagName('INPUT'));
-
   for(i=0;i<el.length;i++)
-
     void(el[i].checked=1)
-
 }
 
-
-
 function inserttext(text) {
-
 <?php
-
     if (!empty($SESSION->inserttextform)) {
-
         $insertfield = "opener.document.forms['$SESSION->inserttextform'].$SESSION->inserttextfield";
-
     } else {
-
         $insertfield = "opener.document.forms['theform'].message";
-
     }
-
     echo "  text = ' ' + text + ' ';\n";
-
     echo "  if ( $insertfield.createTextRange && $insertfield.caretPos) {\n";
-
     echo "    var caretPos = $insertfield.caretPos;\n";
-
     echo "    caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? text + ' ' : text;\n";
-
     echo "  } else {\n";
-
     echo "    $insertfield.value  += text;\n";
-
     echo "  }\n";
-
     echo "  $insertfield.focus();\n";
-
 ?>
-
 }
 
-
-
 function lockoptions(form, master, subitems) {
-
   // subitems is an array of names of sub items
-
   // requires that each item in subitems has a
-
   // companion hidden item in the form with the
-
   // same name but prefixed by "h"
-
   if (eval("document."+form+"."+master+".checked")) {
-
     for (i=0; i<subitems.length; i++) {
-
       unlockoption(form, subitems[i]);
-
     }
-
   } else {
-
     for (i=0; i<subitems.length; i++) {
-
       lockoption(form, subitems[i]);
-
     }
-
   }
-
   return(true);
-
 }
 
 function lockoption(form,item) {
-
   eval("document."+form+"."+item+".disabled=true");/* IE thing */
-
   eval("document."+form+".h"+item+".value=1");
-
 }
 
 function unlockoption(form,item) {
-
   eval("document."+form+"."+item+".disabled=false");/* IE thing */
-
   eval("document."+form+".h"+item+".value=0");
-
 }
 
-
-
 <?php if ($focus) { echo "function setfocus() { document.$focus.focus() }\n"; } ?>
 
-
-
 // done hiding -->
 
 </script>
-
-
-