moment.js update

Disco.Web/ClientSource/Scripts/Core/disco.moment.extensions.js

@@ -1 +1 @@
-moment.lang('en-au');
+moment.locale('en-au');

Disco.Web/ClientSource/Scripts/Core/moment.en-au.js

@@ -1,62 +0,0 @@
-// moment.js language configuration
-// language : australian english (en-au)
-
-(function (factory) {
-    if (typeof define === 'function' && define.amd) {
-        define(['moment'], factory); // AMD
-    } else if (typeof exports === 'object') {
-        module.exports = factory(require('../moment')); // Node
-    } else {
-        factory(window.moment); // Browser global
-    }
-}(function (moment) {
-    return moment.lang('en-au', {
-        months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"),
-        monthsShort: "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),
-        weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),
-        weekdaysShort: "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),
-        weekdaysMin: "Su_Mo_Tu_We_Th_Fr_Sa".split("_"),
-        longDateFormat: {
-            LT: "h:mm A",
-            L: "DD/MM/YYYY",
-            LL: "D MMMM YYYY",
-            LLL: "D MMMM YYYY LT",
-            LLLL: "dddd, D MMMM YYYY LT"
-        },
-        calendar: {
-            sameDay: '[Today at] LT',
-            nextDay: '[Tomorrow at] LT',
-            nextWeek: 'dddd [at] LT',
-            lastDay: '[Yesterday at] LT',
-            lastWeek: '[Last] dddd [at] LT',
-            sameElse: 'L'
-        },
-        relativeTime: {
-            future: "in %s",
-            past: "%s ago",
-            s: "a few seconds",
-            m: "a minute",
-            mm: "%d minutes",
-            h: "an hour",
-            hh: "%d hours",
-            d: "a day",
-            dd: "%d days",
-            M: "a month",
-            MM: "%d months",
-            y: "a year",
-            yy: "%d years"
-        },
-        ordinal: function (number) {
-            var b = number % 10,
-                output = (~~(number % 100 / 10) === 1) ? 'th' :
-                (b === 1) ? 'st' :
-                (b === 2) ? 'nd' :
-                (b === 3) ? 'rd' : 'th';
-            return number + output;
-        },
-        week: {
-            dow: 1, // Monday is the first day of the week.
-            doy: 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-}));

Disco.Web/Disco.Web.csproj

@@ -1309,8 +1309,6 @@
     <None Include="ClientSource\Scripts\Core\jquery.dataTables.js" />
     <None Include="ClientSource\Scripts\Core\jquery.watermark.js" />
     <None Include="ClientSource\Scripts\Core\disco.uicore.js" />
-    <None Include="ClientSource\Scripts\Core\moment.en-au.js" />
-    <None Include="ClientSource\Scripts\Core\moment.js" />
     <None Include="ClientSource\Scripts\Core\_references.js" />
     <None Include="ClientSource\Scripts\Core\livestamp.js" />
     <None Include="ClientSource\Scripts\Modules\Disco-AjaxHelperIcons\disco.ajaxhelpericons.js" />
@@ -1329,8 +1327,7 @@
     <Content Include="ClientSource\Scripts\Core\jquery.dataTables.js" Condition=" '$(Configuration)' == 'Debug' " />
     <Content Include="ClientSource\Scripts\Core\jquery.watermark.js" Condition=" '$(Configuration)' == 'Debug' " />
     <Content Include="ClientSource\Scripts\Core\disco.uicore.js" Condition=" '$(Configuration)' == 'Debug' " />
-    <Content Include="ClientSource\Scripts\Core\moment.en-au.js" Condition=" '$(Configuration)' == 'Debug' " />
-    <Content Include="ClientSource\Scripts\Core\moment.js" Condition=" '$(Configuration)' == 'Debug' " />
+    <None Include="ClientSource\Scripts\Core\moment-with-locales.js" />
     <Content Include="ClientSource\Scripts\Core\_references.js" Condition=" '$(Configuration)' == 'Debug' " />
     <Content Include="ClientSource\Scripts\Core\livestamp.js" Condition=" '$(Configuration)' == 'Debug' " />
     <Content Include="ClientSource\Scripts\Modules\Disco-AjaxHelperIcons\disco.ajaxhelpericons.js" Condition=" '$(Configuration)' == 'Debug' " />

Disco.Web/bundleconfig.json

@@ -10,8 +10,7 @@
       "ClientSource/Scripts/Core/jquery-ui-1.10.4.js",
       "ClientSource/Scripts/Core/jquery.watermark.js",
       "ClientSource/Scripts/Core/jquery.dataTables.js",
-      "ClientSource/Scripts/Core/moment.js",
-      "ClientSource/Scripts/Core/moment.en-au.js",
+      "ClientSource/Scripts/Core/moment-with-locales.js",
       "ClientSource/Scripts/Core/disco.moment.extensions.js",
       "ClientSource/Scripts/Core/livestamp.js",
       "ClientSource/Scripts/Core/disco.dataTables.extensions.js",