Merge pull request #3 from fresk-nc/master

strftime больше не перезаписывает переданную ей дату
Katochimoto · Nov 26, 2015 · da22045 · da22045
2 parents 674cd1e + 2804e34
commit da22045
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/lib/strftime.js b/lib/strftime.js
@@ -14,21 +14,23 @@
  */
 /*jshint -W079 */
 var strftime = function(format, date, utc, localeName) {
-    if (typeof date === 'undefined') {
-        date = new Date();
+    var newDate = date;
+
+    if (typeof newDate === 'undefined') {
+        newDate = new Date();
     }
 
-    if (typeof date === 'number') {
-        date = new Date(date);
+    if (typeof newDate === 'number') {
+        newDate = new Date(newDate);
     }
 
-    if (!(date instanceof Date) || String(date) === 'Invalid Date') {
+    if (!(newDate instanceof Date) || String(newDate) === 'Invalid Date') {
         return null;
     }
 
     if (utc) {
-        date.setTime(date.getTime() + date.getTimezoneOffset() * 60000);
+        newDate = new Date(newDate.getTime() + newDate.getTimezoneOffset() * 60000);
     }
 
-    return strftime.format(format, date, localeName);
+    return strftime.format(format, newDate, localeName);
 };
diff --git a/strftime.js b/strftime.js
@@ -18,23 +18,25 @@
  */
 /*jshint -W079 */
 var strftime = function(format, date, utc, localeName) {
-    if (typeof date === 'undefined') {
-        date = new Date();
+    var newDate = date;
+
+    if (typeof newDate === 'undefined') {
+        newDate = new Date();
     }
 
-    if (typeof date === 'number') {
-        date = new Date(date);
+    if (typeof newDate === 'number') {
+        newDate = new Date(newDate);
     }
 
-    if (!(date instanceof Date) || String(date) === 'Invalid Date') {
+    if (!(newDate instanceof Date) || String(newDate) === 'Invalid Date') {
         return null;
     }
 
     if (utc) {
-        date.setTime(date.getTime() + date.getTimezoneOffset() * 60000);
+        newDate = new Date(newDate.getTime() + newDate.getTimezoneOffset() * 60000);
     }
 
-    return strftime.format(format, date, localeName);
+    return strftime.format(format, newDate, localeName);
 };
 
 

diff --git a/strftime.jsx b/strftime.jsx
@@ -18,23 +18,25 @@
  */
 /*jshint -W079 */
 var strftime = function(format, date, utc, localeName) {
-    if (typeof date === 'undefined') {
-        date = new Date();
+    var newDate = date;
+
+    if (typeof newDate === 'undefined') {
+        newDate = new Date();
     }
 
-    if (typeof date === 'number') {
-        date = new Date(date);
+    if (typeof newDate === 'number') {
+        newDate = new Date(newDate);
     }
 
-    if (!(date instanceof Date) || String(date) === 'Invalid Date') {
+    if (!(newDate instanceof Date) || String(newDate) === 'Invalid Date') {
         return null;
     }
 
     if (utc) {
-        date.setTime(date.getTime() + date.getTimezoneOffset() * 60000);
+        newDate = new Date(newDate.getTime() + newDate.getTimezoneOffset() * 60000);
     }
 
-    return strftime.format(format, date, localeName);
+    return strftime.format(format, newDate, localeName);
 };
 
 

diff --git a/strftime.min.js b/strftime.min.js