From: Isaac Cambron <isaac@isaaccambron.com>
Date: Mon, 25 Nov 2013 01:58:03 +0000 (-0500)
Subject: simplifying diff. Fixes #1227
X-Git-Tag: 2.5.0^2~24^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4376a3e646802be099d90cd2aa20fd2123a6fc9;p=thirdparty%2Fmoment.git

simplifying diff. Fixes #1227
---

diff --git a/moment.js b/moment.js
index 5b46691b2..a07807403 100644
--- a/moment.js
+++ b/moment.js
@@ -1796,7 +1796,7 @@
         },
 
         diff : function (input, units, asFloat) {
-            var that = this._isUTC ? moment(input).zone(this._offset || 0) : moment(input).local(),
+            var that = moment(input),
                 zoneDiff = (this.zone() - that.zone()) * 6e4,
                 diff, output;