[Time Conductor] Switched conductor to mct-include rather than mct-re…

…presentation to avoid warnings
nasa · Sep 7, 2016 · fbab890 · fbab890
1 parent d37dd52
commit fbab890
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html
@@ -59,8 +59,9 @@
             </mct-representation>
         </div>
     </div>
-    <mct-representation mct-object="domainObject"
+    <mct-include key="'time-conductor'" class="abs holder flex-elem flex-fixed l-flex-row l-time-conductor-holder"></mct-include>
+<!--    <mct-representation mct-object="domainObject"
                         key="'time-conductor'"
                         class="abs holder flex-elem flex-fixed l-flex-row l-time-conductor-holder">
-    </mct-representation>
+    </mct-representation> -->
 </div>
diff --git a/platform/features/conductor-v2/conductor/bundle.js b/platform/features/conductor-v2/conductor/bundle.js
@@ -91,6 +91,12 @@ define([
                     "theme": "snow"
                 }
             ],
+            "templates": [
+                {
+                    "key": "time-conductor",
+                    "template": timeConductorTemplate
+                }
+            ],
             "representations": [
                 {
                     "key": "time-conductor",

diff --git a/platform/features/conductor-v2/conductor/res/templates/time-conductor.html b/platform/features/conductor-v2/conductor/res/templates/time-conductor.html
@@ -106,4 +106,4 @@
         </div>
 
     </div>
-</div>
+</div>