DevTools: add a navigator menu with grouping options.

third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 17 matching lines @@
 
 /**
  * @constructor
  * @extends {WebInspector.VBox}
  * @implements {WebInspector.TargetManager.Observer}
  */
 WebInspector.NavigatorView = function()
 {
     WebInspector.VBox.call(this);
 
-    var scriptsOutlineElement = this.element.createChild("div", "navigator");
     this._scriptsTree = new TreeOutlineInShadow();
     this._scriptsTree.registerRequiredCSS("sources/navigatorView.css");
     this._scriptsTree.setComparator(WebInspector.NavigatorView._treeElementsCompare);
     this.element.appendChild(this._scriptsTree.element);
     this.setDefaultFocusedElement(this._scriptsTree.element);
 
     /** @type {!Map.<!WebInspector.UISourceCode, !WebInspector.NavigatorUISourceCodeTreeNode>} */
     this._uiSourceCodeNodes = new Map();
     /** @type {!Map.<string, !WebInspector.NavigatorFolderTreeNode>} */
     this._subfolderNodes = new Map();
 
     this._rootNode = new WebInspector.NavigatorRootTreeNode(this);
     this._rootNode.populate();
 
     /** @type {!Map.<!WebInspector.ResourceTreeFrame, !WebInspector.NavigatorGroupTreeNode>} */
     this._frameNodes = new Map();
 
     this.element.addEventListener("contextmenu", this.handleContextMenu.bind(this), false);
 
-    this._navigatorGroupingSetting = WebInspector.moduleSetting("navigatorGrouping");
-    this._navigatorGroupingSetting.addChangeListener(this._groupingChanged.bind(this));
+    this._navigatorGroupingByFrameSetting = WebInspector.moduleSetting("navigatorGroupByFrame");
+    this._navigatorGroupingByFrameSetting.addChangeListener(this._groupingChanged.bind(this));
+    this._navigatorGroupingByDomainSetting = WebInspector.moduleSetting("navigatorGroupByDomain");
+    this._navigatorGroupingByDomainSetting.addChangeListener(this._groupingChanged.bind(this));
+    this._navigatorGroupingByFolderSetting = WebInspector.moduleSetting("navigatorGroupByFolder");
+    this._navigatorGroupingByFolderSetting.addChangeListener(this._groupingChanged.bind(this));
+
     this._initGrouping();
     WebInspector.targetManager.addModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.FrameNavigated, this._frameNavigated, this);
     WebInspector.targetManager.addModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.FrameDetached, this._frameDetached, this);
     WebInspector.targetManager.observeTargets(this);
 }
 
 WebInspector.NavigatorView.Events = {
     ItemSelected: "ItemSelected",
     ItemRenamed: "ItemRenamed",
 }
@@ skipping 59 matching lines @@
     function addFolder()
     {
         WebInspector.isolatedFileSystemManager.addFileSystem("");
     }
 
     var addFolderLabel = WebInspector.UIString.capitalize("Add ^folder to ^workspace");
     contextMenu.appendItem(addFolderLabel, addFolder);
 }
 
 WebInspector.NavigatorView.prototype = {
+    /**
+     * @param {!WebInspector.Workspace} workspace
+     */
     setWorkspace: function(workspace)
     {
         this._workspace = workspace;
         this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAdded, this);
         this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeRemoved, this._uiSourceCodeRemoved, this);
         this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectRemoved, this._projectRemoved.bind(this), this);
     },
 
     wasShown: function()
     {
@@ skipping 40 matching lines @@
             path = WebInspector.ParsedURL.splitURLIntoPathComponents(uiSourceCode.path()).slice(1, -1);
 
         var project = uiSourceCode.project();
         var target = WebInspector.NetworkProject.targetForUISourceCode(uiSourceCode);
         var frame = this._uiSourceCodeFrame(uiSourceCode);
 
         var folderNode = this._folderNode(uiSourceCode, project, target, frame, uiSourceCode.host(), path, isFromSourceMap);
         var uiSourceCodeNode = new WebInspector.NavigatorUISourceCodeTreeNode(this, uiSourceCode);
         this._uiSourceCodeNodes.set(uiSourceCode, uiSourceCodeNode);
         folderNode.appendChild(uiSourceCodeNode);
+        this.uiSourceCodeAdded(uiSourceCode);
     },
 
     /**
+     * @param {!WebInspector.UISourceCode} uiSourceCode
+     */
+    uiSourceCodeAdded: function(uiSourceCode)
+    {
+    },
+
+    /**
      * @param {!WebInspector.Event} event
      */
     _uiSourceCodeAdded: function(event)
     {
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
         this._addUISourceCode(uiSourceCode);
     },
 
     /**
      * @param {!WebInspector.Event} event
@@ skipping 440 matching lines @@
 
     _groupingChanged: function()
     {
         this.reset();
         this._initGrouping();
         this._workspace.uiSourceCodes().forEach(this._addUISourceCode.bind(this));
     },
 
     _initGrouping: function()
     {
-        var value = this._navigatorGroupingSetting.get();
-        this._groupByFrame = value.includes("frame");
-        this._groupByDomain = value.includes("domain");
-        this._groupByFolder = value.includes("folder");
+        this._groupByFrame = this._navigatorGroupingByFrameSetting.get();
+        this._groupByDomain = this._navigatorGroupingByDomainSetting.get();
+        this._groupByFolder = this._groupByDomain && this._navigatorGroupingByFolderSetting.get();
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _frameNavigated: function(event)
     {
         var frame = /** @type {!WebInspector.ResourceTreeFrame} */ (event.data);
         var node = this._frameNodes.get(frame);
         if (!node)
