DFL-3608 Inspection tooltips can easily disappear when filtering

Author: Chris K

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

@@ -221,8 +221,7 @@ cls.JsSourceView = function(id, name, container_class)
     container.innerHTML = "" +
       "<div id='" + SCROLL_CONTENT_ID + "'>"+
         "<div class='" + CONTAINER_CLASS_NAME + "' " +
-             "data-menu='js-source-content' " +
-             "data-tooltip='" + cls.JSSourceTooltip.tooltip_name + "'></div>"+
+             "data-menu='js-source-content'></div>" +
       "</div>"+
       "<div id='" + SCROLL_CONTAINER_ID + "' handler='scroll-js-source'>"+
         "<div id='" + SCROLL_ID + "'></div>"+
@@ -564,7 +563,7 @@ cls.JsSourceView = function(id, name, container_class)
       {
         document.getElementById(SCROLL_ID).innerHTML = "";
         if (typeof script_id == "number" && !isNaN(script_id) &&
-            typeof line_no == "number"  && !isNaN(line_no))
+            typeof line_no == "number" && !isNaN(line_no))
         {
           new ConfirmDialog(ui_strings.D_RELOAD_SCRIPTS,
                             function(){ runtimes.reloadWindow(); }).show();
@@ -1000,7 +999,13 @@ cls.JsSourceView = function(id, name, container_class)
   this._handlers["scroll-page-down"] = this._scroll_lines.bind(this, PAGE_SCROLL);
   this._handlers["scroll-arrow-up"] = this._scroll_lines.bind(this, -ARROW_SCROLL);
   this._handlers["scroll-arrow-down"] = this._scroll_lines.bind(this, ARROW_SCROLL);
-  this.init(id, name, container_class, null, "scroll-js-source-view");
+  this.init(id,
+            name,
+            container_class,
+            null,
+            "scroll-js-source-view",
+            null,
+            cls.JSSourceTooltip.tooltip_name);
   this._go_to_line = new cls.GoToLine(this);
   messages.addListener("update-layout", updateLayout);
   messages.addListener("runtime-destroyed", onRuntimeDestroyed);

src/ui-scripts/containers.js

@@ -66,29 +66,25 @@ var ContainerBase = function()
   this.setup = function(view_id)
   {
     var view = views[this.view_id = view_id];
-    var container = document.getElementById(this.type + '-to-' + this.cell.id) || this.update();
+    var container = document.getElementById(this.type + "-to-" + this.cell.id) || this.update();
     if( view )
     {
-      container.removeAttribute('handler');
-      container.removeAttribute('edit-handler');
-      if (view.default_handler)
+      var names = ["handler", "edit-handler", "data-tooltip", "data-menu"];
+      var values = [view.default_handler, view.edit_handler, view.default_tooltip, view_id];
+      names.forEach(function(name, index)
       {
-        container.setAttribute('handler', view.default_handler);
-      }
-      if (view.edit_handler)
-      {
-        container.setAttribute('edit-handler', view.edit_handler);
-      }
-      container.className = view.container_class || '';
-      container.setAttribute('data-menu', view_id || '');
-      container.innerHTML = '';
+        if (values[index])
+          container.setAttribute(name, values[index]);
+        else
+          container.removeAttribute(name);
+      });
+      container.className = view.container_class || "";
+      container.innerHTML = "";
       if (!view.has_container_id(container.id))
-      {
         view.addContainerId(container.id);
-      }
       view.update();
     }
-  }
+  };
 
   this.init = function(cell)
   {

src/ui-scripts/view.js

@@ -60,17 +60,18 @@ var ViewBase = new function()
     return false;
   }
 
-  this.init = function(id, name, container_class, html, default_handler, edit_handler)
+  this.init = function(id, name, container_class, html, default_handler, edit_handler, default_tooltip)
   {
     this.id = id || getId();
     this.name = name;
     this.container_class = container_class;
     this.inner = html;  // only for testing;
     this.container_ids = [];
-    this.type = this.type || 'single-view';
-    this.default_handler = default_handler || '';
-    this.edit_handler = edit_handler || '';
-    this.requires_view || ( this.requires_view = '' );
+    this.type = this.type || "single-view";
+    this.default_handler = default_handler || "";
+    this.edit_handler = edit_handler || "";
+    this.default_tooltip = default_tooltip || "";
+    this.requires_view || ( this.requires_view = "" );
     if(!window.views)
     {
       window.views = {};
@@ -80,7 +81,7 @@ var ViewBase = new function()
     {
       ids[ids.length] = this.id;
     }
-    messages.post('view-initialized', {'view_id': this.id});
+    messages.post("view-initialized", {"view_id": this.id});
   }
 
   this.register_overlay = function(view)
@@ -304,11 +305,9 @@ var ViewBase = new function()
   * @constructor
   * @extends ViewBase
   */
-
-
-var View = function(id, name, container_class, html, default_handler)
+var View = function(id, name, container_class, html, default_handler, edit_handler, default_tooltip)
 {
-  this.init(id, name, container_class, html, default_handler);
+  this.init(id, name, container_class, html, default_handler, edit_handler, default_tooltip);
 }
 
 View.prototype = ViewBase;