cvs: pear /HTML_Javascript Javascript.php package.xml

alan_k Thu Aug 18 04:52:50 2005 EDT Modified files: /pear/HTML_Javascript Javascript.php package.xml Log: prep for release, and tidy this puppy up http://cvs.php.net/diff.php/pear/HTML_Javascript/Javascript.php?r1=1.36&r2=1.37&ty=u Index: pear/HTML_Javascript/Javascript.php diff -u pear/HTML_Javascript/Javascript.php:1.36 pear/HTML_Javascript/Javascript.php:1.37 --- pear/HTML_Javascript/Javascript.php:1.36 Sun May 1 23:02:26 2005 +++ pear/HTML_Javascript/Javascript.php Thu Aug 18 04:52:50 2005 @@ -16,7 +16,7 @@ // | Authors: Tal Peer <tal@php.net> | // | Pierre-Alain Joye <paj@pearfr.org> | // +----------------------------------------------------------------------+ -// $Id: Javascript.php,v 1.36 2005/05/02 03:02:26 alan_k Exp $ +// $Id: Javascript.php,v 1.37 2005/08/18 08:52:50 alan_k Exp $ /** * A class for performing basic JavaScript operations @@ -100,7 +100,7 @@ } /** Convertion tools */ -require_once('HTML/Javascript/Convert.php'); +require_once 'HTML/Javascript/Convert.php'; /** * Main Javascript class @@ -135,18 +135,7 @@ */ var $_file = ''; - // {{{ HTML_Javascript - - /** - * Constructor - creates a new HTML_Javascript object - * - * @access public - */ - function HTML_Javascript() - { - } - - // }}} HTML_Javascript + // {{{ setOutputMode /** @@ -213,18 +202,21 @@ HTML_JAVASCRIPT_ERROR_NOSTART ); break; + case HTML_JAVASCRIPT_ERROR_NOEND: $ret = PEAR::raiseError( 'Last script was not ended', HTML_JAVASCRIPT_ERROR_NOEND ); break; + case HTML_JAVASCRIPT_ERROR_NOFILE: $ret = PEAR::raiseError( 'A filename must be specified for setoutputMode()', HTML_JAVASCRIPT_ERROR_NOFILE ); break; + default: return PEAR::raiseError( 'Unknown Error', @@ -255,7 +247,6 @@ { $this->_started = true; $s = $defer ? 'defer="defer"' : ''; - //$s = $defer ? 'defer' : ''; $ret = "<script type=\"text/javascript\" ".$s.">". HTML_JAVASCRIPT_NL; return $ret; @@ -303,18 +294,18 @@ return $str; } switch($mode) { - case HTML_JAVASCRIPT_OUTPUT_RETURN: { + case HTML_JAVASCRIPT_OUTPUT_RETURN: return $str; break; - } + - case HTML_JAVASCRIPT_OUTPUT_ECHO: { + case HTML_JAVASCRIPT_OUTPUT_ECHO: echo $str; return true; break; - } + - case HTML_JAVASCRIPT_OUTPUT_FILE: { + case HTML_JAVASCRIPT_OUTPUT_FILE: if ($fp = @fopen($file, 'ab')){ fwrite($fp, $str); } else { @@ -322,11 +313,11 @@ } return true; break; - } - default: { + + default: HTML_Javascript::raiseError('Invalid output mode'); break; - } + } } @@ -372,17 +363,17 @@ function writeLine($str, $var = false) { if ($var) { - $ret = HTML_Javascript::_out( + return HTML_Javascript::_out( 'document.writeln('.$str.'+"<br />")'.HTML_JAVASCRIPT_NL ); - } else { - $ret = HTML_Javascript::_out( - 'document.writeln("'. - HTML_Javascript_Convert::escapeString($str). - '"+"<br />")'.HTML_JAVASCRIPT_NL - ); } - return $ret; + + return HTML_Javascript::_out( + 'document.writeln("'. + HTML_Javascript_Convert::escapeString($str). + '"+"<br />")'.HTML_JAVASCRIPT_NL + ); + } // }}} writeLine http://cvs.php.net/diff.php/pear/HTML_Javascript/package.xml?r1=1.18&r2=1.19&ty=u Index: pear/HTML_Javascript/package.xml diff -u pear/HTML_Javascript/package.xml:1.18 pear/HTML_Javascript/package.xml:1.19 --- pear/HTML_Javascript/package.xml:1.18 Sat Jul 12 04:01:56 2003 +++ pear/HTML_Javascript/package.xml Thu Aug 18 04:52:50 2005 @@ -13,35 +13,43 @@ </description> <maintainers> + <maintainer> + <user>alan_k</user> + <name>Alan Knowles</name> + <email>alan_k@php.net</email> + <role>lead</role> + </maintainer> <maintainer> <user>tal</user> <name>Tal Peer</name> <email>tal@php.net</email> - <role>lead</role> + <role>emeritus</role> </maintainer> <maintainer> <user>pajoye</user> <name>Pierre-Alain Joye</name> <email>paj@pearfr.org</email> - <role>lead</role> + <role>emeritus</role> </maintainer> </maintainers> <release> - <version>1.2.0</version> - <date>2003-xx-xx</date> - <state>alpha</state> + <version>1.1.1</version> + <date>2005-08-18</date> + <state>stable</state> <license>PHP 3.0</license> <notes> - * Licence changed to PHP Licence 3.0 - New features and bug fixes: + + New features and bug fixes: + * fix bug #1055 - correct requires for raising errors + * Licence changed to PHP Licence 3.0 + * add null support * Fixed convertString * Added arrayToProperties (pajoye) * Added convertValue, returns only the JS equivalent value (pajoye) * Cleanup errors * phpdoc fixes and cleanup, supports of phpdocumentor - * The next releases of 1.x branch will contain only bugfixes. - We start from the 2.0 dev branch. + </notes> <filelist> <dir name="/" baseinstalldir="HTML">