Review fixes.

Author: Chris K

src/ecma-debugger/action_handler.js

@@ -168,23 +168,26 @@ window.eventHandlers.click['set-break-point'] = function(event)
   var bps = cls.Breakpoints.get_instance();
   var target = event.target;
   var li = target.get_ancestor("li");
-  var input = li.querySelector("input");
-  var line_number = input && Number(input.value);
-  if (!line_number)
-  {
-    var span = li.querySelector(".line-number");
-    line_number = span && Number(span.textContent);
-  }
-  var script_id = window.views.js_source.getCurrentScriptId() ||
-                  Number(target.get_ancestor_attr("data-script-id"));
-  if (script_id && line_number)
-  {
-    if (bps.script_has_breakpoint_on_line(script_id, line_number))
+  if (li)
+  {  
+    var input = li.querySelector("input");
+    var line_number = input && Number(input.value);
+    if (!line_number)
     {
-      var bp_id = bps.remove_breakpoint(script_id, line_number);
-      bps.delete_breakpoint(bp_id);
+      var span = li.querySelector(".line-number");
+      line_number = span && Number(span.textContent);
+    }
+    var script_id = window.views.js_source.getCurrentScriptId() ||
+                    Number(target.get_ancestor_attr("data-script-id"));
+    if (script_id && line_number)
+    {
+      if (bps.script_has_breakpoint_on_line(script_id, line_number))
+      {
+        var bp_id = bps.remove_breakpoint(script_id, line_number);
+        bps.delete_breakpoint(bp_id);
+      }
+      else
+        bps.add_breakpoint(script_id, line_number);
     }
-    else
-      bps.add_breakpoint(script_id, line_number);
   }
 };

src/ecma-debugger/dominspection/templates.js

@@ -754,7 +754,7 @@
         case DOCUMENT_NODE:
         {
           tree += "<div" + this._margin_style(node, depth_first_ele) + 
-                          "ref-id='"+node[ID] + "'>" +
+                          "ref-id='" + node[ID] + "'>" +
                     "<span class='document-node'>#document</span>" +
                     ev_listener + "</div>";
           break;

src/ecma-debugger/eventlisteners/evlisteners.css

@@ -29,7 +29,7 @@
   vertical-align: middle;
   margin-left: 3px;
   padding: 0 2px;
-  background-color: hsl(0, 0% , 70%);
+  background-color: hsl(0, 0%, 70%);
   color: #fff;
   border-radius: 2px;
 }
@@ -48,7 +48,7 @@
 {
   background-color: hsla(0, 0%, 0%, 0.04); 
   padding: 2px 8px;
-  margin: 5px -8px 1px -8px;
+  margin: 5px -8px 1px;
   border-width: 1px 0;
 }
 
@@ -70,7 +70,6 @@
 
 .tooltip-function-source .js-source-line-numbers
 {
-  xbackground-color: hsla(0, 0%, 0%, .03);
   border-radius: 0 0 0 3px;
 }
 

src/ecma-debugger/eventlisteners/evlisteners.js

@@ -1,10 +1,5 @@
 window.cls || (window.cls = {});
 
-/**
-  * @constructor
-  * @extends ViewBase
-  */
-
 cls.EventType = function(type)
 {
   this.type = type;
@@ -52,7 +47,7 @@ cls.RTListUpdateCTX.prototype = new function()
       list.splice(index, 1);
     else
       opera.postError(ui_strings.S_DRAGONFLY_INFO_MESSAGE +
-                      "_handle_expand_listener failed in cls.EvenetListeners.")
+                      "_handle_expand_listener failed in cls.EventListeners.")
 
     this.check_is_updated();
   };
@@ -66,7 +61,7 @@ cls.RTListUpdateCTX.prototype = new function()
 
   this.check_is_updated = function()
   {
-    if (this.rt_id_list.every(this._check_rt))
+    if (this.rt_id_list.every(this._check_rt, this))
       this._cb(this);
   };
 
@@ -76,18 +71,17 @@ cls.RTListUpdateCTX.prototype = new function()
     this.rt_map = {};
     this.win_id_map = {};
     this.expanded_map = {};
-    this.handle_expand_listener = this._handle_expand_listener.bind(this);
-    this._check_rt = this._check_rt.bind(this);
+    this.handle_expand_listener_bound = this._handle_expand_listener.bind(this);
     this._cb = cb;
   };
 };
 
-cls.EvenetListeners = function(view)
+cls.EventListeners = function(view)
 {
   this._init(view);
 };
 
-cls.EvenetListeners.prototype = new function()
+cls.EventListeners.prototype = new function()
 {
 
   /* interface */
@@ -177,7 +171,7 @@ cls.EvenetListeners.prototype = new function()
     }
     else
       opera.postError(ui_strings.S_DRAGONFLY_INFO_MESSAGE +
-                      "failed to get the window object in cls.EvenetListeners.")
+                      "failed to get the window object in cls.EventListeners.")
   };
 
   this._get_event_types = function(ctx, rt_id)
