From: Geoffrey T. D. <da...@us...> - 2003-02-27 22:48:48
|
Update of /cvsroot/phpwiki/phpwiki/lib/plugin In directory sc8-pr-cvs1:/tmp/cvs-serv31703a/lib/plugin Modified Files: PageHistory.php RecentChanges.php Log Message: Fixes invalid HTML generated by PageHistory plugin. (<noscript> is block-level and not allowed within <p>.) Index: PageHistory.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/PageHistory.php,v retrieving revision 1.26 retrieving revision 1.27 diff -u -2 -b -p -d -r1.26 -r1.27 --- PageHistory.php 27 Feb 2003 21:15:14 -0000 1.26 +++ PageHistory.php 27 Feb 2003 22:48:44 -0000 1.27 @@ -99,19 +99,15 @@ extends _RecentChanges_HtmlFormatter } - function _javascript($script) { - return HTML::script(array('language' => 'JavaScript', - 'type' => 'text/javascript'), - new RawXml("<!-- //\n$script\n// -->")); - } - function description() { - // Doesn't work (PHP bug?): $desc = parent::description() . "\n"; $button = HTML::input(array('type' => 'submit', 'value' => _("compare revisions"), 'class' => 'wikiaction')); - return array(_RecentChanges_HtmlFormatter::description(), "\n", - $this->_javascript(sprintf('document.write("%s");', - _("Check any two boxes to compare revisions."))), - HTML::noscript(fmt("Check any two boxes then %s.", $button))); + + $js_desc = $no_js_desc = _RecentChanges_HtmlFormatter::description(); + + $js_desc->pushContent("\n", _("Check any two boxes to compare revisions.")); + $no_js_desc->pushContent("\n", fmt("Check any two boxes then %s.", $button)); + + return IfJavaScript($js_desc, $no_js_desc); } @@ -142,5 +138,5 @@ extends _RecentChanges_HtmlFormatter $html), "\n", - $this->_javascript(' + JavaScript(' var diffCkBoxes = document.forms["diff-select"].elements["versions[]"]; @@ -324,4 +320,9 @@ extends WikiPlugin_RecentChanges // $Log$ +// Revision 1.27 2003/02/27 22:48:44 dairiki +// Fixes invalid HTML generated by PageHistory plugin. +// +// (<noscript> is block-level and not allowed within <p>.) +// // Revision 1.26 2003/02/27 21:15:14 dairiki // Javascript fix. Index: RecentChanges.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RecentChanges.php,v retrieving revision 1.75 retrieving revision 1.76 diff -u -2 -b -p -d -r1.75 -r1.76 --- RecentChanges.php 22 Feb 2003 21:39:05 -0000 1.75 +++ RecentChanges.php 27 Feb 2003 22:48:44 -0000 1.76 @@ -242,5 +242,5 @@ extends _RecentChanges_Formatter $desc = fmt("All %s are listed below.", $edits); } - return $desc; + return HTML::p(false, $desc); } @@ -271,8 +271,8 @@ extends _RecentChanges_Formatter ." \"$sidebarurl\",\"\");\n" ."}\n"; - $jsf = $this->_javascript($addsidebarjsfunc); + $jsf = JavaScript($addsidebarjsfunc); $addsidebarjsclick = " " . "<small style=\"font-weight:normal;\"><a href=\"javascript:addPanel();\">sidebar</a></small>"; - $jsc = $this->_javascript("if ((typeof window.sidebar == 'object') &&\n" + $jsc = JavaScript("if ((typeof window.sidebar == 'object') &&\n" ." (typeof window.sidebar.addPanel == 'function'))\n" ." {\n" @@ -283,10 +283,4 @@ extends _RecentChanges_Formatter } - function _javascript($script) { - return HTML::script(array('language' => 'JavaScript', - 'type' => 'text/javascript'), - new RawXml("<!-- //\n$script\n// -->")); - } - function format ($changes) { include_once('lib/InlineParser.php'); @@ -294,5 +288,5 @@ extends _RecentChanges_Formatter $html = HTML(HTML::h2(false, $this->title())); if (($desc = $this->description())) - $html->pushContent(HTML::p(false, $desc)); + $html->pushContent($desc); if ($this->_args['daylist']) @@ -776,4 +770,9 @@ class DayButtonBar extends HtmlElement { // $Log$ +// Revision 1.76 2003/02/27 22:48:44 dairiki +// Fixes invalid HTML generated by PageHistory plugin. +// +// (<noscript> is block-level and not allowed within <p>.) +// // Revision 1.75 2003/02/22 21:39:05 dairiki // Hackish fix for SF bug #622784. |