Bug 344264: fix strict warning in button.xml, patch by Simon B�nzli <zeniko@gmail.com>, r=mconnor/neil

toolkit/content/widgets/button.xml

@@ -138,8 +138,10 @@
                       .direction == "ltr") ||
             (event.keyCode == KeyEvent.DOM_VK_RIGHT &&
               document.defaultView.getComputedStyle(this.parentNode, "")
-                      .direction == "rtl"))
-          return window.document.commandDispatcher.rewindFocus();
+                      .direction == "rtl")) {
+          window.document.commandDispatcher.rewindFocus();
+          return;
+        }
 
         if (event.keyCode == KeyEvent.DOM_VK_DOWN ||
             (event.keyCode == KeyEvent.DOM_VK_RIGHT &&
@@ -147,8 +149,10 @@
                       .direction == "ltr") ||
             (event.keyCode == KeyEvent.DOM_VK_LEFT &&
               document.defaultView.getComputedStyle(this.parentNode, "")
-                      .direction == "rtl"))
-          return window.document.commandDispatcher.advanceFocus();
+                      .direction == "rtl")) {
+          window.document.commandDispatcher.advanceFocus();
+          return;
+        }
 
         if (event.keyCode || event.charCode <= 32 || event.altKey || 
             event.ctrlKey || event.metaKey)

toolkit/content/widgets/tabbrowser.xml

@@ -1194,7 +1194,10 @@
               if (aAllowThirdPartyFixup) {
                 flags = nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
               }
-              b.loadURIWithFlags(aURI, flags, aReferrerURI, aCharset, aPostData);
+              // loadURIWithFlags throws for unknown schemes
+              try {
+                b.loadURIWithFlags(aURI, flags, aReferrerURI, aCharset, aPostData);
+              } catch (ex) {}
             }
 
             this.mTabContainer.adjustTabstrip(false);

xpfe/global/resources/content/bindings/button.xml

@@ -149,8 +149,10 @@
                       .direction == "ltr") ||
             (event.keyCode == KeyEvent.DOM_VK_RIGHT &&
               document.defaultView.getComputedStyle(this.parentNode, "")
-                      .direction == "rtl"))
-          return window.document.commandDispatcher.rewindFocus();
+                      .direction == "rtl")) {
+          window.document.commandDispatcher.rewindFocus();
+          return;
+        }
 
         if (event.keyCode == KeyEvent.DOM_VK_DOWN ||
             (event.keyCode == KeyEvent.DOM_VK_RIGHT &&
@@ -158,8 +160,10 @@
                       .direction == "ltr") ||
             (event.keyCode == KeyEvent.DOM_VK_LEFT &&
               document.defaultView.getComputedStyle(this.parentNode, "")
-                      .direction == "rtl"))
-          return window.document.commandDispatcher.advanceFocus();
+                      .direction == "rtl")) {
+          window.document.commandDispatcher.advanceFocus();
+          return;
+        }
 
         if (event.keyCode || event.charCode <= 32 || event.altKey || 
             event.ctrlKey || event.metaKey)