Skip to content

Commit 2508f2b

Browse files
author
Chris K
committed
More code clean up.
1 parent 84237d9 commit 2508f2b

File tree

8 files changed

+54
-53
lines changed

8 files changed

+54
-53
lines changed

‎src/build-application/build_ecmascript_debugger_6_0.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ window.app.builders.EcmascriptDebugger["6.0"] = function(service)
184184
/* Listeners */
185185
if (service_interface.satisfies_version(6, 11))
186186
{
187-
cls.EventListenersView.prototype = ViewBase;
188187
new cls.EventListenersView("ev-listeners",
189188
ui_strings.M_VIEW_LABEL_EVENT_LISTENERS,
190189
"ev-listeners scroll");

‎src/client/client.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -525,9 +525,6 @@ ui_framework.layouts.dom_rough_layout =
525525
if (services['ecmascript-debugger'].satisfies_version(6, 11))
526526
return ['dom-side-panel', 'dom_attrs', 'css-layout', 'dom-search', 'ev-listeners'];
527527

528-
if (services['ecmascript-debugger'].satisfies_version(6, 5))
529-
return ['dom-side-panel', 'dom_attrs', 'css-layout', 'dom-search'];
530-
531528
return ['dom-side-panel', 'dom_attrs', 'css-layout'];
532529
}
533530
}

‎src/ecma-debugger/dominspection/templates.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
const PSEUDO_ELEMENT_FIRST_LINE = 4;
3636
const EVENT_LISTENER_LIST = 15;
3737

38-
var EV_LISTENER_MARKUP = "<span class=\"ev-listener\" "+
38+
var EV_LISTENER_MARKUP = "<span class=\"ev-listener\" " +
3939
"data-tooltip=\"event-listener\" " +
4040
"></span>"
4141

@@ -344,7 +344,6 @@
344344
var show_pseudo_elements = window.settings.dom.get("show-pseudo-elements");
345345
var is_expandable = false;
346346

347-
348347
for ( ; node = data[i]; i += 1)
349348
{
350349
while (current_depth > node[DEPTH])

‎src/ecma-debugger/eventlisteners/evlistenersview.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,11 @@ cls.EventListenersView = function(id, name, container_class)
4747

4848
this._update_ev_listeners = function(event, target)
4949
{
50-
// TODO testing
51-
target.get_ancestor("container").innerHTML = "";
50+
var container = target.get_ancestor("container");
51+
var ev_rt_list = container && container.querySelector(".ev-rt-list");
52+
if (ev_rt_list)
53+
ev_rt_list.parentNode.removeChild(ev_rt_list);
54+
5255
this._data.update();
5356
};
5457

@@ -77,3 +80,5 @@ cls.EventListenersView = function(id, name, container_class)
7780

7881
this._init(id, name, container_class);
7982
};
83+
84+
cls.EventListenersView.prototype = ViewBase;

