Bug 550186 - HTML 5 'placeholder' attribute should be used instead of 'emptyText'. r+sr=Neil.

suite/common/bookmarks/bm-panel.xul

@@ -98,7 +98,7 @@
 
   <hbox id="search-bar" class="toolbar" align="center">
     <textbox id="search-box" flex="1" type="search" clickSelectsAll="true"
-             emptytext="&search.emptytext;"
+             placeholder="&search.placeholder;"
              oncommand="document.getElementById('bookmarks-view').searchBookmarks(this.value)"/>
   </hbox>
   

suite/common/bookmarks/bookmarksManager.xul

@@ -256,7 +256,7 @@
       <toolbarspring/>
       <toolbaritem id="bookmarks-search-box" align="center">
         <textbox id="search-box" type="search" clickSelectsAll="true"
-                 emptytext="&search.emptytext;"
+                 placeholder="&search.placeholder;"
                  oncommand="document.getElementById('bookmarks-view').searchBookmarks(this.value)"/>
       </toolbaritem>
     </toolbar>

suite/common/downloads/downloadmanager.xul

@@ -377,7 +377,7 @@
                clickSelectsAll="true"
                type="search"
                class="compact"
-               emptytext="&search.emptytext;"
+               placeholder="&search.placeholder;"
                oncommand="searchDownloads(this.value);"/>
       <spacer flex="1"/>
       <button id="clearListButton" command="cmd_clearList"

suite/common/history/history-panel.xul

@@ -70,7 +70,7 @@
 
   <hbox align="center">
     <textbox id="search-box" flex="1" type="search"
-             emptytext="&search.emptytext;" clickSelectsAll="true"
+             placeholder="&search.placeholder;" clickSelectsAll="true"
              oncommand="searchHistory(this.value);"/>
     <toolbarbutton id="viewButton" type="menu" class="tabbable"
                    label="&view.label;">

suite/common/history/history.xul

@@ -141,7 +141,7 @@
     <textbox id="search-box"
              clickSelectsAll="true"
              type="search"
-             emptytext="&search.emptytext;"
+             placeholder="&search.placeholder;"
              oncommand="searchHistory(this.value);"/>
   </toolbar>
   </toolbox>

suite/common/passwordManager.xul

@@ -88,7 +88,7 @@
         <!-- filter -->
         <hbox align="center">
           <textbox id="filter" flex="1" type="search"
-                   emptytext="&search.emptytext;"
+                   placeholder="&search.placeholder;"
                    oncommand="_filterPasswords();"/>
         </hbox>
         <separator class="thin"/>

suite/common/permissions/cookieViewer.xul

@@ -84,7 +84,7 @@
             <textbox id="filter"
                      flex="1"
                      type="search"
-                     emptytext="&search.emptytext;"
+                     placeholder="&search.placeholder;"
                      oncommand="filter(this.value);"/>
           </hbox>
           <separator class="thin"/>

suite/common/pref/pref-applications.xul

@@ -106,7 +106,7 @@
       <textbox id="filter"
                flex="1"
                type="search"
-               emptytext="&search.emptytext;"
+               placeholder="&search.placeholder;"
                clickSelectsAll="true"
                aria-controls="handlersView"
                oncommand="gApplicationsPane._rebuildView();"/>

suite/locales/en-US/chrome/common/bookmarks/bookmarks.dtd

@@ -116,5 +116,5 @@
 
 <!ENTITY bookmarksWindowTitle.label     "Bookmark Manager">
 
-<!ENTITY search.emptytext               "Search Bookmarks">
+<!ENTITY search.placeholder             "Search Bookmarks">
 <!ENTITY search.key                     "f">

suite/locales/en-US/chrome/common/downloads/downloadmanager.dtd

@@ -3,7 +3,7 @@
 <!ENTITY menuBar.tooltip                 "Menu Bar">
 <!ENTITY searchBar.tooltip               "Search Bar">
 
