Merge pull request #1129 from rmehta/moment-upgrade

[upgrade] moment.js and remove hack(?) frappe/erpnext#3294
This commit is contained in:
Rushabh Mehta 2015-05-27 14:42:26 +05:30
commit dd6fe2beda
5 changed files with 85 additions and 6 deletions

View file

@ -47,8 +47,7 @@
"public/js/lib/notify.js",
"public/js/lib/bootstrap.min.js",
"public/js/lib/nprogress.js",
"public/js/lib/moment/moment.min.js",
"public/js/lib/moment/moment-timezone.min.js",
"public/js/lib/moment/moment-with-locales.min.js",
"public/js/frappe/provide.js",
"public/js/frappe/class.js",

View file

@ -9,7 +9,6 @@ frappe.provide("frappe.datetime");
$.extend(frappe.datetime, {
str_to_obj: function(d) {
// zone hack to remove timezone diff added by momentjs
return moment(d, moment.defaultDatetimeFormat)._d;
},

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long