Changeset 206106 in webkit

Timestamp:

Sep 19, 2016 12:08:45 PM (8 years ago)

Author:

Matt Baker

Message:

Unreviewed, reverting changeset ​https://trac.webkit.org/changeset/206101.

Revert ​https://bugs.webkit.org/show_bug.cgi?id=162165:
Web Inspector: Make it easier to create a view from an existing DOM element.

• UserInterface/Base/Main.js:

(WebInspector.contentLoaded):

• UserInterface/Views/View.js:

(WebInspector.View):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (2 diffs)
• UserInterface/Base/Main.js (modified) (4 diffs)
• UserInterface/Views/View.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-09-19  Matt Baker  <mattbaker@apple.com>
+
+        Unreviewed, reverting changeset https://trac.webkit.org/changeset/206101.
+
+        Revert https://bugs.webkit.org/show_bug.cgi?id=162165:
+        Web Inspector: Make it easier to create a view from an existing DOM element.
+
+        * UserInterface/Base/Main.js:
+        (WebInspector.contentLoaded):
+        * UserInterface/Views/View.js:
+        (WebInspector.View):
+
 2016-09-19  Joseph Pecoraro  <pecoraro@apple.com>
 
@@ -11 +23 @@
         Default the functionName to the empty string. This will compare
         favorably against other empty function names instead of null.
-
-2016-09-19  Matt Baker  <mattbaker@apple.com>
-
-        Web Inspector: Make it easier to create a view from an existing DOM element
-        https://bugs.webkit.org/show_bug.cgi?id=162165
-        <rdar://problem/28365848>
-
-        Reviewed by Timothy Hatcher.
-
-        * UserInterface/Base/Main.js:
-        (WebInspector.contentLoaded):
-        Pass id string for views created from existing DOM elements.
-
-        * UserInterface/Views/View.js:
-        (WebInspector.View):
-        Change `element` to `elementOrIdentifier`. If the value is a string,
-        treat it as an element identifier. If the identifier is invalid, create
-        a default element.
 
 2016-09-19  Joseph Pecoraro  <pecoraro@apple.com>

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -228 +228 @@
 
     // Create the user interface elements.
-    this.toolbar = new WebInspector.Toolbar("toolbar", null, true);
+    this.toolbar = new WebInspector.Toolbar(document.getElementById("toolbar"), null, true);
     this.toolbar.displayMode = WebInspector.Toolbar.DisplayMode.IconOnly;
     this.toolbar.sizeMode = WebInspector.Toolbar.SizeMode.Small;
 
-    this.tabBar = new WebInspector.TabBar("tab-bar");
+    this.tabBar = new WebInspector.TabBar(document.getElementById("tab-bar"));
     this.tabBar.addEventListener(WebInspector.TabBar.Event.NewTabItemClicked, this._newTabItemClicked, this);
     this.tabBar.addEventListener(WebInspector.TabBar.Event.OpenDefaultTab, this._openDefaultTab, this);
@@ -240 +240 @@
     this._contentElement.setAttribute("aria-label", WebInspector.UIString("Content"));
 
-    this.splitContentBrowser = new WebInspector.ContentBrowser("split-content-browser", this, true, true);
+    this.splitContentBrowser = new WebInspector.ContentBrowser(document.getElementById("split-content-browser"), this, true, true);
     this.splitContentBrowser.navigationBar.element.addEventListener("mousedown", this._consoleResizerMouseDown.bind(this));
 
-    this.quickConsole = new WebInspector.QuickConsole("quick-console");
+    this.quickConsole = new WebInspector.QuickConsole(document.getElementById("quick-console"));
     this.quickConsole.addEventListener(WebInspector.QuickConsole.Event.DidResize, this._quickConsoleDidResize, this);
 
@@ -253 +253 @@
 
     // FIXME: The sidebars should be flipped in RTL languages.
-    this.navigationSidebar = new WebInspector.Sidebar("navigation-sidebar", WebInspector.Sidebar.Sides.Left);
+    this.navigationSidebar = new WebInspector.Sidebar(document.getElementById("navigation-sidebar"), WebInspector.Sidebar.Sides.Left);
     this.navigationSidebar.addEventListener(WebInspector.Sidebar.Event.WidthDidChange, this._sidebarWidthDidChange, this);
 
-    this.detailsSidebar = new WebInspector.Sidebar("details-sidebar", WebInspector.Sidebar.Sides.Right, null, null, WebInspector.UIString("Details"), true);
+    this.detailsSidebar = new WebInspector.Sidebar(document.getElementById("details-sidebar"), WebInspector.Sidebar.Sides.Right, null, null, WebInspector.UIString("Details"), true);
     this.detailsSidebar.addEventListener(WebInspector.Sidebar.Event.WidthDidChange, this._sidebarWidthDidChange, this);
 
@@ -277 +277 @@
     this._openNewTabKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Option, "T", this.showNewTabTab.bind(this));
 
-    this.tabBrowser = new WebInspector.TabBrowser("tab-browser", this.tabBar, this.navigationSidebar, this.detailsSidebar);
+    this.tabBrowser = new WebInspector.TabBrowser(document.getElementById("tab-browser"), this.tabBar, this.navigationSidebar, this.detailsSidebar);
     this.tabBrowser.addEventListener(WebInspector.TabBrowser.Event.SelectedTabContentViewDidChange, this._tabBrowserSelectedTabContentViewDidChange, this);
 

trunk/Source/WebInspectorUI/UserInterface/Views/View.js

@@ -26 +26 @@
 WebInspector.View = class View extends WebInspector.Object
 {
-    constructor(elementOrIdentifier)
+    constructor(element)
     {
         super();
 
-        if (elementOrIdentifier instanceof HTMLElement)
-            this._element = elementOrIdentifier;
-        else if (typeof elementOrIdentifier === "string") {
-            this._element = document.getElementById(elementOrIdentifier);
-            console.assert(this._element, "Couldn't create view for unknown element " + elementOrIdentifier);
-        }
-
-        this._element = this._element || document.createElement("div");
+        this._element = element || document.createElement("div");
         this._element.__view = this;
         this._parentView = null;