| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * This file is part of the URL Fixer, | 2 * This file is part of the URL Fixer, |
| 3 * Copyright (C) 2006-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 Eyeo GmbH |
| 4 * | 4 * |
| 5 * URL Fixer is free software: you can redistribute it and/or modify | 5 * URL Fixer is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * URL Fixer is distributed in the hope that it will be useful, | 9 * URL Fixer is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
| 15 * along with URL Fixer. If not, see <http://www.gnu.org/licenses/>. | 15 * along with URL Fixer. If not, see <http://www.gnu.org/licenses/>. |
| 16 */ | 16 */ |
| 17 | 17 |
| 18 Cu.import("resource://gre/modules/Services.jsm"); | 18 Cu.import("resource://gre/modules/Services.jsm"); |
| 19 Cu.import("resource://gre/modules/FileUtils.jsm"); | 19 Cu.import("resource://gre/modules/FileUtils.jsm"); |
| 20 Cu.import("resource://gre/modules/XPCOMUtils.jsm"); | 20 Cu.import("resource://gre/modules/XPCOMUtils.jsm"); |
| 21 | 21 |
| 22 // Import prefs from old branch if there are any | 22 // Import prefs from old branch if there are any |
| 23 let {Prefs} = require("prefs"); | 23 let {Prefs} = require("prefs"); |
| 24 Prefs.migrate("extensions.typed-it-collection.domainOptInAsk", "domainOptInAsk") ; | 24 Prefs.migrate("extensions.typed-it-collection.domainOptInAsk", "domainOptInAsk") ; |
| 25 Prefs.migrate("extensions.typed-it-collection.domainOptIn", "domainOptIn"); | 25 Prefs.migrate("extensions.typed-it-collection.domainOptIn", "domainOptIn"); |
|
Thomas Greiner
2016/12/07 15:43:35
Looks like we no longer need to migrate the above
Wladimir Palant
2016/12/08 12:48:14
Done.
| |
| 26 Prefs.migrate("extensions.typed-it-collection.counter", "counter"); | 26 Prefs.migrate("extensions.typed-it-collection.counter", "counter"); |
| 27 | 27 |
| 28 require("typoFixer"); | 28 require("typoFixer"); |
| 29 require("typoCollector"); | |
| 30 | 29 |
| 31 // Execute first-run actions once the session is restored | 30 // Execute first-run actions once the session is restored |
| 32 { | 31 { |
| 33 let observer = | 32 let observer = |
| 34 { | 33 { |
| 35 observe: function(subject, topic, data) | 34 observe: function(subject, topic, data) |
| 36 { | 35 { |
| 37 removeHandler(); | 36 removeHandler(); |
| 38 onShutdown.remove(removeHandler); | 37 onShutdown.remove(removeHandler); |
| 39 onBrowserInitialized(); | 38 onBrowserInitialized(); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 79 if (oldVersion) | 78 if (oldVersion) |
| 80 url += "&update=1"; | 79 url += "&update=1"; |
| 81 if ("Browser" in window && typeof window.Browser.addTab != 'undefined') | 80 if ("Browser" in window && typeof window.Browser.addTab != 'undefined') |
| 82 { | 81 { |
| 83 // window.Browser.addTab(url, true); | 82 // window.Browser.addTab(url, true); |
| 84 // No firstrun on Fennec. | 83 // No firstrun on Fennec. |
| 85 } | 84 } |
| 86 else if ("gBrowser" in window) | 85 else if ("gBrowser" in window) |
| 87 window.gBrowser.loadOneTab(url, {inBackground: false}); | 86 window.gBrowser.loadOneTab(url, {inBackground: false}); |
| 88 } | 87 } |
| 89 | |
| 90 require("typoCollector").onBrowserInitialized(window); | |
| 91 } | 88 } |
| OLD | NEW |