From: <var...@us...> - 2015-04-10 17:12:52
|
Revision: 9665 http://sourceforge.net/p/phpwiki/code/9665 Author: vargenau Date: 2015-04-10 17:12:45 +0000 (Fri, 10 Apr 2015) Log Message: ----------- Declare Javascript variables Modified Paths: -------------- trunk/themes/default/toolbar.js Modified: trunk/themes/default/toolbar.js =================================================================== --- trunk/themes/default/toolbar.js 2015-04-10 16:52:16 UTC (rev 9664) +++ trunk/themes/default/toolbar.js 2015-04-10 17:12:45 UTC (rev 9665) @@ -45,7 +45,7 @@ pullwin.window.document.writeln('</head>\n<body>'); pullwin.window.document.writeln('<p>\nYou can double-click to insert.\n</p>'); pullwin.window.document.writeln('<form><div id=\"buttons\"><input type=\"button\" value=\"'+okbutton+'\" onclick=\"if(self.opener)self.opener.do_pulldown(document.forms[0].select.value,\''+fromid+'\'); return false;\" /><input type=\"button\" value=\"'+closebutton+'\" onclick=\"self.close(); return false;\" /></div>\n<div>\n<select style=\"margin-top:10px;width:190px;\" name=\"select\" size=\"'+((pages.length>20)?'20':new String(pages.length))+'\" ondblclick=\"if(self.opener)self.opener.do_pulldown(document.forms[0].select.value,\''+fromid+'\'); return false;\">'); - for (i=0; i<pages.length; i++){ + for (var i=0; i<pages.length; i++){ if (typeof pages[i] == 'string') pullwin.window.document.write('<option value="'+pages[i]+'">'+escapeQuotes(pages[i])+'</option>\n'); else // array=object @@ -78,19 +78,19 @@ // IE var re=new RegExp('%0A',"g"); text = text.replace(re,'\n'); - var re=new RegExp('%22',"g"); + re=new RegExp('%22',"g"); text = text.replace(re,'"'); - var re=new RegExp('%27',"g"); + re=new RegExp('%27',"g"); text = text.replace(re,'\''); - var re=new RegExp('%09',"g"); + re=new RegExp('%09',"g"); text = text.replace(re,' '); - var re=new RegExp('%7C',"g"); + re=new RegExp('%7C',"g"); text = text.replace(re,'|'); - var re=new RegExp('%5B',"g"); + re=new RegExp('%5B',"g"); text = text.replace(re,'['); - var re=new RegExp('%5D',"g"); + re=new RegExp('%5D',"g"); text = text.replace(re,']'); - var re=new RegExp('%5C',"g"); + re=new RegExp('%5C',"g"); text = text.replace(re,'\\'); return text; } @@ -121,6 +121,7 @@ var scrollTop=txtarea.scrollTop; var myText = (txtarea.value).substring(startPos, endPos); if(!myText) { myText=sampleText;} + var subst; if(myText.charAt(myText.length - 1) == " "){ // exclude ending space char, if any subst = tagOpen + myText.substring(0, (myText.length - 1)) + tagClose + " "; } else { @@ -200,8 +201,8 @@ var z_repl=txt.match(searchinput)? txt.match(searchinput).length : 0; txt=txt.replace(searchinput,replaceinput); searchinput=searchinput.toString().substring(1,searchinput.toString().length-2); - msg_replfound = msg_replfound.replace('\1', searchinput).replace('\2', z_repl).replace('\3', replaceinput); - msg_replnot = msg_replnot.replace('%s', searchinput); + var msg_replfound = msg_replfound.replace('\1', searchinput).replace('\2', z_repl).replace('\3', replaceinput); + var msg_replnot = msg_replnot.replace('%s', searchinput); result(z_repl, msg_replfound, txt, msg_replnot); replacewin.window.focus(); replacewin.window.document.forms[0].searchinput.focus(); @@ -219,8 +220,7 @@ } } function do_undo() { - if(undo_buffer_index==0) return; - else if(undo_buffer_index>0) { + if(undo_buffer_index>0) { f.editarea.value=undo_buffer[undo_buffer_index-1]; undo_buffer[undo_buffer_index]=null; undo_buffer_index--; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |