summaryrefslogtreecommitdiffstats
path: root/browser/components
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-14 12:21:38 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-14 12:21:38 +0200
commitf4b8be889cb7ee31a62af5660f36aaa192599009 (patch)
treea97cc5c6ebb3a0a0302cbb2b08f3b426f77f37db /browser/components
parente9dd029f5d00590e1a53e63b0ab805110a10b54c (diff)
parent1dd67a7935457abcf03f1581f58d4d0de972e559 (diff)
downloadUXP-f4b8be889cb7ee31a62af5660f36aaa192599009.tar
UXP-f4b8be889cb7ee31a62af5660f36aaa192599009.tar.gz
UXP-f4b8be889cb7ee31a62af5660f36aaa192599009.tar.lz
UXP-f4b8be889cb7ee31a62af5660f36aaa192599009.tar.xz
UXP-f4b8be889cb7ee31a62af5660f36aaa192599009.zip
Merge branch 'master' into Basilisk-releasev2018.05.15
Diffstat (limited to 'browser/components')
-rw-r--r--browser/components/sessionstore/content/aboutSessionRestore.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/browser/components/sessionstore/content/aboutSessionRestore.js b/browser/components/sessionstore/content/aboutSessionRestore.js
index 8a9410aa8..8f265235d 100644
--- a/browser/components/sessionstore/content/aboutSessionRestore.js
+++ b/browser/components/sessionstore/content/aboutSessionRestore.js
@@ -188,6 +188,9 @@ function onListClick(aEvent) {
if (aEvent.button == 2)
return;
+ if (!treeView.treeBox) {
+ return;
+ }
var cell = treeView.treeBox.getCellAt(aEvent.clientX, aEvent.clientY);
if (cell.col) {
// Restore this specific tab in the same window for middle/double/accel clicking
@@ -286,7 +289,9 @@ var treeView = {
get rowCount() { return gTreeData.length; },
setTree: function(treeBox) { this.treeBox = treeBox; },
getCellText: function(idx, column) { return gTreeData[idx].label; },
- isContainer: function(idx) { return "open" in gTreeData[idx]; },
+ isContainer: function(idx) {
+ return gTreeData[idx] ? "open" in gTreeData[idx] : false;
+ },
getCellValue: function(idx, column){ return gTreeData[idx].checked; },
isContainerOpen: function(idx) { return gTreeData[idx].open; },
isContainerEmpty: function(idx) { return false; },