[eGroupWare-svn] r40722 - /branches/1.8/etemplate/inc/class.etemplate.inc.php

[<ral...@us...>]

Author: ralfbecker
Date: Wed Oct 31 10:20:24 2012
New Revision: 40722

URL: http://svn.stylite.de/viewvc/egroupware?rev=40722&view=rev
Log:
* eTemplate/all apps: fixed not working display of floating point values in input fields for Chrome or Safarie (browsers supporting html5 input type="number")

Modified:
    branches/1.8/etemplate/inc/class.etemplate.inc.php

Modified: branches/1.8/etemplate/inc/class.etemplate.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/1.8/etemplate/inc/class.etemplate.inc.php?rev=40722&r1=40721&r2=40722&view=diff
==============================================================================
--- branches/1.8/etemplate/inc/class.etemplate.inc.php (original)
+++ branches/1.8/etemplate/inc/class.etemplate.inc.php Wed Oct 31 10:20:24 2012
@@ -1879,6 +1879,11 @@
 	/**
 	 * Format a number according to user prefs with decimal and thousands separator (later only for readonly)
 	 *
+	 * HTML5 input type=number requires a float value with a dot, not comma!
+	 * Chrome 22 and Safari 6 shows no value if a comma is used,
+	 * while FF 16, IE 9 and 10 have no support for input type=number :-(
+	 * --> use . as decimal separator for browser supporting html5 input type=number
+	 *
 	 * @param int|float|string $number
 	 * @param int $num_decimal_places=2
 	 * @param boolean $readonly=true
@@ -1895,7 +1900,13 @@
 		}
 		if ((string)$number === '') return '';
 
-		return number_format(str_replace(' ','',$number),$num_decimal_places,$dec_separator,$readonly ? $thousands_separator : '');
+		$ret = number_format(str_replace(' ','',$number), $num_decimal_places,
+			// need to use '.' as decimal separator for all browser supporting html5 input type=number
+			$dec_sep_used=$readonly || !in_array(html::$user_agent, array('chrome', 'safari', 'opera')) ?
+				$dec_separator : '.',
+			$readonly ? $thousands_separator : '');
+		//error_log(__METHOD__."($number, $num_decimal_places, $readonly) html::user_agent=".html::$user_agent.", dec_sep='$dec_separator' --> '$dec_sep_used', thousands_sep='$thousands_separator' returning '$ret'");
+		return $ret;
 	}
 
 	/**