CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-06-26 18:10:39 +12:00
Code Issues Releases Wiki Activity

fix #852

Browse source
This commit is contained in:
gorhill 2017-11-29 14:40:18 -05:00
parent 65d62ec379
commit 28d2f0b66e
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/js/background.js
View file

@ -117,6 +117,8 @@ return {
externalHostsFiles: '', externalHostsFiles: '',
iconBadgeEnabled: false, iconBadgeEnabled: false,
maxLoggedRequests: 1000, maxLoggedRequests: 1000,
popupCollapseAllDomains: false,
popupCollapseBlacklistedDomains: false,
popupScopeLevel: 'domain', popupScopeLevel: 'domain',
processHyperlinkAuditing: true, processHyperlinkAuditing: true,
processReferer: false, processReferer: false,

2
src/js/messaging.js
View file

@ -146,6 +146,8 @@ var matrixSnapshot = function(pageStore, details) {
var r = { var r = {
appVersion: vAPI.app.version, appVersion: vAPI.app.version,
blockedCount: pageStore.requestStats.blocked.all, blockedCount: pageStore.requestStats.blocked.all,
collapseAllDomains: µmuser.popupCollapseAllDomains,
collapseBlacklistedDomains: µmuser.popupCollapseBlacklistedDomains,
diff: [], diff: [],
domain: pageStore.pageDomain, domain: pageStore.pageDomain,
headerIndices: Array.from(headerIndices), headerIndices: Array.from(headerIndices),

12
src/js/popup.js
View file

@ -373,7 +373,7 @@ function getCollapseState(domain) {
if ( typeof states === 'object' && states[domain] !== undefined ) { if ( typeof states === 'object' && states[domain] !== undefined ) {
return states[domain]; return states[domain];
} }
return getUISetting('popupCollapseDomains') === true; return matrixSnapshot.collapseAllDomains === true;
} }
function toggleCollapseState(elem) { function toggleCollapseState(elem) {
@ -388,7 +388,7 @@ function toggleMainCollapseState(uelem) {
var matHead = uelem.ancestors('#matHead.collapsible').toggleClass('collapsed'); var matHead = uelem.ancestors('#matHead.collapsible').toggleClass('collapsed');
var collapsed = matHead.hasClass('collapsed'); var collapsed = matHead.hasClass('collapsed');
uDom('#matList .matSection.collapsible').toggleClass('collapsed', collapsed); uDom('#matList .matSection.collapsible').toggleClass('collapsed', collapsed);
setUISetting('popupCollapseDomains', collapsed); setUserSetting('popupCollapseAllDomains', collapsed);
var specificCollapseStates = getUISetting('popupCollapseSpecificDomains') || {}; var specificCollapseStates = getUISetting('popupCollapseSpecificDomains') || {};
var domains = Object.keys(specificCollapseStates); var domains = Object.keys(specificCollapseStates);
@ -409,7 +409,7 @@ function toggleSpecificCollapseState(uelem) {
var section = uelem.ancestors('.matSection.collapsible').toggleClass('collapsed'), var section = uelem.ancestors('.matSection.collapsible').toggleClass('collapsed'),
domain = expandosFromNode(section).domain, domain = expandosFromNode(section).domain,
collapsed = section.hasClass('collapsed'), collapsed = section.hasClass('collapsed'),
mainCollapseState = getUISetting('popupCollapseDomains') === true, mainCollapseState = matrixSnapshot.collapseAllDomains === true,
specificCollapseStates = getUISetting('popupCollapseSpecificDomains') || {}; specificCollapseStates = getUISetting('popupCollapseSpecificDomains') || {};
if ( collapsed !== mainCollapseState ) { if ( collapsed !== mainCollapseState ) {
specificCollapseStates[domain] = collapsed; specificCollapseStates[domain] = collapsed;
@ -605,7 +605,7 @@ var createMatrixRow = function() {
function renderMatrixHeaderRow() { function renderMatrixHeaderRow() {
var matHead = uDom('#matHead.collapsible'); var matHead = uDom('#matHead.collapsible');
matHead.toggleClass('collapsed', getUISetting('popupCollapseDomains') === true); matHead.toggleClass('collapsed', matrixSnapshot.collapseAllDomains === true);
var cells = matHead.descendants('.matCell'), cell, expandos; var cells = matHead.descendants('.matCell'), cell, expandos;
cell = cells.nodeAt(0); cell = cells.nodeAt(0);
expandos = expandosFromNode(cell); expandos = expandosFromNode(cell);
@ -1033,7 +1033,7 @@ function makeMatrixGroup4(group) {
var groupDiv = createMatrixGroup().addClass('g4'); var groupDiv = createMatrixGroup().addClass('g4');
createMatrixSection() createMatrixSection()
.addClass('g4Meta') .addClass('g4Meta')
.toggleClass('g4Collapsed', !!getUISetting('popupHideBlacklisted')) .toggleClass('g4Collapsed', !!matrixSnapshot.collapseBlacklistedDomains)
.appendTo(groupDiv); .appendTo(groupDiv);
makeMatrixMetaRow(computeMatrixGroupMetaStats(group), 'g4') makeMatrixMetaRow(computeMatrixGroupMetaStats(group), 'g4')
.appendTo(groupDiv); .appendTo(groupDiv);
@ -1518,7 +1518,7 @@ uDom('#matList').on('click', '.g4Meta', function() {
var collapsed = uDom(this) var collapsed = uDom(this)
.toggleClass('g4Collapsed') .toggleClass('g4Collapsed')
.hasClass('g4Collapsed'); .hasClass('g4Collapsed');
setUISetting('popupHideBlacklisted', collapsed); setUserSetting('popupCollapseBlacklistedDomains', collapsed);
}); });
/******************************************************************************/ /******************************************************************************/