Browse Source

simplify changes -- use prototypeObject in constructor instead of static method

Brian Beard 11 years ago
parent
commit
c9a1a8c850
2 changed files with 8 additions and 23 deletions
  1. 1 1
      Jint/Native/Date/DateConstructor.cs
  2. 7 22
      Jint/Native/Date/DatePrototype.cs

+ 1 - 1
Jint/Native/Date/DateConstructor.cs

@@ -157,7 +157,7 @@ namespace Jint.Native.Date
             var finalDate = DatePrototype.MakeDate(DatePrototype.MakeDay(y, m, dt),
             var finalDate = DatePrototype.MakeDate(DatePrototype.MakeDay(y, m, dt),
                 DatePrototype.MakeTime(h, min, s, milli));
                 DatePrototype.MakeTime(h, min, s, milli));
 
 
-            return useUtc ? finalDate : DatePrototype.Utc(finalDate, Engine.Options);
+            return useUtc ? finalDate : PrototypeObject.Utc(finalDate);
         }
         }
 
 
         public DatePrototype PrototypeObject { get; private set; }
         public DatePrototype PrototypeObject { get; private set; }

+ 7 - 22
Jint/Native/Date/DatePrototype.cs

@@ -830,22 +830,12 @@ namespace Jint.Native.Date
             return (Day(t) + 4)%7;
             return (Day(t) + 4)%7;
         }
         }
 
 
-        private double LocalTza()
+        public double LocalTza
         {
         {
-            return LocalTza(Engine.Options);
+            get { return Engine.Options.GetLocalTimeZone().BaseUtcOffset.TotalMilliseconds; }
         }
         }
 
 
-        public static double LocalTza(Options options)
-        {
-            return options.GetLocalTimeZone().BaseUtcOffset.TotalMilliseconds;
-        }
-
-        private double DaylightSavingTa(double t)
-        {
-            return DaylightSavingTa(t, Engine.Options);
-        }
-
-        public static double DaylightSavingTa(double t, Options options)
+        public double DaylightSavingTa(double t)
         {
         {
             var timeInYear = t - TimeFromYear(YearFromTime(t));
             var timeInYear = t - TimeFromYear(YearFromTime(t));
 
 
@@ -868,7 +858,7 @@ namespace Jint.Native.Date
 
 
             var dateTime = new DateTime((int)year, 1, 1).AddMilliseconds(timeInYear);
             var dateTime = new DateTime((int)year, 1, 1).AddMilliseconds(timeInYear);
 
 
-            return options.GetLocalTimeZone().IsDaylightSavingTime(dateTime) ? MsPerHour : 0;
+            return Engine.Options.GetLocalTimeZone().IsDaylightSavingTime(dateTime) ? MsPerHour : 0;
         }
         }
 
 
         public DateTime ToLocalTime(DateTime t)
         public DateTime ToLocalTime(DateTime t)
@@ -888,17 +878,12 @@ namespace Jint.Native.Date
 
 
         public double LocalTime(double t)
         public double LocalTime(double t)
         {
         {
-            return t + LocalTza() + DaylightSavingTa(t);
-        }
-
-        private double Utc(double t)
-        {
-            return Utc(t, Engine.Options);
+            return t + LocalTza + DaylightSavingTa(t);
         }
         }
 
 
-        public static double Utc(double t, Options options)
+        public double Utc(double t)
         {
         {
-            return t - LocalTza(options) - DaylightSavingTa(t - LocalTza(options), options);
+            return t - LocalTza - DaylightSavingTa(t - LocalTza);
         }
         }
 
 
         public static double HourFromTime(double t)
         public static double HourFromTime(double t)