Changeset 28459

Timestamp:

01/15/09 23:45:05 (4 years ago)

Author:

drry

Message:

• (duration) ミリ秒とマイナスに対応しました。
  

Files:

• lang/javascript/userscripts/jautopagerize.user.js (modified) (1 diff)

lang/javascript/userscripts/jautopagerize.user.js

@@ -790 +790 @@
 function duration (str) {
         var ret = 0, map = {
-                sec : 1, min : 60, hour : 3600, day : 86400, week : 604800, month : 2592000, year : 31536000
+                sec : 1000, min : 60000, hour : 3600000, day : 86400000, week : 604800000, month : 2592000000, year : 31536000000
         };
-        str.replace(/(\d+)\s*(msec|sec|min|hour|day|week|month|year)s?/g, function (_, num, unit) {
-                ret += +num * map[unit];
+        str.replace(/([-+]?\d+)\s*((?:m(?:illi)?)?sec|min|hour|day|week|month|year|)/g, function (_, num, unit) {
+                ret += +num * (map[unit] || 1);
         });
-        return ret * 1000;
+        return ret;
 }