Skip to content

Commit 4fa78ca

Browse files
author
Chris K
committed
Fix for DFL-3336, Element selection from inspection tooltip doesn't work on the first attempt.
1 parent ac1c777 commit 4fa78ca

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/ecma-debugger/dominspection/domdata.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
113113
{
114114
this._get_initial_view(this._data_runtime_id);
115115
}
116-
else if (this._element_selected_state != CHECKED &&
116+
else if (this._element_selected_state != CHECKED &&
117117
this._element_selected_state != CHECK_AGAIN_NO_RUNTIME)
118118
{
119119
this._get_selected_element(this._data_runtime_id);
@@ -278,7 +278,7 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
278278

279279
this._on_active_tab = function(msg)
280280
{
281-
if (!this._data_runtime_id ||
281+
if (!this._data_runtime_id ||
282282
msg.activeTab.indexOf(this._data_runtime_id) == -1)
283283
{
284284
if (this._element_selected_state == CHECK_AGAIN_NO_RUNTIME)
@@ -299,7 +299,7 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
299299
}
300300
}
301301
}
302-
302+
303303
this._on_top_runtime_update = function()
304304
{
305305
window['cst-selects']['document-select'].updateElement();
@@ -317,10 +317,10 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
317317
var do_highlight = event.highlight === false ? false : true;
318318
this._get_dom_sub(rt_id, obj_id, do_highlight);
319319
}
320-
320+
321321
this._get_dom_sub = function(rt_id, obj_id, do_highlight, scroll_into_view)
322322
{
323-
var cb = this._handle_get_dom.bind(this, rt_id, obj_id,
323+
var cb = this._handle_get_dom.bind(this, rt_id, obj_id,
324324
do_highlight, scroll_into_view);
325325
this._current_target = obj_id;
326326
this._data = [];
@@ -459,7 +459,7 @@ cls.EcmascriptDebugger["6.0"].DOMData = function(view_id)
459459

460460
/* implementation */
461461

462-
462+
463463
this.get_dom = (function(rt_id, obj_id, do_highlight, scroll_into_view)
464464
{
465465
if (obj_id)

src/ecma-debugger/objectinspection.6.0/inspectiontooltip.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ cls.JSInspectionTooltip = function()
4242
{
4343
if (!_cur_ctx)
4444
return;
45-
45+
4646
switch (_cur_ctx.type.type)
4747
{
4848
case cls.PrettyPrinter.ELEMENT:
@@ -70,7 +70,7 @@ cls.JSInspectionTooltip = function()
7070
break;
7171
}
7272
};
73-
73+
7474
var _ontooltipclick = function(event)
7575
{
7676
if (!_cur_ctx)
@@ -79,9 +79,9 @@ cls.JSInspectionTooltip = function()
7979
switch (_cur_ctx.type.type)
8080
{
8181
case cls.PrettyPrinter.ELEMENT:
82-
UI.get_instance().show_view("dom");
8382
dom_data.get_dom(_cur_ctx.rt_id, _cur_ctx.obj_id);
8483
_hide_tooltip();
84+
UI.get_instance().show_view("dom");
8585
break;
8686
}
8787
};
@@ -97,10 +97,10 @@ cls.JSInspectionTooltip = function()
9797
var obj_id = parseInt(target.get_attr("parent-node-chain", "obj-id"));
9898
var model = inspections[model_id];
9999
var obj = model && model.get_object_with_id(obj_id);
100-
100+
101101
if (obj && obj[OBJECT_VALUE])
102102
{
103-
_cur_object = obj;
103+
_cur_object = obj;
104104
_pretty_printer.print({target: target,
105105
rt_id: model.runtime_id,
106106
obj_id: obj_id,

0 commit comments

Comments
 (0)