Skip to content

Commit 83d11a4

Browse files
committed
Don't use Application anymore. FUEL is removed (#512)
1 parent c202778 commit 83d11a4

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

common/content/base.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,9 @@ function Class() {
333333
}
334334

335335
extend(Constructor, superclass, args[0]);
336-
update(Constructor, args[1]);
336+
if (args[1]) {
337+
update(Constructor, args[1]);
338+
}
337339
args = args.slice(2);
338340
Array.forEach(args, function (obj) {
339341
if (callable(obj))

common/content/io.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
/** @scope modules */
99

10+
const VERSION = Services.appinfo.platformVersion;
11+
1012
plugins.contexts = {};
1113
const Script = Class("Script", {
1214
init: function (file) {
@@ -330,7 +332,7 @@ const IO = Module("io", {
330332
this._lastRunCommand = ""; // updated whenever the users runs a command with :!
331333
this._scriptNames = [];
332334

333-
if (services.get("vc").compare(Application.version, "26.0a1") < 0) {
335+
if (services.get("vc").compare(VERSION, "26.0a1") < 0) {
334336
this.downloadListener = {
335337
onDownloadStateChange: function (state, download) {
336338
if (download.state == services.get("downloads").DOWNLOAD_FINISHED) {
@@ -372,7 +374,7 @@ const IO = Module("io", {
372374
},
373375

374376
destroy: function () {
375-
if (services.get("vc").compare(Application.version, "26.0a1") < 0) {
377+
if (services.get("vc").compare(VERSION, "26.0a1") < 0) {
376378
services.get("downloads").removeListener(this.downloadListener);
377379
} else {
378380
let {Downloads} = Cu.import("resource://gre/modules/Downloads.jsm", {});

common/content/preferences.xul

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
let uri = Components.classes["@mozilla.org/network/io-service;1"]
66
.getService(Components.interfaces.nsIIOService)
77
.newURI("liberator://help/options", null, null);
8-
Application.activeWindow.open(uri).focus(); // TODO: generalise for Muttator et al.
8+
<!--Application.activeWindow.open(uri).focus(); // TODO: generalise for Muttator et al.-->
99
window.close();
1010
</script>
1111
</window>

common/content/util.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ const Util = Module("util", {
426426
null
427427
);
428428

429-
if (services.get("vc").compare(Application.version, "33") >= 0
429+
if (services.get("vc").compare(VERSION, "33") >= 0
430430
&& Cu.isXrayWrapper(result)) {
431431
let xr = result;
432432

0 commit comments

Comments
 (0)