Issue 5764: Change JSTerm's $ helper function from getElementById to …

…querySelector
firebug · Aug 4, 2012 · 4bbd8f9 · 4bbd8f9 · SebastianZ · Aug 6, 2012
1 parent 893d740
commit 4bbd8f9
Showing 1 changed file with 24 additions and 4 deletions.
diff --git a/extension/content/firebug/console/commandLine.js b/extension/content/firebug/console/commandLine.js
@@ -1043,14 +1043,34 @@ Firebug.CommandLine.CommandHandler = Obj.extend(Object,
 
 function FirebugCommandLineAPI(context)
 {
-    this.$ = function(id)  // returns unwrapped elements from the page
+    this.$ = function(selector, start)  // returns unwrapped elements from the page
     {
-        return Wrapper.unwrapObject(context.baseWindow.document).getElementById(id);
+        var result;
+        if (start && start.querySelector && (start.nodeType == 1 || start.nodeType == 9 || start.nodeType == 11))
+            result = start.querySelector(selector);
+        else
+        {
+            result = Wrapper.unwrapObject(context.baseWindow.document).querySelector(selector);
+            if (result == null && (selector||"")[0] !== "#")
+            {
+                result = Wrapper.unwrapObject(context.baseWindow.document).querySelector("#" + selector);
+                if (result != null)
+                {
+                    Firebug.Console.log("The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $(\"#" + selector + "\")", context, "warn");
+                    result = null;
+                }
+            }
+        }
+        return result;
     };
 
-    this.$$ = function(selector) // returns unwrapped elements from the page
+    this.$$ = function(selector, start) // returns unwrapped elements from the page
     {
-        var result = Wrapper.unwrapObject(context.baseWindow.document).querySelectorAll(selector);
+        var result;
+        if (start && start.querySelectorAll && (start.nodeType == 1 || start.nodeType == 9 || start.nodeType == 11))
+            result = start.querySelectorAll(selector);
+        else
+            result = Wrapper.unwrapObject(context.baseWindow.document).querySelectorAll(selector);
         return Arr.cloneArray(result);
     };