From: <var...@us...> - 2011-09-21 13:14:56
|
Revision: 8113 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8113&view=rev Author: vargenau Date: 2011-09-21 13:14:50 +0000 (Wed, 21 Sep 2011) Log Message: ----------- Add semi-colon at end of lines Modified Paths: -------------- trunk/themes/default/toolbar.js Modified: trunk/themes/default/toolbar.js =================================================================== --- trunk/themes/default/toolbar.js 2011-09-13 07:22:20 UTC (rev 8112) +++ trunk/themes/default/toolbar.js 2011-09-21 13:14:50 UTC (rev 8113) @@ -3,7 +3,7 @@ // Some "constants" var doctype = '<?xml version="1.0" encoding="utf-8"?>\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'; -var cssfile = '<link rel="stylesheet" type="text/css" href="'+data_path+'/themes/default/toolbar.css" />' +var cssfile = '<link rel="stylesheet" type="text/css" href="'+data_path+'/themes/default/toolbar.css" />'; // Un-trap us from framesets if( window.top != window ) window.top.location = window.location; @@ -65,7 +65,7 @@ // do special actions dependent on fromid: tb-categories if (fromid == 'tb-categories') { var txtarea = document.getElementById('edit-content'); - text = unescapeSpecial(text) + text = unescapeSpecial(text); txtarea.value += '\n'+text; } else { insertTags(text, '', '\n'); @@ -126,7 +126,7 @@ //f=document.getElementById('editpage'); var txtarea = document.getElementById('edit-content'); // var txtarea = document.editpage.edit[content]; - tagOpen = unescapeSpecial(tagOpen) + tagOpen = unescapeSpecial(tagOpen); if(document.selection) { var theSelection = document.selection.createRange().text; @@ -175,21 +175,21 @@ var f, sr_undo, replacewin, undo_buffer=new Array(), undo_buffer_index=0; function define_f() { - f=document.getElementById('editpage') - f.editarea=document.getElementById('edit-content') - sr_undo=document.getElementById('sr_undo') - undo_enable(false) - f.editarea.focus() + f=document.getElementById('editpage'); + f.editarea=document.getElementById('edit-content'); + sr_undo=document.getElementById('sr_undo'); + undo_enable(false); + f.editarea.focus(); } function undo_enable(bool) { if (bool) { - sr_undo.src=uri_undo_btn - sr_undo.alt=msg_undo_alt - sr_undo.disabled = false + sr_undo.src=uri_undo_btn; + sr_undo.alt=msg_undo_alt; + sr_undo.disabled = false; } else { - sr_undo.src=uri_undo_d_btn - sr_undo.alt=msg_undo_d_alt - sr_undo.disabled = true + sr_undo.src=uri_undo_d_btn; + sr_undo.alt=msg_undo_d_alt; + sr_undo.disabled = true; if(sr_undo.blur) sr_undo.blur(); } } @@ -208,9 +208,9 @@ return false; } function do_replace() { - var txt = undo_buffer[undo_buffer_index]=f.editarea.value - var searchinput = new RegExp(replacewin.document.forms[0].searchinput.value,'g') - var replaceinput = replacewin.document.forms[0].replaceinput.value + var txt = undo_buffer[undo_buffer_index]=f.editarea.value; + var searchinput = new RegExp(replacewin.document.forms[0].searchinput.value,'g'); + var replaceinput = replacewin.document.forms[0].replaceinput.value; if (searchinput==''||searchinput==null) { if (replacewin) replacewin.window.document.forms[0].searchinput.focus(); return; @@ -218,8 +218,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) + msg_replfound = msg_replfound.replace('\1', searchinput).replace('\2', z_repl).replace('\3', replaceinput); + 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(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-07-31 08:45:44
|
Revision: 9035 http://sourceforge.net/p/phpwiki/code/9035 Author: vargenau Date: 2014-07-31 08:45:40 +0000 (Thu, 31 Jul 2014) Log Message: ----------- Use HTML 5 doctype Modified Paths: -------------- trunk/themes/default/toolbar.js Modified: trunk/themes/default/toolbar.js =================================================================== --- trunk/themes/default/toolbar.js 2014-07-30 16:09:24 UTC (rev 9034) +++ trunk/themes/default/toolbar.js 2014-07-31 08:45:40 UTC (rev 9035) @@ -1,7 +1,7 @@ // Toolbar JavaScript support functions. Taken from mediawiki // Some "constants" -var doctype = '<?xml version="1.0" encoding="utf-8"?>\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'; +var doctype = '<!DOCTYPE html>'; var cssfile = '<link rel="stylesheet" type="text/css" href="'+data_path+'/themes/default/toolbar.css" />'; // Un-trap us from framesets This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-07-31 09:18:40
|
Revision: 9037 http://sourceforge.net/p/phpwiki/code/9037 Author: vargenau Date: 2014-07-31 09:18:36 +0000 (Thu, 31 Jul 2014) Log Message: ----------- No empty action in form Modified Paths: -------------- trunk/themes/default/toolbar.js Modified: trunk/themes/default/toolbar.js =================================================================== --- trunk/themes/default/toolbar.js 2014-07-31 09:03:47 UTC (rev 9036) +++ trunk/themes/default/toolbar.js 2014-07-31 09:18:36 UTC (rev 9037) @@ -49,7 +49,7 @@ pullwin.window.document.writeln(cssfile); 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 action=\"\"><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;\">'); + 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++){ if (typeof pages[i] == 'string') pullwin.window.document.write('<option value="'+pages[i]+'">'+escapeQuotes(pages[i])+'</option>\n'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-07-31 09:50:16
|
Revision: 9038 http://sourceforge.net/p/phpwiki/code/9038 Author: vargenau Date: 2014-07-31 09:50:05 +0000 (Thu, 31 Jul 2014) Log Message: ----------- Close the window with Escape key Modified Paths: -------------- trunk/themes/default/toolbar.js Modified: trunk/themes/default/toolbar.js =================================================================== --- trunk/themes/default/toolbar.js 2014-07-31 09:18:36 UTC (rev 9037) +++ trunk/themes/default/toolbar.js 2014-07-31 09:50:05 UTC (rev 9038) @@ -44,6 +44,12 @@ var h = (screen.height-height)/2; var w = (screen.width-width)/2; pullwin = window.open('','','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,top='+h+',left='+w+',height='+height+',width='+width); + // Close the window with Escape key + pullwin.onkeydown = function(e){ + if(e.keyCode === 27){ + pullwin.window.close(); + } + }; pullwin.window.document.writeln(doctype); pullwin.window.document.writeln('<html>\n<head>\n<title>'+escapeQuotes(title)+'</title>'); pullwin.window.document.writeln(cssfile); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-07-31 16:00:05
|
Revision: 9046 http://sourceforge.net/p/phpwiki/code/9046 Author: vargenau Date: 2014-07-31 15:59:56 +0000 (Thu, 31 Jul 2014) Log Message: ----------- No tabs Modified Paths: -------------- trunk/themes/default/toolbar.js Modified: trunk/themes/default/toolbar.js =================================================================== --- trunk/themes/default/toolbar.js 2014-07-31 14:40:26 UTC (rev 9045) +++ trunk/themes/default/toolbar.js 2014-07-31 15:59:56 UTC (rev 9046) @@ -1,4 +1,4 @@ -// Toolbar JavaScript support functions. Taken from mediawiki +// Toolbar JavaScript support functions. Taken from mediawiki // Some "constants" var doctype = '<!DOCTYPE html>'; @@ -22,16 +22,14 @@ //width=\"23\" height=\"22\" document.write(");\"><img src=\""+imageFile+"\" width=\"18\" height=\"18\" border=\"0\" alt=\""+speedTip+"\" title=\""+speedTip+"\">"); document.write("</a>"); - return; } function addTagButton(imageFile, speedTip, tagOpen, tagClose, sampleText) { addButton(imageFile, speedTip, "insertTags", [tagOpen, tagClose, sampleText]); - return; } -// This function generates a popup list to select from. +// This function generates a popup list to select from. // In an external window so far, but we really want that as acdropdown pulldown, hence the name. -// plugins, pagenames, categories, templates. +// plugins, pagenames, categories, templates. // Not with document.write because we cannot use self.opener then. //function addPulldown(imageFile, speedTip, pages) { // addButton(imageFile, speedTip, "showPulldown", pages); @@ -69,13 +67,12 @@ function do_pulldown(text,fromid) { // do special actions dependent on fromid: tb-categories if (fromid == 'tb-categories') { - var txtarea = document.getElementById('edit-content'); - text = unescapeSpecial(text); - txtarea.value += '\n'+text; + var txtarea = document.getElementById('edit-content'); + text = unescapeSpecial(text); + txtarea.value += '\n'+text; } else { - insertTags(text, '', '\n'); + insertTags(text, '', '\n'); } - return; } function addInfobox(infoText) { // if no support for changing selection, add a small copy & paste field @@ -85,8 +82,8 @@ if(!document.selection && !is_nav) { infoText=escapeQuotesHTML(infoText); document.write("<form name='infoform' id='infoform'>"+ - "<input size=80 id='infobox' name='infobox' value=\""+ - infoText+"\" readonly=\"readonly\"></form>"); + "<input size=80 id='infobox' name='infobox' value=\""+ + infoText+"\" readonly=\"readonly\"></form>"); } } function escapeQuotes(text) { @@ -151,9 +148,9 @@ var myText = (txtarea.value).substring(startPos, endPos); if(!myText) { myText=sampleText;} if(myText.charAt(myText.length - 1) == " "){ // exclude ending space char, if any - subst = tagOpen + myText.substring(0, (myText.length - 1)) + tagClose + " "; + subst = tagOpen + myText.substring(0, (myText.length - 1)) + tagClose + " "; } else { - subst = tagOpen + myText + tagClose; + subst = tagOpen + myText + tagClose; } txtarea.value = txtarea.value.substring(0, startPos) + subst + txtarea.value.substring(endPos, txtarea.value.length); txtarea.focus(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-08-01 08:48:04
|
Revision: 9047 http://sourceforge.net/p/phpwiki/code/9047 Author: vargenau Date: 2014-08-01 08:47:57 +0000 (Fri, 01 Aug 2014) Log Message: ----------- Close the window with Escape key Modified Paths: -------------- trunk/themes/default/toolbar.js Modified: trunk/themes/default/toolbar.js =================================================================== --- trunk/themes/default/toolbar.js 2014-07-31 15:59:56 UTC (rev 9046) +++ trunk/themes/default/toolbar.js 2014-08-01 08:47:57 UTC (rev 9047) @@ -201,6 +201,12 @@ var h = (screen.height-height)/2; var w = (screen.width-width)/2; replacewin = window.open('','','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,top='+h+',left='+w+',height='+height+',width='+width); + // Close the window with Escape key + replacewin.onkeydown = function(e){ + if(e.keyCode === 27){ + replacewin.window.close(); + } + }; replacewin.window.document.writeln(doctype); replacewin.window.document.writeln('<html>\n<head>\n<title>'+msg_repl_title+'</title>'); replacewin.window.document.writeln(cssfile); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-04-03 11:45:15
|
Revision: 9643 http://sourceforge.net/p/phpwiki/code/9643 Author: vargenau Date: 2015-04-03 11:45:13 +0000 (Fri, 03 Apr 2015) Log Message: ----------- Do not force image size in toolbar Modified Paths: -------------- trunk/themes/default/toolbar.js Modified: trunk/themes/default/toolbar.js =================================================================== --- trunk/themes/default/toolbar.js 2015-04-03 11:28:26 UTC (rev 9642) +++ trunk/themes/default/toolbar.js 2015-04-03 11:45:13 UTC (rev 9643) @@ -19,8 +19,7 @@ if (i>0) document.write(","); document.write("'"+escapeQuotes(args[i])+"'"); } - //width=\"23\" height=\"22\" - document.write(");\"><img src=\""+imageFile+"\" width=\"18\" height=\"18\" border=\"0\" alt=\""+speedTip+"\" title=\""+speedTip+"\">"); + document.write(");\"><img src=\""+imageFile+"\" alt=\""+speedTip+"\" title=\""+speedTip+"\">"); document.write("</a>"); } function addTagButton(imageFile, speedTip, tagOpen, tagClose, sampleText) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <var...@us...> - 2015-04-10 17:37:02
|
Revision: 9666 http://sourceforge.net/p/phpwiki/code/9666 Author: vargenau Date: 2015-04-10 17:36:55 +0000 (Fri, 10 Apr 2015) Log Message: ----------- msg_replfound and msg_replnot are globals Modified Paths: -------------- trunk/themes/default/toolbar.js Modified: trunk/themes/default/toolbar.js =================================================================== --- trunk/themes/default/toolbar.js 2015-04-10 17:12:45 UTC (rev 9665) +++ trunk/themes/default/toolbar.js 2015-04-10 17:36:55 UTC (rev 9666) @@ -201,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); - var msg_replfound = msg_replfound.replace('\1', searchinput).replace('\2', z_repl).replace('\3', replaceinput); - var msg_replnot = msg_replnot.replace('%s', searchinput); + msg_replfound = msg_replfound.replace('\1', searchinput).replace('\2', z_repl).replace('\3', replaceinput); + 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(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |