Skip to content

Commit a6dbba6

Browse files
hzrhzr
committed
Review fixes.
1 parent b5b2aec commit a6dbba6

File tree

6 files changed

+72
-71
lines changed

6 files changed

+72
-71
lines changed

‎src/build-application/build_ecmascript_debugger_6_0.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ window.app.builders.EcmascriptDebugger["6.0"] = function(service)
9393
/* Return Values */
9494
cls.ReturnValuesView.prototype = ViewBase;
9595
new cls.ReturnValuesView('return-values',
96-
ui_strings.M_VIEW_LABEL_RETURN_VALUES,
97-
'scroll mono');
96+
ui_strings.M_VIEW_LABEL_RETURN_VALUES,
97+
'scroll mono');
9898
cls.ReturnValuesView.create_ui_widgets();
9999

100100
/* Callstack */

‎src/ecma-debugger/action_handler.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ window.eventHandlers.click["goto-script-line"] = function(event, target)
3636
{
3737
var script_id = Number(event.target.getAttribute("data-script-id"));
3838
var script_line = Number(event.target.getAttribute("data-script-line"));
39-
views.js_source.show_and_flash_line(script_id, script_line);
39+
window.views.js_source.show_and_flash_line(script_id, script_line);
4040
};
4141

4242
window.eventHandlers.click['expand-value'] = function(event, target)

‎src/ecma-debugger/templates.js‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -355,15 +355,14 @@
355355

356356
this.return_value = function(retval, rt_id, search_term)
357357
{
358-
var search_re = new RegExp(search_term, "ig")
359358
var value_template = [];
360359
var value = "";
361360
var type = types[retval.value.type];
362361
switch (retval.value.type)
363362
{
364363
case TYPE_UNDEFINED:
365364
case TYPE_NULL:
366-
if (search_re.test(type))
365+
if (type.contains(search_term))
367366
{
368367
value_template.push(
369368
["item",
@@ -382,7 +381,7 @@
382381
case TYPE_PLUS_INFINITY:
383382
case TYPE_MINUS_INFINITY:
384383
value = names[retval.value.type];
385-
if (search_re.test(value))
384+
if (value.contains(search_term))
386385
{
387386
value_template.push(
388387
["item",
@@ -397,7 +396,7 @@
397396

398397
case TYPE_NUMBER:
399398
value = String(retval.value.number);
400-
if (search_re.test(value))
399+
if (value.contains(search_term))
401400
{
402401
value_template.push(
403402
["item",
@@ -412,7 +411,7 @@
412411

413412
case TYPE_STRING:
414413
value = retval.value.str;
415-
if (search_re.test(value))
414+
if (value.contains(search_term))
416415
{
417416
var short_value = value.length > STRING_MAX_VALUE_LENGTH
418417
? value.slice(0, STRING_MAX_VALUE_LENGTH) + "…"
@@ -455,19 +454,10 @@
455454
: object.functionName;
456455
value = window.templates.inspected_js_object(retval.value.model, true, null, search_term);
457456
if (value !== "")
458-
value_template = [value];
457+
value_template.push(value);
459458
break;
460459
}
461460

462-
var from_script_id = retval.positionFrom.scriptID;
463-
var from_uri = from_script_id && runtimes.getScript(from_script_id)
464-
? (runtimes.getScript(from_script_id).uri || runtimes.getRuntime(rt_id).uri)
465-
: ui_strings.S_UNKNOWN_SCRIPT;
466-
var to_script_id = retval.positionTo.scriptID;
467-
var to_uri = to_script_id && runtimes.getScript(to_script_id)
468-
? (runtimes.getScript(to_script_id).uri || runtimes.getRuntime(rt_id).uri)
469-
: ui_strings.S_UNKNOWN_SCRIPT;
470-
471461
var object = retval.functionFrom;
472462
var func_model = new cls.InspectableJSObject(rt_id,
473463
object.objectID,
@@ -480,14 +470,19 @@
480470
if (func === "" && !value_template.length)
481471
return [];
482472

473+
var from_uri = window.helpers.get_script_name(retval.positionFrom.scriptID);
474+
from_uri = from_uri ? window.helpers.basename(from_uri) : ui_strings.S_UNKNOWN_SCRIPT;
475+
var to_uri = window.helpers.get_script_name(retval.positionTo.scriptID);
476+
to_uri = to_uri ? window.helpers.basename(to_uri) : ui_strings.S_UNKNOWN_SCRIPT;
477+
483478
return [
484479
["li",
485480
["div",
486481
["span",
487482
"↱",
488483
"class", "return-value-arrow return-value-arrow-from",
489484
"handler", "goto-script-line",
490-
"title", ui_strings.S_RETURN_VALUES_FUNCTION_FROM.replace("%s", window.helpers.basename(from_uri))
485+
"title", ui_strings.S_RETURN_VALUES_FUNCTION_FROM.replace("%s", from_uri)
491486
.replace("%s", retval.positionFrom.lineNumber),
492487
"data-script-id", String(retval.positionFrom.scriptID),
493488
"data-script-line", String(retval.positionFrom.lineNumber)
@@ -501,7 +496,7 @@
501496
"↳",
502497
"class", "return-value-arrow return-value-arrow-to",
503498
"handler", "goto-script-line",
504-
"title", ui_strings.S_RETURN_VALUES_FUNCTION_TO.replace("%s", window.helpers.basename(to_uri))
499+
"title", ui_strings.S_RETURN_VALUES_FUNCTION_TO.replace("%s", to_uri)
505500
.replace("%s", retval.positionTo.lineNumber),
506501
"data-script-id", String(retval.positionTo.scriptID),
507502
"data-script-line", String(retval.positionTo.lineNumber)

‎src/ecma-debugger/view_return_values.js‎

Lines changed: 52 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -51,81 +51,84 @@ cls.ReturnValuesView = function(id, name, container_class)
5151
{
5252
return (
5353
["div",
54-
"No return values",
54+
ui_strings.M_VIEW_LABEL_NO_RETURN_VALUES,
5555
"class", "not-content inspection"
5656
]
5757
);
5858
};
5959

60-
this.onbeforesearch = function(msg)
60+
this._onbeforesearch = function(msg)
6161
{
6262
if (this._create_view_bound && this.isvisible())
6363
{
6464
this._search_term = msg.search_term;
6565
this._create_view_bound();
6666
}
67-
}.bind(this);
67+
};
68+
69+
this._on_view_created = function(msg)
70+
{
71+
if (msg.id == "return-values")
72+
{
73+
this._text_search.setContainer(msg.container);
74+
this._text_search.setFormInput(window.views[this.id].getToolbarControl(msg.container,
75+
"return-values-text-search"));
76+
}
77+
};
78+
79+
this._on_view_destroyed = function(msg)
80+
{
81+
if (msg.id == "return-values")
82+
this._text_search.cleanup();
83+
};
6884

6985
this._init = function(id, name, container_class)
7086
{
7187
View.prototype.init.call(this, id, name, container_class);
7288
this.required_services = ["ecmascript-debugger"];
7389
this._container = null;
74-
this._models = [];
7590
this._search_term = "";
91+
92+
this._text_search = new TextSearch(1);
93+
this._text_search.add_listener("onbeforesearch", this._onbeforesearch.bind(this));
94+
95+
window.messages.addListener("view-created", this._on_view_created.bind(this));
96+
window.messages.addListener("view-destroyed", this._on_view_destroyed.bind(this));
97+
98+
window.event_handlers.input["return-values-text-search"] = function(event, target)
99+
{
100+
this._text_search.searchDelayed(target.value);
101+
}.bind(this);
102+
103+
ActionBroker.get_instance()
104+
.get_global_handler()
105+
.register_shortcut_listener("return-values-text-search",
106+
cls.Helpers.shortcut_search_cb.bind(this._text_search));
76107
};
77108

78109
this._init(id, name, container_class);
79110
};
80111

81112
cls.ReturnValuesView.create_ui_widgets = function()
82113
{
83-
new ToolbarConfig
84-
(
85-
"return-values",
86-
null,
87-
[
88-
{
89-
handler: "return-values-text-search",
90-
shortcuts: "return-values-text-search",
91-
title: ui_strings.S_INPUT_DEFAULT_TEXT_FILTER,
92-
label: ui_strings.S_INPUT_DEFAULT_TEXT_FILTER,
93-
type: "filter"
94-
}
95-
]
96-
);
97-
98-
var text_search = new TextSearch(1);
99-
text_search.add_listener("onbeforesearch",
100-
window.views["return-values"].onbeforesearch);
101-
102-
var on_view_created = function(msg)
103-
{
104-
if (msg.id == "return-values")
105-
{
106-
text_search.setContainer(msg.container);
107-
text_search.setFormInput(views.inspection.getToolbarControl(msg.container, "return-values-text-search"));
108-
}
109-
};
110-
111-
var on_view_destroyed = function(msg)
112-
{
113-
if (msg.id == "return-values")
114+
new ToolbarConfig(
114115
{
115-
text_search.cleanup();
116+
view: "return-values",
117+
groups: [
118+
{
119+
type: UI.TYPE_INPUT,
120+
items: [
121+
{
122+
handler: "return-values-text-search",
123+
shortcuts: "return-values-text-search",
124+
title: ui_strings.S_INPUT_DEFAULT_TEXT_FILTER,
125+
label: ui_strings.S_INPUT_DEFAULT_TEXT_FILTER,
126+
type: "filter"
127+
}
128+
]
129+
}
130+
]
116131
}
117-
};
118-
119-
messages.addListener("view-created", on_view_created);
120-
messages.addListener("view-destroyed", on_view_destroyed);
121-
122-
eventHandlers.input["return-values-text-search"] = function(event, target)
123-
{
124-
text_search.searchDelayed(target.value);
125-
};
126-
127-
ActionBroker.get_instance().get_global_handler()
128-
.register_shortcut_listener("return-values-text-search",
129-
cls.Helpers.shortcut_search_cb.bind(text_search));
132+
);
130133
};
131134

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,3 +1707,6 @@ ui_strings.S_RETURN_VALUES_FUNCTION_TO = "Returned to %s:%s";
17071707
/* DESC: Section in the script side panel for return values. */
17081708
ui_strings.M_VIEW_LABEL_RETURN_VALUES = "Return Values";
17091709

1710+
/* DESC: The content of the return value section when there are not return values. */
1711+
ui_strings.M_VIEW_LABEL_NO_RETURN_VALUES = "No return Values";
1712+

‎src/ui-style/debugger_style.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1671,11 +1671,11 @@ d
16711671

16721672
.return-function-from:hover .return-value-arrow-from
16731673
{
1674-
background-image: url("../ui-images/arrow_roundl_focused.png");
1674+
background-image: url("../ui-images/arrow_roundl_hover.png");
16751675
}
16761676

16771677
.return-value:hover .return-value-arrow-to
16781678
{
1679-
background-image: url("../ui-images/arrow_tail_focused.png");
1679+
background-image: url("../ui-images/arrow_tail_hover.png");
16801680
}
16811681

0 commit comments

Comments
 (0)