sugar-rails 1.3.0 → 1.3.1

data/vendor/assets/javascripts/precompiled/development/date.js

@@ -26,19 +26,19 @@
     {
       token: 'f{1,4}|ms|milliseconds',
       format: function(d) {
-        return d.getMilliseconds();
+        return callDateGet(d, 'Milliseconds');
       }
     },
     {
       token: 'ss?|seconds',
       format: function(d, len) {
-        return d.getSeconds();
+        return callDateGet(d, 'Seconds');
       }
     },
     {
       token: 'mm?|minutes',
       format: function(d, len) {
-        return d.getMinutes();
+        return callDateGet(d, 'Minutes');
       }
     },
     {
@@ -50,45 +50,48 @@
     {
       token: 'HH?|24hr',
       format: function(d) {
-        return d.getHours();
+        return callDateGet(d, 'Hours');
       }
     },
     {
       token: 'dd?|date|day',
       format: function(d) {
-        return d.getDate();
+        return callDateGet(d, 'Date');
       }
     },
     {
       token: 'dow|weekday',
       word: true,
       format: function(d, loc, n, t) {
-        return loc['weekdays'][d.getDay() + (n - 1) * 7];
+        var dow = callDateGet(d, 'Day');
+        return loc['weekdays'][dow + (n - 1) * 7];
       }
     },
     {
       token: 'MM?',
       format: function(d) {
-        return d.getMonth() + 1;
+        return callDateGet(d, 'Month') + 1;
       }
     },
     {
       token: 'mon|month',
       word: true,
       format: function(d, loc, n, len) {
-        return loc['months'][d.getMonth() + (n - 1) * 12];
+        var month = callDateGet(d, 'Month');
+        return loc['months'][month + (n - 1) * 12];
       }
     },
     {
       token: 'y{2,4}|year',
       format: function(d) {
-        return d.getFullYear();
+        return callDateGet(d, 'FullYear');
       }
     },
     {
       token: '[Tt]{1,2}',
       format: function(d, loc, n, format) {
-        var str = loc['ampm'][floor(d.getHours() / 12)];
+        var hours = callDateGet(d, 'Hours');
+        var str = loc['ampm'][floor(hours / 12)];
         if(format.length === 1) str = str.slice(0,1);
         if(format.slice(0,1) === 'T') str = str.toUpperCase();
         return str;
@@ -116,8 +119,8 @@
     {
       token: 'ord',
       format: function(d) {
-        var d = d.getDate();
-        return d + getOrdinalizedSuffix(d);
+        var date = callDateGet(d, 'Date');
+        return date + getOrdinalizedSuffix(date);
       }
     }
   ];
@@ -126,6 +129,7 @@
     {
       unit: 'year',
       method: 'FullYear',
+      ambiguous: true,
       multiplier: function(d) {
         var adjust = d ? (d.isLeapYear() ? 1 : 0) : 0.25;
         return (365 + adjust) * 24 * 60 * 60 * 1000;
@@ -255,6 +259,10 @@
       return code === 'en' || code === 'en-US' ? true : this['variant'];
     },
 
+    matchAM: function(str) {
+      return str === this['ampm'][0];
+    },
+
     matchPM: function(str) {
       return str === this['ampm'][1];
     },
@@ -349,7 +357,7 @@
   }
 
   function setLocalization(localeCode, set) {
-    var loc;
+    var loc, canAbbreviate;
 
     function initializeField(name) {
       var val = loc[name];
@@ -373,16 +381,15 @@
 
     function setArray(name, abbreviate, multiple) {
       var arr = [];
-      if(!loc[name]) return;
-      loc[name].forEach(function(el, i) {
-        eachAlternate(el, function(str, j) {
-          arr[j * multiple + i] = str.toLowerCase();
+      loc[name].forEach(function(full, i) {
+        if(abbreviate) {
+          full += '+' + full.slice(0,3);
+        }
+        eachAlternate(full, function(day, j) {
+          arr[j * multiple + i] = day.toLowerCase();
         });
       });
-      if(abbreviate) arr = arr.concat(loc[name].map(function(str) {
-        return str.slice(0,3).toLowerCase();
-      }));
-      return loc[name] = arr;
+      loc[name] = arr;
     }
 
     function getDigit(start, stop, allowNumbers) {
@@ -418,8 +425,10 @@
     initializeField('modifiers');
     'months,weekdays,units,numbers,articles,optionals,timeMarker,ampm,timeSuffixes,dateParse,timeParse'.split(',').forEach(initializeField);
 
-    setArray('months', true, 12);
-    setArray('weekdays', true, 7);
+    canAbbreviate = !loc['monthSuffix'];
+
+    setArray('months',   canAbbreviate, 12);
+    setArray('weekdays', canAbbreviate, 7);
     setArray('units', false, 8);
     setArray('numbers', false, 10);
 
@@ -505,10 +514,12 @@
   function getDateParamsFromString(str, num) {
     var params = {};
     match = str.match(/^(\d+)?\s?(\w+?)s?$/i);
-    if(isUndefined(num)) {
-      num = parseInt(match[1]) || 1;
+    if(match) {
+      if(isUndefined(num)) {
+        num = parseInt(match[1]) || 1;
+      }
+      params[match[2].toLowerCase()] = num;
     }
-    params[match[2].toLowerCase()] = num;
     return params;
   }
 
@@ -554,14 +565,17 @@
     });
   }
 
-  function getExtendedDate(f, localeCode, prefer) {
+  function getExtendedDate(f, localeCode, prefer, forceUTC) {
     var d = new date(), relative = false, baseLocalization, loc, format, set, unit, weekday, num, tmp, after;
+
+    d.utc(forceUTC);
+
     if(isDate(f)) {
       d = f.clone();
     } else if(isNumber(f)) {
       d = new date(f);
     } else if(isObject(f)) {
-      d = new date().set(f, true);
+      d.set(f, true);
       set = f;
     } else if(isString(f)) {
 
@@ -579,6 +593,11 @@
             format = dif;
             loc = format.locale;
             set = getFormatMatch(match, format.to, loc);
+
+            if(set['utc']) {
+              d.utc();
+            }
+
             loc.cachedFormat = format;
 
             if(set.timestamp) {
@@ -627,7 +646,8 @@
                 // to be set after the actual set because it requires overriding the "prefer" argument which
                 // could unintentionally send the year into the future, past, etc.
                 after = function() {
-                  updateDate(d, { 'weekday': weekday + (7 * (set['num'] - 1)) }, false, false, false, 1);
+                  var w = d.getWeekday();
+                  d.setWeekday((7 * (set['num'] - 1)) + (w > weekday ? weekday + 7 : weekday));
                 }
                 set['day'] = 1;
               } else {
@@ -642,11 +662,13 @@
             // If the time is 1pm-11pm advance the time by 12 hours.
             if(loc.matchPM(set['ampm']) && set['hour'] < 12) {
               set['hour'] += 12;
+            } else if(loc.matchAM(set['ampm']) && set['hour'] === 12) {
+              set['hour'] = 0;
             }
 
             // Adjust for timezone offset
             if('offset_hours' in set || 'offset_minutes' in set) {
-              set['utc'] = true;
+              d.utc();
               set['offset_minutes'] = set['offset_minutes'] || 0;
               set['offset_minutes'] += set['offset_hours'] * 60;
               if(set['offset_sign'] === '-') {
@@ -715,12 +737,12 @@
       } else if(relative) {
         d.advance(set);
       } else {
-        if(set['utc']) {
+        if(d._utc) {
           // UTC times can traverse into other days or even months,
           // so preemtively reset the time here to prevent this.
           d.reset();
         }
-        updateDate(d, set, true, set['utc'], false, prefer);
+        updateDate(d, set, true, false, prefer);
       }
 
       // If there is an "edge" it needs to be set after the
@@ -752,17 +774,18 @@
 
   // If the year is two digits, add the most appropriate century prefix.
   function getYearFromAbbreviation(year) {
-    return round(new date().getFullYear() / 100) * 100 - round(year / 100) * 100 + year;
+    return round(callDateGet(new date(), 'FullYear') / 100) * 100 - round(year / 100) * 100 + year;
   }
 
-  function getShortHour(d, utc) {
-    var hours = callDateMethod(d, 'get', utc, 'Hours');
+  function getShortHour(d) {
+    var hours = callDateGet(d, 'Hours');
     return hours === 0 ? 12 : hours - (floor(hours / 13) * 12);
   }
 
   // weeksSince won't work here as the result needs to be floored, not rounded.
   function getWeekNumber(date) {
-    var dow = date.getDay() || 7;
+    date = date.clone();
+    var dow = callDateGet(date, 'Day') || 7;
     date.addDays(4 - dow).reset();
     return 1 + floor(date.daysSince(date.clone().beginningOfYear()) / 7);
   }
@@ -823,8 +846,8 @@
 
   // Date comparison helpers
 
-  function compareDate(d, find, buffer) {
-    var p = getExtendedDate(find), accuracy = 0, loBuffer = 0, hiBuffer = 0, override, capitalized;
+  function compareDate(d, find, buffer, forceUTC) {
+    var p = getExtendedDate(find, null, null, forceUTC), accuracy = 0, loBuffer = 0, hiBuffer = 0, override, capitalized;
     if(buffer > 0) {
       loBuffer = hiBuffer = buffer;
       override = true;
@@ -853,12 +876,11 @@
     var t   = d.getTime();
     var min = p.date.getTime();
     var max = max || (min + accuracy);
-    // Offset any shift that may occur as a result of DST traversal.
     return t >= (min - loBuffer) && t <= (max + hiBuffer);
   }
 
-  function updateDate(d, params, reset, utc, advance, prefer) {
-    var weekday;
+  function updateDate(d, params, reset, advance, prefer) {
+    var weekday, specificityIndex;
 
     function getParam(key) {
       return isDefined(params[key]) ? params[key] : params[key + 's'];
@@ -868,8 +890,9 @@
       return isDefined(getParam(key));
     }
 
-    function canDisambiguate(u, higherUnit) {
-      return prefer && u.ambiguous && !paramExists(higherUnit.unit);
+    function canDisambiguate() {
+      var now = new date;
+      return (prefer === -1 && d > now) || (prefer === 1 && d < now);
     }
 
     if(isNumber(params) && advance) {
@@ -893,10 +916,11 @@
       var isDay = u.unit === 'day';
       if(paramExists(u.unit) || (isDay && paramExists('weekday'))) {
         params.specificity = u.unit;
+        specificityIndex = +i;
         return false;
       } else if(reset && u.unit !== 'week' && (!isDay || !paramExists('week'))) {
         // Days are relative to months, not weeks, so don't reset if a week exists.
-        callDateMethod(d, 'set', utc, u.method, (isDay ? 1 : 0));
+        callDateSet(d, u.method, (isDay ? 1 : 0));
       }
     });
 
@@ -905,23 +929,12 @@
       var unit = u.unit, method = u.method, higherUnit = DateUnits[i - 1], value;
       value = getParam(unit)
       if(isUndefined(value)) return;
-      if(canDisambiguate(u, higherUnit)) {
-        // Formats like "June" have an ambiguous year. If no preference is stated, this
-        // is fine as "June of this year", however in a future context, this would mean
-        // "the next June", which may be either this year or next year. If we have an
-        // ambiguity *and* a preference for resolving it, then advance or rewind the
-        // higher order as necessary. Note that weekdays are handled differently below.
-        var current = callDateMethod(new date, 'get', utc, u.method);
-        if(current >= value === (prefer === 1)) {
-          d[higherUnit.addMethod](prefer);
-        }
-      }
       if(advance) {
         if(unit === 'week') {
           value  = (params['day'] || 0) + (value * 7);
           method = 'Date';
         }
-        value = (value * advance) + callDateMethod(d, 'get', false, method);
+        value = (value * advance) + callDateGet(d, method);
       } else if(unit === 'month' && paramExists('day')) {
         // When setting the month, there is a chance that we will traverse into a new month.
         // This happens in DST shifts, for example June 1st DST jumping to January 1st
@@ -937,9 +950,9 @@
         // TL;DR This method avoids the edges of a month IF not advancing and the date is going
         // to be set anyway, while checkMonthTraversal resets the date to the last day if advancing.
         //
-        d.setDate(15);
+        callDateSet(d, 'Date', 15);
       }
-      callDateMethod(d, 'set', utc, method, value);
+      callDateSet(d, method, value);
       if(advance && unit === 'month') {
         checkMonthTraversal(d, value);
       }
@@ -949,24 +962,27 @@
     // to reflect the updated date so that resetting works properly.
     if(!advance && !paramExists('day') && paramExists('weekday')) {
       var weekday = getParam('weekday'), isAhead, futurePreferred;
-      if(isDefined(prefer)) {
-        // If there is a preference as to whether this weekday is in the future,
-        // then add an offset as needed. NOTE: Was previously doing something much
-        // more one-liner-hipster here, but it made Opera choke (order of operations
-        // bug??) ... better to be more explicit here anyway.
-       isAhead = callDateMethod(d, 'get', utc, 'Day') - (weekday % 7) >= 0;
-       futurePreferred = prefer === 1;
-       if(isAhead === futurePreferred) {
-         weekday += prefer * 7;
-       }
-      }
-      callDateMethod(d, 'set', utc, 'Weekday', weekday)
+      d.setWeekday(weekday);
+    }
+
+    if(canDisambiguate()) {
+      iterateOverObject(DateUnitsReversed.slice(specificityIndex + 1), function(i,u) {
+        var ambiguous = u.ambiguous || (u.unit === 'week' && paramExists('weekday'));
+        if(ambiguous && !paramExists(u.unit)) {
+          d[u.addMethod](prefer);
+          return false;
+        }
+      });
     }
     return d;
   }
 
-  function callDateMethod(d, prefix, utc, method, value) {
-    return d[prefix + (utc ? 'UTC' : '') + method](value);
+  function callDateGet(d, method) {
+    return d['get' + (d._utc ? 'UTC' : '') + method]();
+  }
+
+  function callDateSet(d, method, value) {
+    return d['set' + (d._utc ? 'UTC' : '') + method](value);
   }
 
   // The ISO format allows times strung together without a demarcating ":", so make sure
@@ -1001,20 +1017,22 @@
 
   function checkMonthTraversal(date, targetMonth) {
     if(targetMonth < 0) targetMonth += 12;
-    if(targetMonth % 12 != date.getMonth()) {
-      date.setDate(0);
+    if(targetMonth % 12 != callDateGet(date, 'Month')) {
+      callDateSet(date, 'Date', 0);
     }
   }
 
   function createDate(args, prefer) {
-    var f;
+    var f, localeCode, forceUTC;
     if(isNumber(args[1])) {
       // If the second argument is a number, then we have an enumerated constructor type as in "new Date(2003, 2, 12);"
       f = collectDateArguments(args)[0];
     } else {
-      f = args[0];
+      f          = args[0];
+      localeCode = args[1];
+      forceUTC   = args[2];
     }
-    return getExtendedDate(f, args[1], prefer).date;
+    return getExtendedDate(f, localeCode, prefer, forceUTC).date;
   }
 
   function buildDateUnits() {
@@ -1251,9 +1269,9 @@
         methods['beginningOf' + caps] = function() {
           var set = {};
           switch(unit) {
-            case 'year':  set['year'] = this.getFullYear(); break;
-            case 'month': set['month'] = this.getMonth(); break;
-            case 'day':   set['day'] = this.getDate(); break;
+            case 'year':  set['year']  = callDateGet(this, 'FullYear'); break;
+            case 'month': set['month'] = callDateGet(this, 'Month');    break;
+            case 'day':   set['day']   = callDateGet(this, 'Date');     break;
             case 'week':  set['weekday'] = 0; break;
           }
           return this.set(set, true);
@@ -1366,8 +1384,8 @@
     var weekdays = English['weekdays'].slice(0,7);
     var months   = English['months'].slice(0,12);
     extendSimilar(date, true, false, special.concat(weekdays).concat(months), function(methods, name) {
-      methods['is'+ simpleCapitalize(name)] = function() {
-        return this.is(name);
+      methods['is'+ simpleCapitalize(name)] = function(utc) {
+       return this.is(name, 0, utc);
       };
     });
   }
@@ -1395,10 +1413,10 @@
   date.extend({
 
      /***
-     * @method Date.create(<d>, [locale] = currentLocale)
+     * @method Date.create(<d>, [locale] = currentLocale, [utc] = false)
      * @returns Date
      * @short Alternate Date constructor which understands many different text formats, a timestamp, or another date.
-     * @extra If no argument is given, date is assumed to be now. %Date.create% additionally can accept enumerated parameters as with the standard date constructor. [locale] can be passed to specify the locale that the date is in. When unspecified, the current locale (default is English) is assumed. For more information, see @date_format.
+     * @extra If no argument is given, date is assumed to be now. %Date.create% additionally can accept enumerated parameters as with the standard date constructor. [locale] can be passed to specify the locale that the date is in. When unspecified, the current locale (default is English) is assumed. [utc] indicates a utc-based date. For more information, see @date_format.
      * @example
      *
      *   Date.create('July')          -> July of this year
@@ -1417,7 +1435,7 @@
     },
 
      /***
-     * @method Date.past(<d>, [locale] = currentLocale)
+     * @method Date.past(<d>, [locale] = currentLocale, [utc] = false)
      * @returns Date
      * @short Alternate form of %Date.create% with any ambiguity assumed to be the past.
      * @extra For example %"Sunday"% can be either "the Sunday coming up" or "the Sunday last" depending on context. Note that dates explicitly in the future ("next Sunday") will remain in the future. This method simply provides a hint when ambiguity exists.
@@ -1432,7 +1450,7 @@
     },
 
      /***
-     * @method Date.future(<d>, [locale] = currentLocale)
+     * @method Date.future(<d>, [locale] = currentLocale, [utc] = false)
      * @returns Date
      * @short Alternate form of %Date.create% with any ambiguity assumed to be the future.
      * @extra For example %"Sunday"% can be either "the Sunday coming up" or "the Sunday last" depending on context. Note that dates explicitly in the past ("last Sunday") will remain in the past. This method simply provides a hint when ambiguity exists.
@@ -1505,10 +1523,7 @@
      * @method set(<set>, [reset] = false)
      * @returns Date
      * @short Sets the date object.
-     * @extra This method can accept multiple formats including a single number as a timestamp, an object, or enumerated parameters (as with the Date constructor). If [reset] is %true%, any units more specific than those passed will be reset. %setUTC% will set the date according to universal time.
-     *
-     * @set
-     *   setUTC
+     * @extra This method can accept multiple formats including a single number as a timestamp, an object, or enumerated parameters (as with the Date constructor). If [reset] is %true%, any units more specific than those passed will be reset.
      *
      * @example
      *
@@ -1523,19 +1538,10 @@
       return updateDate(this, args[0], args[1])
     },
 
-    'setUTC': function() {
-      var args = collectDateArguments(arguments);
-      return updateDate(this, args[0], args[1], true)
-    },
-
      /***
      * @method setWeekday()
      * @returns Nothing
      * @short Sets the weekday of the date.
-     * @extra %setUTCWeekday% sets according to universal time.
-     *
-     * @set
-     *   setUTCWeekday
      *
      * @example
      *
@@ -1545,22 +1551,13 @@
      ***/
     'setWeekday': function(dow) {
       if(isUndefined(dow)) return;
-      this.setDate(this.getDate() + dow - this.getDay());
-    },
-
-    'setUTCWeekday': function(dow) {
-      if(isUndefined(dow)) return;
-      this.setDate(this.getUTCDate() + dow - this.getDay());
+      return callDateSet(this, 'Date', callDateGet(this, 'Date') + dow - callDateGet(this, 'Day'));
     },
 
      /***
      * @method setWeek()
      * @returns Nothing
      * @short Sets the week (of the year).
-     * @extra %setUTCWeek% sets according to universal time.
-     *
-     * @set
-     *   setUTCWeek
      *
      * @example
      *
@@ -1569,41 +1566,27 @@
      ***/
     'setWeek': function(week) {
       if(isUndefined(week)) return;
-      var date = this.getDate();
-      this.setMonth(0);
-      this.setDate((week * 7) + 1);
-    },
-
-    'setUTCWeek': function(week) {
-      if(isUndefined(week)) return;
-      var date = this.getUTCDate();
-      this.setMonth(0);
-      this.setUTCDate((week * 7) + 1);
+      var date = callDateGet(this, 'Date');
+      callDateSet(this, 'Month', 0);
+      callDateSet(this, 'Date', (week * 7) + 1);
+      return this.getTime();
     },
 
      /***
      * @method getWeek()
      * @returns Number
      * @short Gets the date's week (of the year).
-     * @extra %getUTCWeek% gets the week according to universal time.
-     *
-     * @set
-     *   getUTCWeek
+     * @extra If %utc% is set on the date, the week will be according to UTC time.
      *
      * @example
      *
      *   new Date().getWeek()    -> today's week of the year
-     *   new Date().getUTCWeek() -> today's week of the year
      *
      ***/
     'getWeek': function() {
       return getWeekNumber(this);
     },
 
-    'getUTCWeek': function() {
-      return getWeekNumber(this.toUTC());
-    },
-
      /***
      * @method getUTCOffset([iso])
      * @returns String
@@ -1615,27 +1598,26 @@
      *
      ***/
     'getUTCOffset': function(iso) {
-      var offset = this.utc ? 0 : this.getTimezoneOffset();
+      var offset = this._utc ? 0 : this.getTimezoneOffset();
       var colon  = iso === true ? ':' : '';
       if(!offset && iso) return 'Z';
       return padNumber(round(-offset / 60), 2, true) + colon + padNumber(offset % 60, 2);
     },
 
      /***
-     * @method toUTC()
+     * @method utc([on] = true)
      * @returns Date
-     * @short Converts the date to UTC time, effectively subtracting the timezone offset.
-     * @extra Note here that the method %getTimezoneOffset% will still show an offset even after this method is called, as this method effectively just rewinds the date. %format% however, will correctly set the %{tz}% (timezone) token as UTC once this method has been called on the date, and %isUTC% will return %true%. Once a date is set to UTC the only way to unset is the %clone% method.
+     * @short Sets the internal utc flag for the date. When on, UTC-based methods will be called internally.
+     * @extra For more see @date_format.
      * @example
      *
-     *   new Date().toUTC() -> current time in UTC
+     *   new Date().utc(true)
+     *   new Date().utc(false)
      *
      ***/
-    'toUTC': function() {
-      if(this.utc) return this;
-      var d = this.clone().addMinutes(this.getTimezoneOffset());
-      d.utc = true;
-      return d;
+    'utc': function(set) {
+      this._utc = set === true || arguments.length === 0;
+      return this;
     },
 
      /***
@@ -1650,7 +1632,7 @@
      *
      ***/
     'isUTC': function() {
-      return this.utc || this.getTimezoneOffset() === 0;
+      return !!this._utc || this.getTimezoneOffset() === 0;
     },
 
      /***
@@ -1668,7 +1650,7 @@
      ***/
     'advance': function() {
       var args = collectDateArguments(arguments, true);
-      return updateDate(this, args[0], args[1], false, 1);
+      return updateDate(this, args[0], args[1], 1);
     },
 
      /***
@@ -1685,7 +1667,7 @@
      ***/
     'rewind': function() {
       var args = collectDateArguments(arguments, true);
-      return updateDate(this, args[0], args[1], false, -1);
+      return updateDate(this, args[0], args[1], -1);
     },
 
      /***
@@ -1713,7 +1695,7 @@
      *   new Date().isAfter('yesterday') -> true
      *
      ***/
-    'isAfter': function(d, margin) {
+    'isAfter': function(d, margin, utc) {
       return this.getTime() > date.create(d).getTime() - (margin || 0);
     },
 
@@ -1763,7 +1745,7 @@
      *
      ***/
     'isLeapYear': function() {
-      var year = this.getFullYear();
+      var year = callDateGet(this, 'FullYear');
       return (year % 4 === 0 && year % 100 !== 0) || (year % 400 === 0);
     },
 
@@ -1778,7 +1760,7 @@
      *
      ***/
     'daysInMonth': function() {
-      return 32 - new date(this.getFullYear(), this.getMonth(), 32).getDate();
+      return 32 - callDateGet(new date(callDateGet(this, 'FullYear'), callDateGet(this, 'Month'), 32), 'Date');
     },
 
      /***
@@ -1848,21 +1830,22 @@
      *   Date.create().is(new Date(1776, 6, 4)) -> false
      *
      ***/
-    'is': function(d, margin) {
-      var tmp;
+    'is': function(d, margin, utc) {
+      var tmp, comp;
       if(!this.isValid()) return;
       if(isString(d)) {
         d = d.trim().toLowerCase();
+        comp = this.clone().utc(utc);
         switch(true) {
           case d === 'future':  return this.getTime() > new date().getTime();
           case d === 'past':    return this.getTime() < new date().getTime();
-          case d === 'weekday': return this.getDay() > 0 && this.getDay() < 6;
-          case d === 'weekend': return this.getDay() === 0 || this.getDay() === 6;
-          case (tmp = English['weekdays'].indexOf(d) % 7) > -1: return this.getDay() === tmp;
-          case (tmp = English['months'].indexOf(d) % 12) > -1:  return this.getMonth() === tmp;
+          case d === 'weekday': return callDateGet(comp, 'Day') > 0 && callDateGet(comp, 'Day') < 6;
+          case d === 'weekend': return callDateGet(comp, 'Day') === 0 || callDateGet(comp, 'Day') === 6;
+          case (tmp = English['weekdays'].indexOf(d) % 7) > -1: return callDateGet(comp, 'Day') === tmp;
+          case (tmp = English['months'].indexOf(d) % 12) > -1:  return callDateGet(comp, 'Month') === tmp;
         }
       }
-      return compareDate(this, d, margin);
+      return compareDate(this, d, margin, utc);
     },
 
      /***
@@ -1896,7 +1879,9 @@
      *
      ***/
     'clone': function() {
-      return new date(this.getTime());
+      var d = new date(this.getTime());
+      d._utc = this._utc;
+      return d;
     }
 
   });