Merge remote-tracking branch 'efforg/master'

MB · MB · commit 4bfd2b615f53 · 2015-01-06T19:14:10.000Z
diff --git a/src/chrome/content/code/IOUtil.js b/src/chrome/content/code/IOUtil.js
@@ -121,7 +121,7 @@ const IOUtil = {
   },
   
   abort: function(channel, noNetwork) {
-    channel.cancel(Cr.NS_ERROR_ABORT);
+    channel.cancel(Components.results.NS_ERROR_ABORT);
   },
   
   findWindow: function(channel) {
diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js
@@ -341,7 +341,7 @@ function toggle_rule(rule_id) {
 }
 
 function reload_window() {
-  var browser = httpsEverywhere.toolbarbutton.selectedBrowser();
+  var browser = httpsEverywhere.toolbarButton.selectedBrowser();
   if (browser) {
     browser.reload();
   }

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ function toggle_rule(rule_id) {`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`function reload_window() {`
`344`		`- var browser = httpsEverywhere.toolbarbutton.selectedBrowser();`
	`344`	`+ var browser = httpsEverywhere.toolbarButton.selectedBrowser();`
`345`	`345`	`if (browser) {`
`346`	`346`	`browser.reload();`
`347`	`347`	`}`