From: dhrname Date: Wed, 11 Mar 2015 13:04:28 +0000 (+0900) Subject: Lighten an offset method X-Git-Tag: version22~271 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5a790260f13239188d03e3b1d4333e81d0655100;p=sie%2Fsie.git Lighten an offset method --- diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js index b47c48e..6d584a1 100644 --- a/org/w3c/dom/smil.js +++ b/org/w3c/dom/smil.js @@ -225,13 +225,16 @@ base("$frame").mix ( { /*00:00:0と00:0と、0sなどの文字列をミリ秒へ変換*/ function sec() { - return ( 1000*( _float(str.match(/[\d.]+s$/) || "0") || _float(str.match(/[\d.]+$/) || "0") ) ); + return str2num( 1000, /[\d.]+s$/, /[\d.]+$/ ); }; function min() { - return ( 60000*( _float(str.match(/[\d.]+min$/) || "0") || _float(str.match(/\d\d:[^:]+$/) || "0") ) ); + return str2num( 60000, /[\d.]+min$/, /\d\d:[^:]+$/ ); }; function h() { - return ( 3600000*( _float(str.match(/\d+:\d\d:/) || "0") || _float(str.match(/[\d.]+h$/) || "0") ) ); + return str2num( 3600000, /\d+:\d\d:/, /[\d.]+h$/ ); + }; + function str2num(s, /*RegExp*/ a, /*RegExp*/ b) { + return s*( _float(str.match(a) || "0") || _float(str.match(b) || "0") ); }; },