Skip to content

Commit

Permalink
Merge pull request #89 in EXTENSIONS/safari-app-extension from fix/82…
Browse files Browse the repository at this point in the history
… to master

* commit '55beee3bcdd7323310cd9c8607974a259ec98fff':
  Prevent file opening
  • Loading branch information
Tim Shenin committed Nov 29, 2018
2 parents b7cc635 + 55beee3 commit 9b3feb5
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions ElectronMainApp/src/main/ui/js/options.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* global CheckboxUtils, ace, i18n, EventNotifierTypes */

const {ipcRenderer} = require('electron');
const { ipcRenderer } = require('electron');
const moment = require('moment');

/**
Expand Down Expand Up @@ -1366,6 +1366,7 @@ PageController.prototype = {

init: function () {

this._preventDragAndDrop();
this._customizeText();
this._render();

Expand Down Expand Up @@ -1444,18 +1445,30 @@ PageController.prototype = {
this.settings.render();

// Initialize whitelist filter
this.whiteListFilter = new WhiteListFilter({defaultWhiteListMode: defaultWhitelistMode});
this.whiteListFilter = new WhiteListFilter({ defaultWhiteListMode: defaultWhitelistMode });
this.whiteListFilter.updateWhiteListDomains();

// Initialize User filter
this.userFilter = new UserFilter();
this.userFilter.updateUserFilterRules();

// Initialize AntiBanner filters
this.antiBannerFilters = new AntiBannerFilters({rulesInfo: contentBlockerInfo});
this.antiBannerFilters = new AntiBannerFilters({ rulesInfo: contentBlockerInfo });
this.antiBannerFilters.render();

document.querySelector('#about-version-placeholder').textContent = i18n.__("options_about_version.message", environmentOptions.appVersion);
},

_preventDragAndDrop: function () {
document.addEventListener('dragover', function (event) {
event.preventDefault();
return false;
}, false);

document.addEventListener('drop', function (event) {
event.preventDefault();
return false;
}, false);
}
};

Expand Down

0 comments on commit 9b3feb5

Please sign in to comment.