From de2965fbbf01e0c534cf9a4148f6a93460f1b0ee Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Fri, 29 Aug 2014 15:49:11 -0700
Subject: [PATCH] Bug 1060041 - Don't expand folders in projecteditor tree by
 default;r=jryans

---
 browser/devtools/projecteditor/lib/stores/resource.js      | 7 +++++++
 browser/devtools/projecteditor/lib/tree.js                 | 3 +++
 .../test/browser_projecteditor_tree_selection_01.js        | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/browser/devtools/projecteditor/lib/stores/resource.js b/browser/devtools/projecteditor/lib/stores/resource.js
index 1c16e0e7aed7..0211281e50fd 100644
--- a/browser/devtools/projecteditor/lib/stores/resource.js
+++ b/browser/devtools/projecteditor/lib/stores/resource.js
@@ -57,6 +57,13 @@ var Resource = Class({
    */
   get hasChildren() { return this.children && this.children.size > 0; },
 
+  /**
+   * Is this Resource the root (top level for the store)?
+   */
+  get isRoot() {
+    return !this.parent
+  },
+
   /**
    * Sorted array of children for display
    */
diff --git a/browser/devtools/projecteditor/lib/tree.js b/browser/devtools/projecteditor/lib/tree.js
index c02b1e3705b0..642fe162ce17 100644
--- a/browser/devtools/projecteditor/lib/tree.js
+++ b/browser/devtools/projecteditor/lib/tree.js
@@ -84,6 +84,9 @@ var ResourceContainer = Class({
       evt.stopPropagation();
     }, true);
 
+    if (!this.resource.isRoot) {
+      this.expanded = false;
+    }
     this.update();
   },
 
diff --git a/browser/devtools/projecteditor/test/browser_projecteditor_tree_selection_01.js b/browser/devtools/projecteditor/test/browser_projecteditor_tree_selection_01.js
index 656e06947308..d2458a3a4682 100644
--- a/browser/devtools/projecteditor/test/browser_projecteditor_tree_selection_01.js
+++ b/browser/devtools/projecteditor/test/browser_projecteditor_tree_selection_01.js
@@ -35,8 +35,14 @@ let test = asyncTest(function*() {
 function selectFileFirstLoad(projecteditor, resource) {
   ok (resource && resource.path, "A valid resource has been passed in for selection " + (resource && resource.path));
   projecteditor.projectTree.selectResource(resource);
+  let container = projecteditor.projectTree.getViewContainer(resource);
 
+  if (resource.isRoot) {
+    ok (container.expanded, "The root directory is expanded by default.");
+    return;
+  }
   if (resource.isDir) {
+    ok (!container.expanded, "A directory is not expanded by default.");
     return;
   }