-<!ENTITY search.emptytext                "Search Downloads">
+<!ENTITY search.placeholder              "Search Downloads">
 <!ENTITY search.label                    "Search Downloads">
 <!ENTITY search.accesskey                "S">
 <!ENTITY search.key                      "f">

suite/locales/en-US/chrome/common/history/history.dtd

@@ -4,7 +4,7 @@
 <!ENTITY menuBar.tooltip                "Menu Bar">
 <!ENTITY searchBar.tooltip              "Search Bar">
 
-<!ENTITY search.emptytext               "Search History">
+<!ENTITY search.placeholder             "Search History">
 <!ENTITY search.key                     "f">
 <!ENTITY view.label                     "View">
 

suite/locales/en-US/chrome/common/passwordManager.dtd

@@ -38,4 +38,4 @@
 <!ENTITY      windowtitle.label               "Password Manager">
 <!ENTITY      tab.signonsstored.label         "Passwords Saved">
 <!ENTITY      tab.signonsnotstored.label      "Passwords Never Saved">
-<!ENTITY      search.emptytext                "Search">
+<!ENTITY      search.placeholder              "Search">

suite/locales/en-US/chrome/common/permissions/cookieViewer.dtd

@@ -11,7 +11,7 @@
 <!ENTITY     button.removeallcookies.label  "Remove All Cookies">
 <!ENTITY     button.removeallcookies.accesskey "e">
 
-<!ENTITY     search.emptytext               "Search Cookies">
+<!ENTITY     search.placeholder             "Search Cookies">
 <!ENTITY     focusSearch.key                "f">
 <!ENTITY     windowClose.key                "w">
 <!ENTITY     selectAll.key                  "a">

suite/locales/en-US/chrome/common/pref/pref-applications.dtd

@@ -7,4 +7,4 @@
 <!ENTITY actionColumn2.label     "Action">
 <!ENTITY actionColumn2.accesskey "A">
 
-<!ENTITY search.emptytext        "Search Types and Actions">
+<!ENTITY search.placeholder      "Search Types and Actions">

suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd

@@ -116,7 +116,7 @@
 <!ENTITY deleteItemButton.accesskey                     "D">
 <!ENTITY newimButton.label                              "Instant Message">  
 <!ENTITY newimButton.accesskey                          "I">  
-<!ENTITY searchNameAndEmail.emptytext                   "Search Name and Email">
+<!ENTITY searchNameAndEmail.placeholder                 "Search Name and Email">
 
 <!-- Tooltips -->
 <!ENTITY addressbookToolbar.tooltip                     "Address Book Toolbar">

suite/locales/en-US/chrome/mailnews/messenger.dtd

@@ -589,7 +589,7 @@
 
 <!-- focusSearchInput.key also used by addressbook -->
 <!ENTITY focusSearchInput.key "k">
-<!ENTITY searchSubjectOrAddress.emptytext "Search Subject or Address">
+<!ENTITY searchSubjectOrAddress.placeholder "Search Subject or Address">
 <!ENTITY advancedButton.label "Advanced…">
 <!ENTITY advancedButton.accesskey "A">
 

suite/mailnews/addrbook/addressbook.xul

@@ -412,7 +412,7 @@
       <toolbaritem id="searchBox" align="center">
         <textbox id="searchInput"
                  type="search"
-                 emptytext="&searchNameAndEmail.emptytext;"
+                 placeholder="&searchNameAndEmail.placeholder;"
                  clickSelectsAll="true"
                  oncommand="onEnterInSearchBar();"
                  onkeypress="if (event.keyCode == KeyEvent.DOM_VK_RETURN) this.select();"/>

suite/mailnews/mailWindowOverlay.xul

@@ -2308,7 +2308,7 @@
     <textbox id="searchInput"
              flex="1"
              type="search"
-             emptytext="&searchSubjectOrAddress.emptytext;"
+             placeholder="&searchSubjectOrAddress.placeholder;"
              clickSelectsAll="true"
              onkeypress="if (event.keyCode == KeyEvent.DOM_VK_RETURN) this.select();"
              oncommand="onEnterInSearchBar();"/>