cvs: pear /HTML_Javascript/Javascript Convert.php

From: Date: Thu, 18 Aug 2005 08:55:10 +0000
Subject: cvs: pear /HTML_Javascript/Javascript Convert.php
Groups: php.pear.cvs 
Request: Send a blank email to pear-cvs+get-34091@lists.php.net to get a copy of this message
alan_k Thu Aug 18 04:55:10 2005 EDT Modified files: /pear/HTML_Javascript/Javascript Convert.php Log: prep for release, and tidy this puppy up http://cvs.php.net/diff.php/pear/HTML_Javascript/Javascript/Convert.php?r1=1.14&r2=1.15&ty=u Index: pear/HTML_Javascript/Javascript/Convert.php diff -u pear/HTML_Javascript/Javascript/Convert.php:1.14 pear/HTML_Javascript/Javascript/Convert.php:1.15 --- pear/HTML_Javascript/Javascript/Convert.php:1.14 Tue Apr 13 22:02:22 2004 +++ pear/HTML_Javascript/Javascript/Convert.php Thu Aug 18 04:55:07 2005 @@ -16,7 +16,7 @@ // | Authors: Tal Peer <tal@php.net> | // | Pierre-Alain Joye <paj@pearfr.org> | // +----------------------------------------------------------------------+ -// $Id: Convert.php,v 1.14 2004/04/14 02:02:22 alan_k Exp $ +// $Id: Convert.php,v 1.15 2005/08/18 08:55:07 alan_k Exp $ /** * A class for converting PHP variables into JavaScript variables * @@ -113,6 +113,7 @@ return HTML_Javascript_Convert::convertBoolean( $var, $varname, $global ); + case 'integer': case 'double': $ret = ''; @@ -121,18 +122,22 @@ } $ret .= $varname.' = '.$var; return $ret.';'.HTML_JAVASCRIPT_NL; + case 'string': return HTML_Javascript_Convert::convertString( $var, $varname, $global ); + case 'array': return HTML_Javascript_Convert::convertArray( $var, $varname, $global ); + case 'NULL': return HTML_Javascript_Convert::convertNull( $varname, $global ); + default: return HTML_Javascript_Convert::raiseError( HTML_JAVASCRIPT_ERROR_CONVERT_INVVAR, __FUNCTION__.':'.$var_type @@ -153,12 +158,13 @@ */ function raiseError($code,$str='') { - require_once('PEAR.php'); - switch ($code) { + require_once 'PEAR.php'; + switch ($code) { case HTML_JAVASCRIPT_CONVERT_ERROR_INVVAR: return PEAR::raiseError( 'Invalid variable:'.$str, $code ); + default: return PEAR::raiseError( 'Unknown Error:'.$str, $code @@ -182,7 +188,7 @@ function convertString($str, $varname, $global = false) { $var = ''; - if($global) { + if ($global) { $var = 'var '; } $str = HTML_Javascript_Convert::escapeString($str); @@ -207,7 +213,7 @@ function convertBoolean($bool, $varname, $global = false) { $var = ''; - if($global) { + if ($global) { $var = 'var '; } $var .= $varname.' = '; @@ -304,9 +310,7 @@ * @param boolean $new if true, the JS var will be set * @return mixed a PEAR_Error or the converted array */ - function convertArrayToProperties( - $array, $varname, $global=false, $new=true - ) + function convertArrayToProperties( $array, $varname, $global=false, $new=true ) { if(is_array($array)){ $cnt = sizeof($array)-1; @@ -348,17 +352,22 @@ switch ( gettype($val) ) { case 'boolean': return $val ? 'true' : 'false'; + case 'integer': case 'double': return $val; + case 'string': return "'".HTML_Javascript_Convert::escapeString($val)."'"; + case 'array': return HTML_Javascript_Convert::convertArray( $val, $varname, $global ); + case 'NULL': return 'null'; + default: return HTML_Javascript_Convert::raiseError( HTML_JAVASCRIPT_ERROR_CONVERT_INVVAR, __FUNCTION__.':'.gettype($val)

« previous php.pear.cvs (#34091) next »