‎src/ecma-debugger/eventlisteners/evlistenertemplates.js‎

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
(function()
22
{
3+
var EVENT_TYPE = 0;
4+
var ORIGIN = 1;
5+
var ORIGIN_EVENT_TARGET = 1;
6+
var ORIGIN_ATTRIBUTE = 2;
7+
var POSITION = 2;
8+
var SCRIPT_ID = 0;
9+
var LINE_NUMBER = 1;
10+
var USE_CAPTURE = 3;
11+
var LISTENER_OBJECT_ID = 4;
12+
var LISTENER_SCRIPT_DATA = 5;
313
var HAS_LISTENERS = function(rt_l) { return rt_l.event_types.length; };
414

515
/* Event listener view */
@@ -64,27 +74,24 @@
6474

6575
this.ev_window_listeners = function(ev_type)
6676
{
67-
var EVENT_TYPE = 0;
6877
var win_listeners = ev_type && ev_type.window_listeners;
69-
var ret = [];
70-
if (win_listeners && win_listeners.listeners.some(function(listener)
71-
{
72-
return listener[EVENT_TYPE] == ev_type.type;
73-
}))
78+
var has_listener = function(listener)
7479
{
75-
ret =
76-
["div",
77-
"window",
78-
["span", "class", "ev-listener",
79-
"data-tooltip", "event-listener"],
80-
"data-model-id", String(ev_type.id),
81-
"data-window-id", String(win_listeners.win_id),
82-
"data-rt-id", String(ev_type.rt_id),
83-
"data-obj-id", String(win_listeners.win_id),
84-
"handler", "inspect-object-link",
85-
"class", "search-match"];
86-
}
87-
return ret;
80+
return listener[EVENT_TYPE] == ev_type.type;
81+
};
82+
83+
return win_listeners && win_listeners.listeners.some(has_listener)
84+
? ["div",
85+
"window",
86+
["span", "class", "ev-listener",
87+
"data-tooltip", "event-listener"],
88+
"data-model-id", String(ev_type.id),
89+
"data-window-id", String(win_listeners.win_id),
90+
"data-rt-id", String(ev_type.rt_id),
91+
"data-obj-id", String(win_listeners.win_id),
92+
"handler", "inspect-object-link",
93+
"class", "search-match"]
94+
: [];
8895
};
8996

9097
/* Event listener tooltip */
@@ -97,16 +104,6 @@
97104

98105
this._ev_listener_tooltip = function(rt_id, listener)
99106
{
100-
var EVENT_TYPE = 0;
101-
var ORIGIN = 1;
102-
var ORIGIN_EVENT_TARGET = 1;
103-
var ORIGIN_ATTRIBUTE = 2;
104-
var POSITION = 2;
105-
var SCRIPT_ID = 0;
106-
var LINE_NUMBER = 1;
107-
var USE_CAPTURE = 3;
108-
var LISTENER_OBJECT_ID = 4;
109-
var LISTENER_SCRIPT_DATA = 5;
110107
var ret = [];
111108
var position = listener[POSITION];
112109

@@ -118,7 +115,7 @@
118115
if (listener[LISTENER_SCRIPT_DATA])
119116
{
120117
ret.push(["dd",
121-
["span", "attribute handler",
118+
["span", ui_strings.S_ATTRIBUTE_LISTENER,
122119
"data-tooltip", "js-inspection",
123120
"data-script-data", listener[LISTENER_SCRIPT_DATA],
124121
"data-class-name", "Function",
@@ -128,8 +125,8 @@
128125
{
129126
ret.push(["dd",
130127
["span", listener[ORIGIN] == ORIGIN_EVENT_TARGET
131-
? "event target handler"
132-
: "attribute handler",
128+
? ui_strings.S_EVENT_TARGET_LISTENER
129+
: ui_strings.S_ATTRIBUTE_LISTENER,
133130
"data-tooltip", "js-inspection",
134131
"data-rt-id", String(rt_id),
135132
"data-obj-id", String(listener[LISTENER_OBJECT_ID]),

‎src/ecma-debugger/js-source-view.js‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ cls.JsSourceView = function(id, name, container_class)
88
// split out one general class to handle partial view ( yield count of lines )
99

1010
var self = this;
11-
var frame_id = '';
12-
var container_class_name = 'js-source-content';
11+
var frame_id = "";
12+
var container_class_name = "js-source-content";
1313
var container_selector = "." + container_class_name;
14-
var container_line_nr_class = 'js-source-line-numbers';
14+
var container_line_nr_class = "js-source-line-numbers";
1515
var container_line_nr_selector = "container > .js-source-line-numbers";
16-
var scroll_id = 'js-source-scroller';
17-
var scroll_content_id = 'js-source-scroll-content';
18-
var scroll_container_id = 'js-source-scroll-container';
19-
var container_breakpoints_id = 'break-point-container';
16+
var scroll_id = "js-source-scroller";
17+
var scroll_content_id = "js-source-scroll-content";
18+
var scroll_container_id = "js-source-scroll-container";
19+
var container_breakpoints_id = "break-point-container";
2020

2121
const STOP_AT_ERROR_CLASS = "stop-at-error";
2222
const ERROR_TOOLTIP_CLASS = "error-description";
@@ -65,12 +65,13 @@ cls.JsSourceView = function(id, name, container_class)
6565

6666
templates.line_nummer_container = function(lines)
6767
{
68-
var ret = ['ul'], i = 0;
68+
var ret = ["ul"], i = 0;
6969
for( ; i<lines; i++)
7070
{
7171
ret[ret.length] = templates.line_nummer();
7272
}
73-
return ret.concat(['class', container_line_nr_class]);
73+
ret.push("class", container_line_nr_class);
74+
return ret;
7475
}
7576

7677
templates.line_nummer = function()

‎src/ecma-debugger/runtimes.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,10 +1114,7 @@ cls.EcmascriptDebugger["6.0"].Runtimes = function(service_version)
11141114

11151115
this.get_dom_runtime_ids = function()
11161116
{
1117-
return this.getRuntimeIdsFromWindow(__selected_window).filter(function(rt_id)
1118-
{
1119-
return __runtimes[rt_id].description != "extensionjs";
1120-
});
1117+
return this.getRuntimeIdsFromWindow(__selected_window).filter(this.runtime_has_dom);
11211118
};
11221119

11231120
this.getRuntimeIdWithURL = function(url)

‎src/ui-strings/ui_strings-en.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,3 +1511,9 @@ ui_strings.S_LISTENER_BUBBLING_PHASE = "bubbling phase";
15111511

15121512
/* DESC: View with all event listeners. */
15131513
ui_strings.M_VIEW_LABEL_EVENT_LISTENERS = "Listeners";
1514+
1515+
/* DESC: Info in a tooltip that the according listener was set by the event target interface. */
1516+
ui_strings.S_EVENT_TARGET_LISTENER = "event target listener";
1517+
1518+
/* DESC: Info in a tooltip that the according listener was set as attribute. */
1519+
ui_strings.S_ATTRIBUTE_LISTENER = "attribute listener";

0 commit comments

Comments
 (0)