Index: runtime/observatory/lib/src/elements/context_view.dart |
diff --git a/runtime/observatory/lib/src/elements/context_view.dart b/runtime/observatory/lib/src/elements/context_view.dart |
index 7c7f9d16e580600ded28322376a9a07a36f72235..c3afef5f839558b8c3cc55543ffe2d5abd3aff36 100644 |
--- a/runtime/observatory/lib/src/elements/context_view.dart |
+++ b/runtime/observatory/lib/src/elements/context_view.dart |
@@ -8,12 +8,12 @@ import 'package:observatory/models.dart' as M; |
import 'package:observatory/src/elements/context_ref.dart'; |
import 'package:observatory/src/elements/curly_block.dart'; |
import 'package:observatory/src/elements/helpers/any_ref.dart'; |
+import 'package:observatory/src/elements/helpers/nav_bar.dart'; |
+import 'package:observatory/src/elements/helpers/nav_menu.dart'; |
import 'package:observatory/src/elements/helpers/rendering_scheduler.dart'; |
import 'package:observatory/src/elements/helpers/tag.dart'; |
-import 'package:observatory/src/elements/nav/bar.dart'; |
import 'package:observatory/src/elements/nav/class_menu.dart'; |
import 'package:observatory/src/elements/nav/isolate_menu.dart'; |
-import 'package:observatory/src/elements/nav/menu.dart'; |
import 'package:observatory/src/elements/nav/notify.dart'; |
import 'package:observatory/src/elements/nav/refresh.dart'; |
import 'package:observatory/src/elements/nav/top_menu.dart'; |
@@ -26,12 +26,10 @@ class ContextViewElement extends HtmlElement implements Renderable { |
dependencies: const [ |
ContextRefElement.tag, |
CurlyBlockElement.tag, |
- NavBarElement.tag, |
NavClassMenuElement.tag, |
NavTopMenuElement.tag, |
NavVMMenuElement.tag, |
NavIsolateMenuElement.tag, |
- NavMenuElement.tag, |
NavRefreshElement.tag, |
NavNotifyElement.tag, |
ObjectCommonElement.tag, |
@@ -114,21 +112,20 @@ class ContextViewElement extends HtmlElement implements Renderable { |
void render() { |
var content = [ |
- new NavBarElement(queue: _r.queue) |
- ..children = [ |
- new NavTopMenuElement(queue: _r.queue), |
- new NavVMMenuElement(_vm, _events, queue: _r.queue), |
- new NavIsolateMenuElement(_isolate, _events, queue: _r.queue), |
- new NavClassMenuElement(_isolate, _context.clazz, queue: _r.queue), |
- new NavMenuElement('instance', last: true, queue: _r.queue), |
- new NavRefreshElement(queue: _r.queue) |
- ..onRefresh.listen((e) async { |
- e.element.disabled = true; |
- _context = await _contexts.get(_isolate, _context.id); |
- _r.dirty(); |
- }), |
- new NavNotifyElement(_notifications, queue: _r.queue) |
- ], |
+ navBar([ |
+ new NavTopMenuElement(queue: _r.queue), |
+ new NavVMMenuElement(_vm, _events, queue: _r.queue), |
+ new NavIsolateMenuElement(_isolate, _events, queue: _r.queue), |
+ new NavClassMenuElement(_isolate, _context.clazz, queue: _r.queue), |
+ navMenu('instance'), |
+ new NavRefreshElement(queue: _r.queue) |
+ ..onRefresh.listen((e) async { |
+ e.element.disabled = true; |
+ _context = await _contexts.get(_isolate, _context.id); |
+ _r.dirty(); |
+ }), |
+ new NavNotifyElement(_notifications, queue: _r.queue) |
+ ]), |
new DivElement()..classes = ['content-centered-big'] |
..children = [ |
new HeadingElement.h2()..text = 'Context', |
@@ -168,7 +165,7 @@ class ContextViewElement extends HtmlElement implements Renderable { |
new SpanElement()..text = 'Variables ', |
new CurlyBlockElement(expanded: _context.variables.length > 8, |
queue: _r.queue) |
- ..children = [ |
+ ..content = [ |
new DivElement()..classes = ['memberList'] |
..children = _context.variables.map((variable) |
=> new DivElement()..classes = ['memberItem'] |