not collapsible when no subdomain

gorhill · gorhill · commit 21e67050bb58 · 2013-11-22T18:22:16.000-05:00
diff --git a/js/popup.js b/js/popup.js
@@ -537,11 +537,11 @@ function updateMatrixCells() {
 function updateMatrixBehavior() {
     var sections = $('.matSection', HTTPSBPopup.matrixList);
     var i = sections.length;
-    var section, collapsible;
+    var section, subdomainRows;
     while ( i-- ) {
         section = $(sections[i]);
-        collapsible = !$('.l2 .gdt,.l2 .rdt', section).length;
-        section.toggleClass('collapsible', collapsible);
+        subdomainRows = section.children('.l2');
+        section.toggleClass('collapsible', subdomainRows.length > 0 && subdomainRows.children('.gdt,.rdt').length === 0);
     }
 }
 
@@ -725,7 +725,7 @@ function renderMatrixMetaCellType(cell, count) {
     }
 }
 
-function makeMatrixMetaRow(stats, groupClass) {
+function makeMatrixMetaRow(stats) {
     var typeStats = stats.types;
     var matrixRow = HTTPSBPopup.matrixRowTemplate.clone().addClass('ro');
     var cells = $('div', matrixRow);

Original file line number	Diff line number	Diff line change
`@@ -537,11 +537,11 @@ function updateMatrixCells() {`
`537`	`537`	`function updateMatrixBehavior() {`
`538`	`538`	`var sections = $('.matSection', HTTPSBPopup.matrixList);`
`539`	`539`	`var i = sections.length;`
`540`		`- var section, collapsible;`
	`540`	`+ var section, subdomainRows;`
`541`	`541`	`while ( i-- ) {`
`542`	`542`	`section = $(sections[i]);`
`543`		`- collapsible = !$('.l2 .gdt,.l2 .rdt', section).length;`
`544`		`- section.toggleClass('collapsible', collapsible);`
	`543`	`+ subdomainRows = section.children('.l2');`
	`544`	`+ section.toggleClass('collapsible', subdomainRows.length > 0 && subdomainRows.children('.gdt,.rdt').length === 0);`
`545`	`545`	`}`
`546`	`546`	`}`
`547`	`547`
`@@ -725,7 +725,7 @@ function renderMatrixMetaCellType(cell, count) {`
`725`	`725`	`}`
`726`	`726`	`}`
`727`	`727`
`728`		`-function makeMatrixMetaRow(stats, groupClass) {`
	`728`	`+function makeMatrixMetaRow(stats) {`
`729`	`729`	`var typeStats = stats.types;`
`730`	`730`	`var matrixRow = HTTPSBPopup.matrixRowTemplate.clone().addClass('ro');`
`731`	`731`	`var cells = $('div', matrixRow);`