Lighten an offset method

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index b47c48e..6d584a1 100644 (file)
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -225,13 +225,16 @@ base("$frame").mix ( {
       \r
       /*00:00:0と00:0と、0sなどの文字列をミリ秒へ変換*/\r
       function sec() {\r
-        return  ( 1000*( _float(str.match(/[\d.]+s$/) || "0") || _float(str.match(/[\d.]+$/) || "0") ) );\r
+        return str2num( 1000, /[\d.]+s$/, /[\d.]+$/ );\r
       };\r
       function min() {\r
-        return ( 60000*( _float(str.match(/[\d.]+min$/) || "0") || _float(str.match(/\d\d:[^:]+$/) || "0") ) );\r
+        return str2num( 60000, /[\d.]+min$/, /\d\d:[^:]+$/ );\r
       };\r
       function h() {\r
-        return ( 3600000*( _float(str.match(/\d+:\d\d:/) || "0") || _float(str.match(/[\d.]+h$/) || "0") ) );\r
+        return str2num( 3600000, /\d+:\d\d:/, /[\d.]+h$/ );\r
+      };\r
+      function str2num(s, /*RegExp*/ a, /*RegExp*/ b) {\r
+        return s*( _float(str.match(a) || "0") || _float(str.match(b) || "0") );\r
       };\r
     },\r
 \r