Merge branch 'master' into task_DFL_3295_Network_Details_overhaul_rev…

…iewed
operasoftware · Sep 11, 2012 · 26a01a3 · 26a01a3
2 parents 64a5c40 + df70524
commit 26a01a3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -52,6 +52,7 @@ Sangwhan Moon
 Sergii Prosianyk
 Sripathi Pai
 T G V R S Santhosh
+Thaddee Tyl
 Tomica Korać
 Tony Nedyalkov
 Torstein Larsson

diff --git a/src/ecma-debugger/objectinspection.6.0/templates.js b/src/ecma-debugger/objectinspection.6.0/templates.js
@@ -383,7 +383,7 @@
                   "data-id='" + model.id + "' " +
                   (has_match ? "" : " class='no-match'") + ">" +
             "<input type='button' " +
-              "class='" + (model.scope_list_models ? "unfolded" : "") + "' >" +
+              "class='" + (model.scope_list_models ? "unfolded" : "") + "'/>" +
             name +
           "</header>"
       );

diff --git a/src/repl/commandtransformer.js b/src/repl/commandtransformer.js
@@ -254,7 +254,7 @@ cls.HostCommandTransformer = function() {
   {
     if (this.is_global_call(tokenlist, index))
       token[VALUE] = "(typeof $ == 'function' && $ || \
-                       function(e) { return document.getElementById(e); })";
+                       function(e) { return document.querySelector(e); })";
   };
 
   this._hostcommands.$$ = function(token, tokenlist, index)

diff --git a/tests/commandtransformer.qunit.html b/tests/commandtransformer.qunit.html
@@ -76,11 +76,11 @@
 
 test("$", function() {
     equal(transform("$"), "$");
-    equal(transform("$(foo)"), "document.getElementById(foo)");
-    equal(transform("var x=$(foo)"), "var x=document.getElementById(foo)");
-    equal(transform("var x= $(foo)"), "var x= document.getElementById(foo)");
-    equal(transform("var x =$(foo)"), "var x =document.getElementById(foo)");
-    equal(transform("var x = $(foo)"), "var x = document.getElementById(foo)");
+    equal(transform("$(foo)"), "document.querySelector(foo)");
+    equal(transform("var x=$(foo)"), "var x=document.querySelector(foo)");
+    equal(transform("var x= $(foo)"), "var x= document.querySelector(foo)");
+    equal(transform("var x =$(foo)"), "var x =document.querySelector(foo)");
+    equal(transform("var x = $(foo)"), "var x = document.querySelector(foo)");
 
 });