From ddb567aeb5bb25b8a27f33092420f1838c41f8a1 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Fri, 23 Oct 2015 15:41:59 -0700 Subject: [PATCH] [Clocks/Timers] Declare dependency of moment-duration-format ...to ensure that moment is loaded first, such that the plugin can correctly install itself. nasa/openmctweb#204 --- platform/features/clock/bundle.json | 5 +++++ .../features/clock/test/controllers/TimerFormatterSpec.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/features/clock/bundle.json b/platform/features/clock/bundle.json index 0d1ac5611a..5468c46207 100644 --- a/platform/features/clock/bundle.json +++ b/platform/features/clock/bundle.json @@ -4,6 +4,11 @@ "configuration": { "paths": { "moment-duration-format": "moment-duration-format" + }, + "shim": { + "moment-duration-format": { + "deps": [ "moment" ] + } } }, "extensions": { diff --git a/platform/features/clock/test/controllers/TimerFormatterSpec.js b/platform/features/clock/test/controllers/TimerFormatterSpec.js index f0f4d954c3..e485811988 100644 --- a/platform/features/clock/test/controllers/TimerFormatterSpec.js +++ b/platform/features/clock/test/controllers/TimerFormatterSpec.js @@ -93,4 +93,4 @@ define( }); } -); \ No newline at end of file +);