Merge pull request #710 from nasa/open673

[Templates] Load templates using RequireJS text plugin
2016-02-29 18:45:46 +00:00
parent 6f9e78a14f 721557b814
commit 7daaecbf8f
39 changed files with 503 additions and 194 deletions
--- a/platform/commonUI/notification/bundle.js
+++ b/platform/commonUI/notification/bundle.js
@@ -25,11 +25,13 @@ define([
    "./src/NotificationIndicatorController",
    "./src/NotificationIndicator",
    "./src/NotificationService",
+    "text!./res/notification-indicator.html",
    'legacyRegistry'
 ], function (
    NotificationIndicatorController,
    NotificationIndicator,
    NotificationService,
+    notificationIndicatorTemplate,
    legacyRegistry
 ) {
    "use strict";
@@ -53,7 +55,7 @@ define([
            "templates": [
                {
                    "key": "notificationIndicatorTemplate",
-                    "templateUrl": "notification-indicator.html"
+                    "template": notificationIndicatorTemplate
                }
            ],
            "controllers": [