--- moment_orig.js 2014-11-24 13:37:58.000000000 +0200 +++ moment.js 2014-11-24 13:33:04.000000000 +0200 @@ -1,10 +1,12 @@ +.pragma library + //! moment.js //! version : 2.8.4 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors //! license : MIT //! momentjs.com -(function (undefined) { +var moment = (function (undefined) { /************************************ Constants ************************************/ @@ -1697,12 +1699,12 @@ function relativeTime(posNegDuration, withoutSuffix, locale) { var duration = moment.duration(posNegDuration).abs(), - seconds = round(duration.as('s')), - minutes = round(duration.as('m')), - hours = round(duration.as('h')), - days = round(duration.as('d')), - months = round(duration.as('M')), - years = round(duration.as('y')), + seconds = round(duration.asUnit('s')), + minutes = round(duration.asUnit('m')), + hours = round(duration.asUnit('h')), + days = round(duration.asUnit('d')), + months = round(duration.asUnit('M')), + years = round(duration.asUnit('y')), args = seconds < relativeTimeThresholds.s && ['s', seconds] || minutes === 1 && ['m'] || @@ -2771,7 +2773,7 @@ return this[units.toLowerCase() + 's'](); }, - as : function (units) { + asUnit : function (units) { var days, months; units = normalizeUnits(units); @@ -2852,28 +2854,28 @@ } moment.duration.fn.asMilliseconds = function () { - return this.as('ms'); + return this.asUnit('ms'); }; moment.duration.fn.asSeconds = function () { - return this.as('s'); + return this.asUnit('s'); }; moment.duration.fn.asMinutes = function () { - return this.as('m'); + return this.asUnit('m'); }; moment.duration.fn.asHours = function () { - return this.as('h'); + return this.asUnit('h'); }; moment.duration.fn.asDays = function () { - return this.as('d'); + return this.asUnit('d'); }; moment.duration.fn.asWeeks = function () { - return this.as('weeks'); + return this.asUnit('weeks'); }; moment.duration.fn.asMonths = function () { - return this.as('M'); + return this.asUnit('M'); }; moment.duration.fn.asYears = function () { - return this.as('y'); + return this.asUnit('y'); }; /************************************ @@ -2930,7 +2932,9 @@ return moment; }); makeGlobal(true); + } else if (typeof Qt !== 'undefined') { + return moment; } else { makeGlobal(); } -}).call(this); \ No newline at end of file +}).call(this);