Bug 314335: make use of the defaultbutton and buttonlabel attributes of dialogs, where appropriate, r=mano

toolkit/mozapps/update/content/history.js

@@ -71,11 +71,7 @@ var gUpdateHistory = {
         element.status = update.statusText;
       }
     }
-          
-    var closebuttonlabel = document.documentElement.getAttribute("closebuttonlabel");
     var cancelbutton = document.documentElement.getButton("cancel");
-    cancelbutton.label = closebuttonlabel;
-    cancelbutton.setAttribute("default", "true");
     cancelbutton.focus();
   },
   

toolkit/mozapps/update/content/history.xul

@@ -51,7 +51,9 @@
 <dialog id="history" windowtype="Update:History"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         style="width: 35em;"
-        buttons="cancel" closebuttonlabel="&closebutton.label;"
+        buttons="cancel"
+        defaultButton="cancel"
+        buttonlabelcancel="&closebutton.label;"
         title="&history.title;"
         onload="gUpdateHistory.onLoad();">
 

toolkit/mozapps/update/content/incompatible.js

@@ -46,11 +46,6 @@ function init() {
     listitem.setAttribute("label", itemName);
     incompatibleItems.appendChild(listitem);
   }
-  
-  var closebuttonlabel = document.documentElement.getAttribute("closebuttonlabel");
   var cancelbutton = document.documentElement.getButton("cancel");
-  cancelbutton.label = closebuttonlabel;
   cancelbutton.focus();
-  cancelbutton.setAttribute("default", "true");
 }
-

toolkit/mozapps/update/content/incompatible.xul

@@ -51,7 +51,9 @@
 <dialog id="incompatible"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         style="width: 35em;"
-        buttons="cancel" closebuttonlabel="&closebutton.label;"
+        buttons="cancel"
+        defaultButton="cancel"
+        buttonlabelcancel="&closebutton.label;"
         title="&incompatible.title;"
         onload="init();">