From 4e7b69c4dff54991d95e5e56caf1c8f85b32f524 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 8 Jul 2016 16:57:50 -0700 Subject: [PATCH] Enabled fixed and real-time modes --- .../templates/mode-selector/mode-menu.html | 41 ++------- .../mode-selector/mode-selector.html | 5 +- .../res/templates/time-conductor.html | 5 +- .../src/TimeConductorController.js | 87 +++++++++++++++++-- 4 files changed, 91 insertions(+), 47 deletions(-) diff --git a/platform/features/conductor-v2/res/templates/mode-selector/mode-menu.html b/platform/features/conductor-v2/res/templates/mode-selector/mode-menu.html index d926037cc8..45257e469f 100644 --- a/platform/features/conductor-v2/res/templates/mode-selector/mode-menu.html +++ b/platform/features/conductor-v2/res/templates/mode-selector/mode-menu.html @@ -22,46 +22,15 @@