@@ skipping 45 matching lines @@
     {
         var targetNode = this._rootNode.child("target:" + target.id());
         if (targetNode)
             this._rootNode.removeChild(targetNode);
     },
 
     __proto__: WebInspector.VBox.prototype
 }
 
 /**
- * @constructor
- * @extends {WebInspector.NavigatorView}
- */
-WebInspector.SourcesNavigatorView = function()
-{
-    WebInspector.NavigatorView.call(this);
-    WebInspector.targetManager.addEventListener(WebInspector.TargetManager.Events.InspectedURLChanged, this._inspectedURLChanged, this);
-}
-
-WebInspector.SourcesNavigatorView.prototype = {
-    /**
-     * @override
-     * @param {!WebInspector.UISourceCode} uiSourceCode
-     * @return {boolean}
-     */
-    accept: function(uiSourceCode)
-    {
-        if (!WebInspector.NavigatorView.prototype.accept(uiSourceCode))
-            return false;
-        return uiSourceCode.project().type() !== WebInspector.projectTypes.ContentScripts && uiSourceCode.project().type() !== WebInspector.projectTypes.Snippets;
-
-    },
-
-    /**
-     * @param {!WebInspector.Event} event
-     */
-    _inspectedURLChanged: function(event)
-    {
-       var nodes = this._uiSourceCodeNodes.valuesArray();
-       for (var i = 0; i < nodes.length; ++i) {
-           var uiSourceCode = nodes[i].uiSourceCode();
-           var inspectedPageURL = WebInspector.targetManager.inspectedPageURL();
-           if (inspectedPageURL && WebInspector.networkMapping.networkURL(uiSourceCode) === inspectedPageURL)
-              this.revealUISourceCode(uiSourceCode, true);
-       }
-    },
-
-    /**
-     * @override
-     * @param {!WebInspector.UISourceCode} uiSourceCode
-     */
-    _addUISourceCode: function(uiSourceCode)
-    {
-        WebInspector.NavigatorView.prototype._addUISourceCode.call(this, uiSourceCode);
-        var inspectedPageURL = WebInspector.targetManager.inspectedPageURL();
-        if (inspectedPageURL && WebInspector.networkMapping.networkURL(uiSourceCode) === inspectedPageURL)
-            this.revealUISourceCode(uiSourceCode, true);
-    },
-
-    __proto__: WebInspector.NavigatorView.prototype
-}
-
-/**
- * @constructor
- * @extends {WebInspector.NavigatorView}
- */
-WebInspector.ContentScriptsNavigatorView = function()
-{
-    WebInspector.NavigatorView.call(this);
-}
-
-WebInspector.ContentScriptsNavigatorView.prototype = {
-    /**
-     * @override
-     * @param {!WebInspector.UISourceCode} uiSourceCode
-     * @return {boolean}
-     */
-    accept: function(uiSourceCode)
-    {
-        if (!WebInspector.NavigatorView.prototype.accept(uiSourceCode))
-            return false;
-        return uiSourceCode.project().type() === WebInspector.projectTypes.ContentScripts;
-    },
-
-    __proto__: WebInspector.NavigatorView.prototype
-}
-
-/**
  * @param {!TreeElement} treeElement1
  * @param {!TreeElement} treeElement2
  * @return {number}
  */
 WebInspector.NavigatorView._treeElementsCompare = function compare(treeElement1, treeElement2)
 {
     var typeWeight1 = WebInspector.NavigatorView._treeElementOrder(treeElement1);
     var typeWeight2 = WebInspector.NavigatorView._treeElementOrder(treeElement2);
 
     var result;
@@ skipping 728 matching lines @@
     {
         if (this._treeElement)
             return this._treeElement;
         this._treeElement = new WebInspector.NavigatorFolderTreeElement(this._navigatorView, this._type, this._title);
         this._treeElement.setNode(this);
         return this._treeElement;
     },
 
     __proto__: WebInspector.NavigatorTreeNode.prototype
 }