Skip to content

Commit a5a0b5a

Browse files
committed
Merge branch 'release-1.0.beta10.2' into dev-1.0-releases
Conflicts: ChangeLog.md src/install.rdf
2 parents 0eb896e + 8f77110 commit a5a0b5a

File tree

114 files changed

+3422
-2366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+3422
-2366
lines changed

ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
Note: ChangeLogs for the source code and unit tests, both not relevant for
44
users, you can find in the dedicated subdirectories.
55

6+
#### Version 1.0.beta10.2 (bugfix)
7+
* The add-on did not start on the latest Firefox Nightly,
8+
version 44.0a1 (#719).
9+
610
#### Version 1.0.beta10.1-signed
711
* The add-on is now signed by Mozilla. (#701) There's no change in
812
functionality, and no bugs have been fixed.

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
-e git+https://github.com/mozilla/firefox-ui-tests.git#egg=firefox-ui-tests
2-
mozrunner >= 6.2
2+
mozrunner >= 6.9

src/content/lib/policy-manager.alias-functions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424

25-
let PolicyManager = (function(self) {
25+
PolicyManager = (function(self) {
2626

2727
self.addAllowRule = self.addRule.bind(this, C.RULE_ACTION_ALLOW);
2828
self.addTemporaryAllowRule = self.addTemporaryRule.bind(this,

src/content/lib/policy-manager.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function notifyRulesChanged() {
7979
* Provides a simplified interface to handling multiple
8080
* rulesets, checking requests against multiple rulesets, etc.
8181
*/
82-
let PolicyManager = (function(self) {
82+
var PolicyManager = (function(self) {
8383

8484

8585
let userRulesets = {};

src/content/lib/request-processor.compat.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ScriptLoader.importModules([
3232

3333

3434

35-
let RequestProcessor = (function(self) {
35+
RequestProcessor = (function(self) {
3636
let internal = Utils.moduleInternal(self);
3737

3838

src/content/lib/request-processor.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ScriptLoader.defineLazyModuleGetters({
5656

5757

5858

59-
let RequestProcessor = (function(self) {
59+
var RequestProcessor = (function(self) {
6060
let internal = Utils.moduleInternal(self);
6161

6262

src/content/lib/request-processor.redirects.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ScriptLoader.importModules([
4141

4242

4343

44-
let RequestProcessor = (function(self) {
44+
RequestProcessor = (function(self) {
4545
let internal = Utils.moduleInternal(self);
4646

4747

@@ -138,6 +138,7 @@ let RequestProcessor = (function(self) {
138138
return result;
139139
}
140140

141+
// fixme: "//example.com/path" is also a valid relative URL
141142
if (destURI[0] && destURI[0] == '/'
142143
|| destURI.indexOf(":") == -1) {
143144
// Redirect is to a relative url.
@@ -424,6 +425,8 @@ let RequestProcessor = (function(self) {
424425
let originString = httpResponse.originURI.specIgnoringRef;
425426

426427
// Allow redirects of requests from privileged code.
428+
// Fixme: should the check instead be ' === false' in case the
429+
// return value is `null`? See also #18.
427430
if (!isContentRequest(httpResponse)) {
428431
// However, favicon requests that are redirected appear as non-content
429432
// requests. So, check if the original request was for a favicon.

src/content/main/window-manager-toolbarbutton.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if (Info.isAustralis) {
3737

3838

3939

40-
let rpWindowManager = (function(self) {
40+
rpWindowManager = (function(self) {
4141

4242
let isAustralis = Info.isAustralis;
4343

src/content/main/window-manager.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ let EXPORTED_SYMBOLS = ["rpWindowManager"];
2626
let globalScope = this;
2727

2828

29-
let rpWindowManager = (function(self) {
29+
var rpWindowManager = (function(self) {
3030

3131
const Ci = Components.interfaces;
3232
const Cc = Components.classes;

src/content/main/window-manager.listener.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* ***** END LICENSE BLOCK *****
2222
*/
2323

24-
let WindowListener = (function() {
24+
WindowListener = (function() {
2525
let self = {};
2626

2727
let nextWinID = 0;

0 commit comments

Comments
 (0)