Changeset 35632 in webkit

Timestamp:

Aug 7, 2008 8:55:53 PM (16 years ago)

Author:

timothy@apple.com

Message:

The search is only performed if the field contains more than 3
letters or if Enter is pressed.

Search is now performed through a keyup event.

Added a WebInspector.lastQuery to remember the last query and not
perform it again (eg. the user hits a modifier key).

​https://bugs.webkit.org/show_bug.cgi?id=18548

Reviewed by Timothy Hatcher.

• page/inspector/inspector.html: Removed the onsearch and incremental attributes
• page/inspector/inspector.js:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/inspector/inspector.html (modified) (1 diff)
• page/inspector/inspector.js (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-08-07  Anthony Ricaud  <rik24d@gmail.com>
+
+        The search is only performed if the field contains more than 3
+        letters or if Enter is pressed.
+
+        Search is now performed through a keyup event.
+
+        Added a WebInspector.lastQuery to remember the last query and not
+        perform it again (eg. the user hits a modifier key).
+
+        https://bugs.webkit.org/show_bug.cgi?id=18548
+
+        Reviewed by Timothy Hatcher.
+
+        * page/inspector/inspector.html: Removed the onsearch and incremental
+        attributes
+        * page/inspector/inspector.js:
+
 2008-08-07  Steve Falkenburg  <sfalken@apple.com>
 

trunk/WebCore/page/inspector/inspector.html

@@ -74 +74 @@
     <div id="toolbar">
         <div class="toolbar-item flexable-space"></div>
-        <div class="toolbar-item"><input id="search" type="search" results="20" incremental="incremental" onsearch="WebInspector.performSearch(this.value)"><div id="search-toolbar-label" class="toolbar-label"></div></div>
+        <div class="toolbar-item"><input id="search" type="search" results="20"><div id="search-toolbar-label" class="toolbar-label"></div></div>
     </div>
     <div id="main">

trunk/WebCore/page/inspector/inspector.js

@@ -341 +341 @@
 
     document.getElementById("search-toolbar-label").textContent = WebInspector.UIString("Search");
+    var searchField = document.getElementById("search");
+    searchField.addEventListener("keyup", this.performSearch.bind(this), false);
 
     if (platform === "mac-leopard")
@@ -975 +977 @@
 }
 
-WebInspector.performSearch = function(query)
-{
+WebInspector.performSearch = function(event)
+{
+    var query = event.target.value;
+
     if (!query || !query.length) {
         this.showingSearchResults = false;
         return;
     }
+
+    var forceSearch = event.keyIdentifier === "Enter";
+    if(!forceSearch && query.length < 3)
+        return;
+
+    if (!forceSearch && this.lastQuery && this.lastQuery === query)
+        return;
+    this.lastQuery = query;
 
     var resultsContainer = document.getElementById("searchResults");