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/commonUI/about/bundle.js
+++ b/platform/commonUI/about/bundle.js
@@ -22,11 +22,13 @@
 /*global define*/

 define([
+    "text!./res/templates/about-dialog.html",
    "./src/LogoController",
    "./src/AboutController",
    "./src/LicenseController",
    'legacyRegistry'
 ], function (
+    aboutDialogTemplate,
    LogoController,
    AboutController,
    LicenseController,
@@ -50,7 +52,7 @@ define([
                },
                {
                    "key": "about-dialog",
-                    "templateUrl": "templates/about-dialog.html"
+                    "template": aboutDialogTemplate
                },
                {
                    "key": "overlay-about",