Merge remote-tracking branch 'github/master' into open229b

Conflicts: platform/features/conductor/src/ConductorRepresenter.js
2015-11-03 16:58:40 -08:00
parent c0ed19fd92 9523c918fb
commit 99376391a9
63 changed files with 4572 additions and 1360 deletions
--- a/platform/features/conductor/src/ConductorRepresenter.js
+++ b/platform/features/conductor/src/ConductorRepresenter.js
@@ -101,8 +101,7 @@ define(

            function updateDomain(value) {
                var newDomain = conductor.domain(value);
-                conductorScope.parameters.format =
-                    newDomain && newDomain.format;
+                conductorScope.parameters.format = newDomain.format;
                broadcastBounds();
            }