[phpwiki-checkins] CVS: phpwiki/lib editpage.php,1.75,1.76

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20311

Modified Files:
	editpage.php 
Log Message:
fix JS_SEARCHREPLACE
  don't use document.write for replace, otherwise self.opener is not defined.


Index: editpage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -2 -b -p -d -r1.75 -r1.76
--- editpage.php	16 Sep 2004 08:00:52 -0000	1.75
+++ editpage.php	15 Nov 2004 15:37:34 -0000	1.76
@@ -168,4 +168,5 @@ function replace() {
 ."\" onclick=\"self.close()\"></td></tr></table></center></form></body></html>');
    replacewin.window.document.close();
+   return false;
 }
 
@@ -297,19 +298,39 @@ function speich() {
         }
         $toolbar.="addInfobox('" . addslashes( _("Click a button to get an example text") ) . "');\n";
+
         if (defined('JS_SEARCHREPLACE') and JS_SEARCHREPLACE) {
             $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.gif"); 
             //$redo_btn = $WikiTheme->getImageURL("ed_redo.gif");
             $sr_btn   = $WikiTheme->getImageURL("ed_replace.gif");
-            $sr_js = '<input type="image" class="toolbar" id="sr_undo" src="'.$undo_d_btn.'" title="'._("Undo Search & Replace").'" disabled="disabled" value="Undo" onfocus="if(this.blur && undo_buffer_index==0) this.blur()" onclick="do_undo()">'
+            $sr_html = HTML(HTML::input(array(
+                                              'type' =>"image",
+                                              'class'=>"toolbar",
+                                              'id'   =>"sr_undo",
+                                              'src'  =>$undo_d_btn,
+                                              'title'=>_("Undo Search & Replace"),
+                                              'disabled'=>"disabled", 
+                                              'value'   =>"Undo",
+                                              'onfocus' =>"if(this.blur && undo_buffer_index==0) this.blur()",
+                                              'onclick' =>"do_undo()")),
+                            HTML::input(array('type'=>"image",
+                                              'class'=>"toolbar",
+                                              'src'=>$sr_btn,
+                                              'title'=>_("Search & Replace"),
+                                              'onclick'=>"replace()")));
+            /*$sr_js = '<input type="image" class="toolbar" id="sr_undo" src="'.$undo_d_btn.'" title="'._("Undo Search & Replace").'" disabled="disabled" value="Undo" onfocus="if(this.blur && undo_buffer_index==0) this.blur()" onclick="do_undo()">'
                 // . '<input type="image" class="toolbar" src="'.$redo_btn.'" title="'._("Snap").'" onclick="speich()">'
                 . '<input type="image" class="toolbar" src="'.$sr_btn.'" title="'._("Search & Replace").'" onclick="replace()">';
             $toolbar.='document.writeln("'.addslashes($sr_js).'");'."\n";
-        }
+            */
+        } else $sr_html = '';
         // More:
         // Button to generate pagenames, display in extra window as pulldown and insert
         // Button to generate plugins, display in extra window as pulldown and insert
         // Button to generate categories, display in extra window as pulldown and insert
-        $toolbar.="document.writeln(\"</div>\");";
-        return Javascript($toolbar);
+        $toolbar_end = "document.writeln(\"</div>\");";
+        // don't use document.write for replace, otherwise self.opener is not defined.
+        return HTML(Javascript($toolbar),
+                    $sr_html,
+                    Javascript($toolbar_end));
     }
 
@@ -763,4 +784,8 @@ extends PageEditor
 /**
  $Log$
+ Revision 1.76  2004/11/15 15:37:34  rurban
+ fix JS_SEARCHREPLACE
+   don't use document.write for replace, otherwise self.opener is not defined.
+
  Revision 1.75  2004/09/16 08:00:52  rurban
  just some comments