@@ -210,7 +204,7 @@ cls.EvenetListeners.prototype = new function()
           {
             ctx.expanded_map[rt_id].push(type);
             var cb = this._handle_dom_search.bind(this, ev_type,
-                                                  ctx.handle_expand_listener);
+                                                  ctx.handle_expand_listener_bound);
             ev_type.search_listeners(rt_id, obj_id, type, cb);
           }
           return ev_type;
@@ -224,7 +218,7 @@ cls.EvenetListeners.prototype = new function()
     }
     else
       opera.postError(ui_strings.S_DRAGONFLY_INFO_MESSAGE +
-                      "failed to retrieve the event names in cls.EvenetListeners.")
+                      "failed to retrieve the event names in cls.EventListeners.")
   };
 
   this._handle_dom_search = function(ev_type, cb)
@@ -261,7 +255,7 @@ cls.EvenetListeners.prototype = new function()
     }
     else
       opera.postError(ui_strings.S_DRAGONFLY_INFO_MESSAGE +
-                      "requestGetEventListeners failed in cls.EvenetListeners.")
+                      "requestGetEventListeners failed in cls.EventListeners.")
   };
 
   this._get_ev_type = function(rt_id, type)
@@ -322,12 +316,12 @@ cls.EvenetListeners.prototype = new function()
     var ev_type = this._get_ev_type(rt_id, type);
     if (ev_type)
     {
-      var cb = this._handle_dom_search.bind(this, ev_type, cb);
-      ev_type.search_listeners(rt_id, obj_id, type, cb);
+      var inner_cb = this._handle_dom_search.bind(this, ev_type, cb);
+      ev_type.search_listeners(rt_id, obj_id, type, inner_cb);
     }
     else
       opera.postError(ui_strings.S_DRAGONFLY_INFO_MESSAGE +
-                      "failed to find event names object in cls.EvenetListeners.")
+                      "failed to find event names object in cls.EventListeners.")
 
   };
 

src/ecma-debugger/eventlisteners/evlistenersview.js

@@ -31,9 +31,9 @@ cls.EventListenersView = function(id, name, container_class)
         if (ls)
           ls.parentNode.removeChild(ls);
 
-        var input = li_ele.querySelector("input");
-        if (input)
-          input.style.removeProperty("background-position");
+        var h3 = li_ele.querySelector("h3");
+        if (h3)
+          h3.removeClass("unfolded");
 
         this._data.collapse_listeners(rt_id, ev_name);
       }
@@ -58,9 +58,9 @@ cls.EventListenersView = function(id, name, container_class)
   this._show_ev_listeners = function(li_ele, ev_name_obj)
   {
     var tmpl = window.templates.ev_all_listeners(ev_name_obj);
-    var input = li_ele.querySelector("input");
-    if (input)
-      input.style.backgroundPosition = "0px -11px";
+    var h3 = li_ele.querySelector("h3");
+    if (h3)
+      h3.addClass("unfolded");
 
     var div = li_ele.querySelector(".ev-listener-list");
     if (div)
@@ -72,7 +72,7 @@ cls.EventListenersView = function(id, name, container_class)
   this._init = function(id, name, container_class)
   {
     this.init(id, name, container_class);
-    this._data = new cls.EvenetListeners(this);
+    this._data = new cls.EventListeners(this);
     var evh = window.event_handlers;
     evh.click["toggle-ev-listeners"] = this._toggle_event_listeners.bind(this);
     evh.click["update-ev-listeners"] = this._update_ev_listeners.bind(this);

src/ecma-debugger/eventlisteners/evlistenertemplates.js

@@ -22,7 +22,7 @@
       ["div",
         ["span",
           ["span", ui_strings.S_LABEL_STORAGE_UPDATE],
-          "class" , "ui-button",
+          "class", "ui-button",
           "unselectable", "on",
           "tabindex", "1",
           "handler", "update-ev-listeners"]],
@@ -51,17 +51,16 @@
 
   this._ev_type = function(ev_type)
   {
-    var bg_pos = ev_type.is_expanded ? "0 -11px" : "0 0";
+    //var bg_pos = ev_type.is_expanded ? "0 -11px" : "0 0";
     return (
     ["li", 
       ["h3", 
         ["input", "type", "button",
-                  "class", "folder-key",
-                  "style", "background-position: " + bg_pos],
+                  "class", "folder-key"],
         ev_type.type,
         "handler", "toggle-ev-listeners",
         "data-ev-type", ev_type.type,
-        "class", "ev-type"],
+        "class", "ev-type" + (ev_type.is_expanded ? " unfolded" : "")],
       ev_type.is_expanded ? this.ev_all_listeners(ev_type) : []]);
   };
 

src/ecma-debugger/eventlisteners/evlistenertooltip.js

@@ -25,7 +25,7 @@ cls.EvListenerTooltip = function()
     var node_id = target.get_ancestor_attr("ref-id") ||
                   target.get_ancestor_attr("obj-id");
     var window_id = target.get_ancestor_attr("data-window-id");
-    if (model && rt_id && (node_id || window_id))
+    if (rt_id && (node_id || window_id))
     {
       var listeners = node_id
                     ? model.get_ev_listeners(node_id)