Index: runtime/observatory/lib/src/elements/script_view.dart |
diff --git a/runtime/observatory/lib/src/elements/script_view.dart b/runtime/observatory/lib/src/elements/script_view.dart |
index 0aa87d27caf7546efc5685e397d3a2fe80eab484..98f07314d7e0d29f6e7410895e518a679e3c5ce7 100644 |
--- a/runtime/observatory/lib/src/elements/script_view.dart |
+++ b/runtime/observatory/lib/src/elements/script_view.dart |
@@ -9,12 +9,12 @@ import 'dart:html'; |
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/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/isolate_menu.dart'; |
import 'package:observatory/src/elements/nav/library_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'; |
@@ -28,12 +28,10 @@ class ScriptViewElement extends HtmlElement implements Renderable { |
dependencies: const [ |
ContextRefElement.tag, |
CurlyBlockElement.tag, |
- NavBarElement.tag, |
NavTopMenuElement.tag, |
NavVMMenuElement.tag, |
NavIsolateMenuElement.tag, |
NavLibraryMenuElement.tag, |
- NavMenuElement.tag, |
NavRefreshElement.tag, |
NavNotifyElement.tag, |
ObjectCommonElement.tag, |
@@ -121,21 +119,20 @@ class ScriptViewElement extends HtmlElement implements Renderable { |
void render() { |
children = [ |
- 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 NavLibraryMenuElement(_isolate, _script.library, queue: _r.queue), |
- new NavMenuElement('object', last: true, queue: _r.queue), |
- new NavRefreshElement(queue: _r.queue) |
- ..onRefresh.listen((e) async { |
- e.element.disabled = true; |
- _script = await _scripts.get(_isolate, _script.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 NavLibraryMenuElement(_isolate, _script.library, queue: _r.queue), |
+ navMenu('object'), |
+ new NavRefreshElement(queue: _r.queue) |
+ ..onRefresh.listen((e) async { |
+ e.element.disabled = true; |
+ _script = await _scripts.get(_isolate, _script.id); |
+ _r.dirty(); |
+ }), |
+ new NavNotifyElement(_notifications, queue: _r.queue) |
+ ]), |
new DivElement()..classes = ['content-centered-big'] |
..children = [ |
new HeadingElement.h2()..text = 'Script', |