Some review fixes. Use the URI class for handling URI shortening.

Author: hzr

src/ecma-debugger/templates.js

@@ -380,7 +380,10 @@
     case TYPE_NAN:
     case TYPE_PLUS_INFINITY:
     case TYPE_MINUS_INFINITY:
-      value = names[retval.value.type];
+    case TYPE_NUMBER:
+      value = (retval.value.type == TYPE_NUMBER)
+            ? String(retval.value.number)
+            : names[retval.value.type];
       if (value.toLowerCase().contains(search_term))
       {
         value_template.push(
@@ -394,21 +397,6 @@
       }
       break;
 
-    case TYPE_NUMBER:
-      value = String(retval.value.number);
-      if (value.toLowerCase().contains(search_term))
-      {
-        value_template.push(
-          ["item",
-            ["value",
-              value,
-             "class", type
-            ]
-          ]
-        );
-      }
-      break;
-
     case TYPE_STRING:
       value = retval.value.str;
       if (value.toLowerCase().contains(search_term))
@@ -475,9 +463,9 @@
       return [];
 
     var from_uri = window.helpers.get_script_name(retval.positionFrom.scriptID);
-    from_uri = from_uri ? window.helpers.basename(from_uri) : ui_strings.S_UNKNOWN_SCRIPT;
+    from_uri = from_uri ? new URI(from_uri).basename : ui_strings.S_UNKNOWN_SCRIPT;
     var to_uri = window.helpers.get_script_name(retval.positionTo.scriptID);
-    to_uri = to_uri ? window.helpers.basename(to_uri) : ui_strings.S_UNKNOWN_SCRIPT;
+    to_uri = to_uri ? new URI(to_uri).basename : ui_strings.S_UNKNOWN_SCRIPT;
 
     return [
       ["li",

src/ecma-debugger/view_return_values.js

@@ -44,9 +44,17 @@ cls.ReturnValuesView = function(id, name, container_class)
 
   this._create_view = function(return_values)
   {
+    this._text_search.setContainer(this._container);
+    this._text_search.setFormInput(window.views[this.id].getToolbarControl(this._container,
+                                                                           "return-values-text-search"));
     this._container.clearAndRender(templates.return_values(return_values, this._search_term));
   };
 
+  this.ondestroy = function()
+  {
+    this._text_search.cleanup();
+  };
+
   this._remove_bound_view = function()
   {
     this._create_view_bound = null;
@@ -71,22 +79,6 @@ cls.ReturnValuesView = function(id, name, container_class)
     }
   };
 
-  this._on_view_created = function(msg)
-  {
-    if (msg.id == "return-values")
-    {
-      this._text_search.setContainer(msg.container);
-      this._text_search.setFormInput(window.views[this.id].getToolbarControl(msg.container,
-                                                                             "return-values-text-search"));
-    }
-  };
-
-  this._on_view_destroyed = function(msg)
-  {
-    if (msg.id == "return-values")
-      this._text_search.cleanup();
-  };
-
   this._init = function(id, name, container_class)
   {
     View.prototype.init.call(this, id, name, container_class);
@@ -97,8 +89,6 @@ cls.ReturnValuesView = function(id, name, container_class)
     this._text_search = new TextSearch(1);
     this._text_search.add_listener("onbeforesearch", this._onbeforesearch.bind(this));
 
-    window.messages.addListener("view-created", this._on_view_created.bind(this));
-    window.messages.addListener("view-destroyed", this._on_view_destroyed.bind(this));
     window.messages.addListener("thread-continue-event", this._remove_bound_view.bind(this));
 
     window.event_handlers.input["return-values-text-search"] = function(event, target)