Merge pull request #642 from nasa/open460

[Build] Move to npm-based build
2016-02-08 12:21:01 -08:00
parent b0e4947bf0 f615dc5409
commit 0a5097a945
55 changed files with 413 additions and 33687 deletions
--- a/platform/forms/lib/moment.min.js
+++ b/platform/forms/lib/moment.min.js
--- a/platform/forms/src/controllers/DateTimeController.js
+++ b/platform/forms/src/controllers/DateTimeController.js
@@ -22,8 +22,8 @@
 /*global define,moment*/

 define(
-    ["../../lib/moment.min"],
-    function () {
+    ["moment"],
+    function (moment) {
        "use strict";

        var DATE_FORMAT = "YYYY-MM-DD";
--- a/platform/forms/test/controllers/DateTimeControllerSpec.js
+++ b/platform/forms/test/controllers/DateTimeControllerSpec.js
@@ -26,7 +26,7 @@ define(
    function (DateTimeController) {
        "use strict";

-        describe("The date-time directive", function () {
+        describe("The date-time controller", function () {
            var mockScope,
                controller;