Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Safari: just extra precaution

This commit is contained in:
Chris 2015-02-09 22:24:50 -07:00
parent ac6211f1af
commit 6e7f26f925
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/safari/vapi-background.js
View File

@ -71,6 +71,7 @@
if(keys === null) { if(keys === null) {
for(i in this._storage) { for(i in this._storage) {
if(!this._storage.hasOwnProperty(i)) continue;
value = this._storage[i]; value = this._storage[i];
if(typeof value === 'string') { if(typeof value === 'string') {
@ -93,6 +94,7 @@
} }
} else if(typeof keys === 'object') { } else if(typeof keys === 'object') {
for(i in keys) { for(i in keys) {
if(!keys.hasOwnProperty(i)) continue;
value = this._storage[i]; value = this._storage[i];
if(typeof value === 'string') { if(typeof value === 'string') {
@ -197,7 +199,6 @@
} }
} }
}, true); }, true);
// onClosed handled in the main tab-close event // onClosed handled in the main tab-close event
// onUpdated handled via monitoring the history.pushState on web-pages // onUpdated handled via monitoring the history.pushState on web-pages
// onPopup is handled in window.open on web-pages // onPopup is handled in window.open on web-pages
@ -298,7 +299,7 @@
details.index = curWin.tabs.indexOf(curWin.activeTab) + 1; details.index = curWin.tabs.indexOf(curWin.activeTab) + 1;
} }
tab = details.tabId && this.stack[details.tabId] || curWin.openTab(details.active ? 'foreground' : 'background'); tab = (details.tabId ? this.stack[details.tabId] : curWin.openTab(details.active ? 'foreground' : 'background'));
if(details.index !== undefined) { if(details.index !== undefined) {
curWin.insertTab(tab, details.index); curWin.insertTab(tab, details.index);