diff options
| author | gorhill <rhill@raymondhill.net> | 2015-03-27 13:00:55 -0400 |
|---|---|---|
| committer | gorhill <rhill@raymondhill.net> | 2015-03-27 13:00:55 -0400 |
| commit | f2ff0edfaf4fdc6e02a8a0e65db73a104c2b1f9c (patch) | |
| tree | b0a946702c48ec6e467355c04a35098dbe4b5efe /src/js/start.js | |
| parent | 5f8fd229205cb1bf8836e86667707e716b6d3c0a (diff) | |
| download | uBlock-f2ff0edfaf4fdc6e02a8a0e65db73a104c2b1f9c.zip uBlock-f2ff0edfaf4fdc6e02a8a0e65db73a104c2b1f9c.tar.gz uBlock-f2ff0edfaf4fdc6e02a8a0e65db73a104c2b1f9c.tar.bz2 | |
this fixes #1013, #1062 (draft)
Diffstat (limited to 'src/js/start.js')
| -rw-r--r-- | src/js/start.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/js/start.js b/src/js/start.js index 238ee4a..eda993f 100644 --- a/src/js/start.js +++ b/src/js/start.js @@ -135,8 +135,9 @@ var onUserSettingsReady = function(fetched) { µb.mirrors.toggle(false /* userSettings.experimentalEnabled */); µb.contextMenu.toggle(userSettings.contextMenuEnabled); - µb.permanentFirewall.fromString(userSettings.dynamicFilteringString); + µb.permanentFirewall.fromString(fetched.dynamicFilteringString); µb.sessionFirewall.assign(µb.permanentFirewall); + µb.hnSwitches.fromString(fetched.hostnameSwitchesString); // Remove obsolete setting delete userSettings.logRequests; @@ -214,6 +215,8 @@ return function() { var fetchableProps = { 'compiledMagic': '', + 'dynamicFilteringString': '', + 'hostnameSwitchesString': '', 'lastRestoreFile': '', 'lastRestoreTime': 0, 'lastBackupFile': '', |