Bug 666257 - Dismiss dialogs before panels with Escape key (r=mbrubeck)

There are cases where we show dialogs on top of panels (e.g. sync
connection dialog). We want Escape key to dismiss them before the
panels.

mobile/chrome/content/browser-ui.js

@@ -890,16 +890,16 @@ var BrowserUI = {
       return;
     }
 
-    // Check active panel
-    if (this.activePanel) {
-      this.activePanel = null;
+    // Check open dialogs
+    let dialog = this.activeDialog;
+    if (dialog && dialog != this.activePanel) {
+      dialog.close();
       return;
     }
 
-    // Check open dialogs
-    let dialog = this.activeDialog;
-    if (dialog) {
-      dialog.close();
+    // Check active panel
+    if (this.activePanel) {
+      this.activePanel = null;
       return;
     }