From 837151a3958a74a62e3b0911952b20fbdbab3d09 Mon Sep 17 00:00:00 2001
From: Brian Gough <bjg@network-theory.co.uk>
Date: Thu, 22 Sep 2016 11:36:53 +0100
Subject: [PATCH] include moment in package versions

---
 services/web/Gruntfile.coffee                              | 7 +++----
 .../web/app/coffee/infrastructure/PackageVersions.coffee   | 1 +
 services/web/app/views/layout.jade                         | 7 ++++++-
 services/web/app/views/project/editor.jade                 | 2 +-
 services/web/public/coffee/filters/formatDate.coffee       | 4 ++--
 .../coffee/ide/track-changes/TrackChangesManager.coffee    | 3 ++-
 services/web/public/coffee/libs.coffee                     | 2 +-
 7 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/services/web/Gruntfile.coffee b/services/web/Gruntfile.coffee
index e7389e2356..3e7c187d8d 100644
--- a/services/web/Gruntfile.coffee
+++ b/services/web/Gruntfile.coffee
@@ -1,6 +1,5 @@
 fs = require "fs"
 PackageVersions = require "./app/coffee/infrastructure/PackageVersions"
-pdfjs = PackageVersions.lib('pdfjs')
 
 module.exports = (grunt) ->
 	grunt.loadNpmTasks 'grunt-contrib-coffee'
@@ -159,12 +158,12 @@ module.exports = (grunt) ->
 					inlineText: false
 					preserveLicenseComments: false
 					paths:
-						"moment": "libs/moment-2.9.0"
+						"moment": "libs/#{PackageVersions.lib('moment')}"
 						"mathjax": "/js/libs/mathjax/MathJax.js?config=TeX-AMS_HTML"
-						"libs/pdf": "libs/#{pdfjs}/pdf"
+						"libs/pdf": "libs/#{PackageVersions.lib('pdfjs')}/pdf"
 					shim:
 						"libs/pdf":
-							deps: ["libs/#{pdfjs}/compatibility"]
+							deps: ["libs/#{PackageVersions.lib('pdfjs')}/compatibility"]
 
 					skipDirOptimize: true
 					modules: [
diff --git a/services/web/app/coffee/infrastructure/PackageVersions.coffee b/services/web/app/coffee/infrastructure/PackageVersions.coffee
index c2a73fb2cf..dd7b7d51a4 100644
--- a/services/web/app/coffee/infrastructure/PackageVersions.coffee
+++ b/services/web/app/coffee/infrastructure/PackageVersions.coffee
@@ -1,5 +1,6 @@
 version = {
 	"pdfjs": "1.3.91p1"
+	"moment": "2.9.0"
 }
 
 module.exports = {
diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.jade
index 30b6b2294b..07fe638b29 100644
--- a/services/web/app/views/layout.jade
+++ b/services/web/app/views/layout.jade
@@ -126,7 +126,12 @@ html(itemscope, itemtype='http://schema.org/Product')
 				window.requirejs = {
 					"urlArgs" : "fingerprint=#{fingerprint(jsPath + 'main.js')}-#{fingerprint(jsPath + 'libs.js')}",
 					"paths" : {
-						"moment": "libs/moment-2.7.0"
+						"moment": "libs/#{lib('moment')}"
+					},
+					"config":{
+						"moment":{
+							"noGlobal": true
+						}
 					}
 				};
 			script(
diff --git a/services/web/app/views/project/editor.jade b/services/web/app/views/project/editor.jade
index e595d21f72..d6acb94f34 100644
--- a/services/web/app/views/project/editor.jade
+++ b/services/web/app/views/project/editor.jade
@@ -101,7 +101,7 @@ block content
 		window.requirejs = {
 			"paths" : {
 				"mathjax": "#{buildJsPath('/libs/mathjax/MathJax.js', {cdn:false, fingerprint:false, qs:{config:'TeX-AMS_HTML'}})}",
-				"moment": "libs/moment-2.7.0",
+				"moment": "libs/#{lib('moment')}",
 				"libs/pdf": "libs/#{lib('pdfjs')}/pdf",
 				"ace": "#{lib('ace')}"
 			},
diff --git a/services/web/public/coffee/filters/formatDate.coffee b/services/web/public/coffee/filters/formatDate.coffee
index 395194456e..5b8c9e10c6 100644
--- a/services/web/public/coffee/filters/formatDate.coffee
+++ b/services/web/public/coffee/filters/formatDate.coffee
@@ -1,6 +1,6 @@
 define [
 	"base"
-	"libs/moment-2.9.0"
+	"moment"
 ], (App, moment) ->
 	moment.locale "en", calendar:
 		lastDay : '[Yesterday]'
@@ -16,4 +16,4 @@ define [
 
 	App.filter "relativeDate", () ->
 		(date) ->
-			moment(date).calendar()
\ No newline at end of file
+			moment(date).calendar()
diff --git a/services/web/public/coffee/ide/track-changes/TrackChangesManager.coffee b/services/web/public/coffee/ide/track-changes/TrackChangesManager.coffee
index ecd3b5a7f8..10b6bb9765 100644
--- a/services/web/public/coffee/ide/track-changes/TrackChangesManager.coffee
+++ b/services/web/public/coffee/ide/track-changes/TrackChangesManager.coffee
@@ -1,8 +1,9 @@
 define [
+	"moment"
 	"ide/track-changes/controllers/TrackChangesListController"
 	"ide/track-changes/controllers/TrackChangesDiffController"
 	"ide/track-changes/directives/infiniteScroll"
-], () ->
+], (moment) ->
 	class TrackChangesManager
 		constructor: (@ide, @$scope) ->
 			@reset()
diff --git a/services/web/public/coffee/libs.coffee b/services/web/public/coffee/libs.coffee
index d41170391c..307d0307b6 100644
--- a/services/web/public/coffee/libs.coffee
+++ b/services/web/public/coffee/libs.coffee
@@ -1,5 +1,5 @@
 define [
-	"libs/moment-2.9.0"
+	"moment"
 	"libs/angular-autocomplete/angular-autocomplete"
 	"libs/ui-bootstrap"
 	"libs/ng-context-menu-0.1.4"