Function tooltip for attribute handlers with script data.

Author: Chris K

src/ecma-debugger/eventlisteners/evlistenertemplates.js

@@ -51,9 +51,9 @@
     ]);
   };
 
-  this.ev_listeners = function(listener_list, rt_id)
+  this.ev_listeners_tooltip = function(listener_list, rt_id)
   {
-    return ["dl", listener_list.map(this._ev_listener.bind(this, rt_id)),
+    return ["dl", listener_list.map(this._ev_listener_tooltip.bind(this, rt_id)),
                   "class", "ev-listener mono"];
   };
 
@@ -77,8 +77,8 @@
         "data-window-id", String(win_listeners.win_id),
         "data-rt-id", String(ev_name_object.rt_id),
         "data-obj-id", String(win_listeners.win_id), 
-        "class", "search-match",
-        "handler", "inspect-object-link"];
+        "handler", "inspect-object-link",
+        "class", "search-match"];
     }
     return ret;
   };
@@ -94,7 +94,7 @@
       "class", "ev-all-listeners"]);
   };
 
-  this._ev_listener = function(rt_id, listener)
+  this._ev_listener_tooltip = function(rt_id, listener)
   {
     var EVENT_TYPE = 0;
     var ORIGIN = 1;
@@ -112,15 +112,28 @@
     ret.push(["dt", listener[EVENT_TYPE], "class", "ev-type"]);
     ret.push(["dd", listener[USE_CAPTURE] ? "capturing phase" : "bubbling phase",
                     "class", "ev-phase"]);
-    ret.push(["dd", 
-                ["span", listener[ORIGIN] == ORIGIN_EVENT_TARGET
-                       ? "event target handler"
-                       : "attribute handler",
-                         "data-tooltip", "js-inspection",
-                         "data-rt-id", String(rt_id),
-                         "data-obj-id", String(listener[LISTENER_OBJECT_ID]),
-                         "data-class-name", "Function",
-                         "class", "ev-origin"]]);
+    if (listener[LISTENER_SCRIPT_DATA])
+    {
+      opera.postError("script data")
+      ret.push(["dd", 
+                  ["span", "attribute handler",
+                           "data-tooltip", "js-inspection",
+                           "data-script-data", listener[LISTENER_SCRIPT_DATA],
+                           "data-class-name", "Function",
+                           "class", "ev-origin"]]);
+    }
+    else
+    {
+      ret.push(["dd", 
+                  ["span", listener[ORIGIN] == ORIGIN_EVENT_TARGET
+                         ? "event target handler"
+                         : "attribute handler",
+                           "data-tooltip", "js-inspection",
+                           "data-rt-id", String(rt_id),
+                           "data-obj-id", String(listener[LISTENER_OBJECT_ID]),
+                           "data-class-name", "Function",
+                           "class", "ev-origin"]]);
+    }
     var script_id = position && position[SCRIPT_ID];
     var script = window.runtimes.getScript(script_id);
     if (script)

src/ecma-debugger/eventlisteners/evlistenertooltip.js

@@ -68,7 +68,7 @@ cls.EvListenerTooltip = function()
       var listeners = node_id
                     ? model.get_ev_listeners(node_id)
                     : model.window_listeners.listeners;
-      var tmpl = window.templates.ev_listeners(listeners, rt_id);
+      var tmpl = window.templates.ev_listeners_tooltip(listeners, rt_id);
       _tooltip.show(tmpl);
     }
   };

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

@@ -1012,22 +1012,26 @@ cls.JsSourceView = function(id, name, container_class)
 
 cls.JsSourceView.update_breakpoints = function(script, line_numbers, top_line)
 {
-  var BP_IMAGE_LINE_HEIGHT = 24;
-  var lines = line_numbers && line_numbers.querySelectorAll(".break-point");
-  var bp_states = script && script.breakpoint_states;
-  if (typeof top_line != "number")
+  if (script && line_numbers)
   {
-    var span = line_numbers.querySelector(".line-number");
-    top_line = span && Number(span.textContent);
-  }
-  if (lines && bp_states && typeof top_line == "number")
-  {
-    for (var i = 0, line; line = lines[i]; i++)
+
+    var BP_IMAGE_LINE_HEIGHT = 24;
+    var lines = line_numbers.querySelectorAll(".break-point");
+    var bp_states = script && script.breakpoint_states;
+    if (typeof top_line != "number")
     {
-      var y = bp_states[top_line + i]
-            ? this.default_y - 1 * bp_states[top_line + i] * BP_IMAGE_LINE_HEIGHT
-            : 0;
-      line.style.backgroundPosition = "0 " + y + "px";
+      var span = line_numbers.querySelector(".line-number");
+      top_line = span && Number(span.textContent);
+    }
+    if (lines && bp_states && typeof top_line == "number")
+    {
+      for (var i = 0, line; line = lines[i]; i++)
+      {
+        var y = bp_states[top_line + i]
+              ? this.default_y - 1 * bp_states[top_line + i] * BP_IMAGE_LINE_HEIGHT
+              : 0;
+        line.style.backgroundPosition = "0 " + y + "px";
+      }
     }
   }
 };

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

@@ -126,6 +126,19 @@ cls.JSInspectionTooltip = function()
                                callback: _handle_ontooltip});
 
       }
+      else
+      {
+        var script_data = target.get_ancestor_attr("data-script-data");
+        if (script_data && class_name)
+        {
+          _cur_object = {script_data: script_data, class_name: class_name}; 
+          _pretty_printer.print({target: target,
+                                 script_data: script_data,
+                                 class_name: class_name,
+                                 object: _cur_object,
+                                 callback: _handle_ontooltip});
+        }
+      }
     }
   };
 

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

@@ -110,7 +110,13 @@ cls.PrettyPrinter.types[cls.PrettyPrinter.FUNCTION] =
   template: function(message, ctx)
   {
     var tmpl = [];
-    if (ctx.function_definition)
+    if (ctx.script_data)
+    {
+      tmpl.push("div");
+      window.templates.highlight_js_source(ctx.script_data, null, 0, tmpl);
+      tmpl.push("class", "tooltip-function-source");
+    }
+    else if (ctx.function_definition)
     {
       var script = ctx.script;
       var start_line = ctx.function_definition.start_line;
@@ -299,7 +305,12 @@ cls.PrettyPrinter.prototype = new function()
 
   this._print_function = function(ctx)
   {
-    if (services["ecmascript-debugger"].requestGetFunctionPositions)
+    if (ctx.script_data)
+    {
+      ctx.template = ctx.type.template(null, ctx);
+      ctx.callback(ctx);
+    }
+    else if (services["ecmascript-debugger"].requestGetFunctionPositions)
     {
       var tag = tagManager.set_callback(this, this._handle_function, [ctx]);
       var msg = [ctx.rt_id, [ctx.obj_id]];