<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193064] branches/safari-601-branch/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193064">193064</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:42:19 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187968">r187968</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceBaseTestjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Test.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsConsolePromptjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsolePrompt.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsContentBrowserjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsContentViewContainerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDOMTreeDataGridNodejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeDataGridNode.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsIndeterminateProgressSpinnerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/IndeterminateProgressSpinner.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsNavigationBarjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NavigationBar.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsProbeSetDataGridNodejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGridNode.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsQuickConsoleNavigationBarjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/QuickConsoleNavigationBar.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsToolbarjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Toolbar.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193063 => 193064)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:42:09 UTC (rev 193063)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:42:19 UTC (rev 193064)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187968. rdar://problem/23221163
+
+ 2015-08-05 Brian Burg <bburg@apple.com>
+
+ Web Inspector: Convert miscellaneous view widgets to use ES6 classes
+ https://bugs.webkit.org/show_bug.cgi?id=147658
+
+ Reviewed by Joseph Pecoraro.
+
+ Along the way, inline a few style class names.
+
+ Elided mechanical changes from the Changelog.
+
+ * UserInterface/Base/Test.js:
+ * UserInterface/Views/CSSStyleDeclarationSection.js:
+ * UserInterface/Views/ConsolePrompt.js:
+ * UserInterface/Views/ContentBrowser.js:
+ * UserInterface/Views/ContentViewContainer.js:
+ * UserInterface/Views/DOMTreeDataGridNode.js:
+ * UserInterface/Views/IndeterminateProgressSpinner.js:
+ * UserInterface/Views/NavigationBar.js:
+ * UserInterface/Views/ProbeSetDataGridNode.js:
+ * UserInterface/Views/QuickConsoleNavigationBar.js:
+ * UserInterface/Views/Toolbar.js:
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r187967. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-05 Brian Burg <bburg@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceBaseTestjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Test.js (193063 => 193064)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Test.js 2015-12-03 18:42:09 UTC (rev 193063)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Test.js 2015-12-03 18:42:19 UTC (rev 193064)
</span><span class="lines">@@ -104,26 +104,18 @@
</span><span class="cx">
</span><span class="cx"> // This is a workaround for the fact that it would be hard to set up a constructor,
</span><span class="cx"> // prototype, and prototype chain for the singleton InspectorTest.
</span><del>-InspectorTest.EventDispatcher = function()
</del><ins>+InspectorTest.EventDispatcher = class EventDispatcher extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- // FIXME: Convert this to a WebInspector.Object subclass, and call super().
- // WebInspector.Object.call(this);
</del><ins>+ dispatchEvent(event)
+ {
+ this.dispatchEventToListeners(event);
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> InspectorTest.EventDispatcher.Event = {
</span><span class="cx"> TestPageDidLoad: "inspector-test-test-page-did-load"
</span><span class="cx"> };
</span><span class="cx">
</span><del>-InspectorTest.EventDispatcher.prototype = {
- __proto__: WebInspector.Object.prototype,
- constructor: InspectorTest.EventDispatcher,
-
- dispatchEvent: function(event)
- {
- this.dispatchEventToListeners(event);
- }
-};
-
</del><span class="cx"> InspectorTest.eventDispatcher = new InspectorTest.EventDispatcher;
</span><span class="cx">
</span><span class="cx"> // Note: Additional InspectorTest methods are included on a per-test basis from
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js (193063 => 193064)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-12-03 18:42:09 UTC (rev 193063)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-12-03 18:42:19 UTC (rev 193064)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,143 +23,129 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.CSSStyleDeclarationSection = function(delegate, style)
</del><ins>+WebInspector.CSSStyleDeclarationSection = class CSSStyleDeclarationSection extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- // FIXME: Convert this to a WebInspector.Object subclass, and call super().
- // WebInspector.Object.call(this);
</del><ins>+ constructor(delegate, style)
+ {
+ console.assert(style instanceof WebInspector.CSSStyleDeclaration, style);
</ins><span class="cx">
</span><del>- this._delegate = delegate || null;
</del><ins>+ super();
</ins><span class="cx">
</span><del>- console.assert(style);
- this._style = style || null;
- this._selectorElements = [];
- this._ruleDisabled = false;
</del><ins>+ this._delegate = delegate || null;
</ins><span class="cx">
</span><del>- this._element = document.createElement("div");
- this._element.className = "style-declaration-section";
</del><ins>+ this._style = style || null;
+ this._selectorElements = [];
+ this._ruleDisabled = false;
</ins><span class="cx">
</span><del>- this._headerElement = document.createElement("div");
- this._headerElement.className = "header";
</del><ins>+ this._element = document.createElement("div");
+ this._element.classList.add("style-declaration-section");
</ins><span class="cx">
</span><del>- this._iconElement = document.createElement("img");
- this._iconElement.className = "icon";
- this._headerElement.appendChild(this._iconElement);
</del><ins>+ this._headerElement = document.createElement("div");
+ this._headerElement.classList.add("header");
</ins><span class="cx">
</span><del>- this._selectorElement = document.createElement("span");
- this._selectorElement.className = "selector";
- this._selectorElement.setAttribute("spellcheck", "false");
- this._selectorElement.addEventListener("mouseover", this._handleMouseOver.bind(this));
- this._selectorElement.addEventListener("mouseout", this._handleMouseOut.bind(this));
- this._selectorElement.addEventListener("keydown", this._handleKeyDown.bind(this));
- this._selectorElement.addEventListener("keyup", this._handleKeyUp.bind(this));
- this._selectorElement.addEventListener("paste", this._handleSelectorPaste.bind(this));
- this._headerElement.appendChild(this._selectorElement);
</del><ins>+ this._iconElement = document.createElement("img");
+ this._iconElement.classList.add("icon");
+ this._headerElement.appendChild(this._iconElement);
</ins><span class="cx">
</span><del>- this._originElement = document.createElement("span");
- this._originElement.className = "origin";
- this._headerElement.appendChild(this._originElement);
</del><ins>+ this._selectorElement = document.createElement("span");
+ this._selectorElement.classList.add("selector");
+ this._selectorElement.setAttribute("spellcheck", "false");
+ this._selectorElement.addEventListener("mouseover", this._handleMouseOver.bind(this));
+ this._selectorElement.addEventListener("mouseout", this._handleMouseOut.bind(this));
+ this._selectorElement.addEventListener("keydown", this._handleKeyDown.bind(this));
+ this._selectorElement.addEventListener("keyup", this._handleKeyUp.bind(this));
+ this._selectorElement.addEventListener("paste", this._handleSelectorPaste.bind(this));
+ this._headerElement.appendChild(this._selectorElement);
</ins><span class="cx">
</span><del>- this._propertiesElement = document.createElement("div");
- this._propertiesElement.className = "properties";
</del><ins>+ this._originElement = document.createElement("span");
+ this._originElement.classList.add("origin");
+ this._headerElement.appendChild(this._originElement);
</ins><span class="cx">
</span><del>- this._editorActive = false;
- this._propertiesTextEditor = new WebInspector.CSSStyleDeclarationTextEditor(this, style);
- this._propertiesTextEditor.addEventListener(WebInspector.CSSStyleDeclarationTextEditor.Event.ContentChanged, this._editorContentChanged.bind(this));
- this._propertiesTextEditor.addEventListener(WebInspector.CSSStyleDeclarationTextEditor.Event.Blurred, this._editorBlurred.bind(this));
- this._propertiesElement.appendChild(this._propertiesTextEditor.element);
</del><ins>+ this._propertiesElement = document.createElement("div");
+ this._propertiesElement.classList.add("properties");
</ins><span class="cx">
</span><del>- this._element.appendChild(this._headerElement);
- this._element.appendChild(this._propertiesElement);
</del><ins>+ this._editorActive = false;
+ this._propertiesTextEditor = new WebInspector.CSSStyleDeclarationTextEditor(this, style);
+ this._propertiesTextEditor.addEventListener(WebInspector.CSSStyleDeclarationTextEditor.Event.ContentChanged, this._editorContentChanged.bind(this));
+ this._propertiesTextEditor.addEventListener(WebInspector.CSSStyleDeclarationTextEditor.Event.Blurred, this._editorBlurred.bind(this));
+ this._propertiesElement.appendChild(this._propertiesTextEditor.element);
</ins><span class="cx">
</span><del>- var iconClassName;
- switch (style.type) {
- case WebInspector.CSSStyleDeclaration.Type.Rule:
- console.assert(style.ownerRule);
</del><ins>+ this._element.appendChild(this._headerElement);
+ this._element.appendChild(this._propertiesElement);
</ins><span class="cx">
</span><del>- if (style.inherited)
- iconClassName = WebInspector.CSSStyleDeclarationSection.InheritedStyleRuleIconStyleClassName;
- else if (style.ownerRule.type === WebInspector.CSSRule.Type.Author)
- iconClassName = WebInspector.CSSStyleDeclarationSection.AuthorStyleRuleIconStyleClassName;
- else if (style.ownerRule.type === WebInspector.CSSRule.Type.User)
- iconClassName = WebInspector.CSSStyleDeclarationSection.UserStyleRuleIconStyleClassName;
- else if (style.ownerRule.type === WebInspector.CSSRule.Type.UserAgent)
- iconClassName = WebInspector.CSSStyleDeclarationSection.UserAgentStyleRuleIconStyleClassName;
- else if (style.ownerRule.type === WebInspector.CSSRule.Type.Inspector)
- iconClassName = WebInspector.CSSStyleDeclarationSection.InspectorStyleRuleIconStyleClassName;
- break;
</del><ins>+ var iconClassName;
+ switch (style.type) {
+ case WebInspector.CSSStyleDeclaration.Type.Rule:
+ console.assert(style.ownerRule);
</ins><span class="cx">
</span><del>- case WebInspector.CSSStyleDeclaration.Type.Inline:
- case WebInspector.CSSStyleDeclaration.Type.Attribute:
- if (style.inherited)
- iconClassName = WebInspector.CSSStyleDeclarationSection.InheritedElementStyleRuleIconStyleClassName;
- else
- iconClassName = WebInspector.DOMTreeElementPathComponent.DOMElementIconStyleClassName;
- break;
- }
</del><ins>+ if (style.inherited)
+ iconClassName = WebInspector.CSSStyleDeclarationSection.InheritedStyleRuleIconStyleClassName;
+ else if (style.ownerRule.type === WebInspector.CSSRule.Type.Author)
+ iconClassName = WebInspector.CSSStyleDeclarationSection.AuthorStyleRuleIconStyleClassName;
+ else if (style.ownerRule.type === WebInspector.CSSRule.Type.User)
+ iconClassName = WebInspector.CSSStyleDeclarationSection.UserStyleRuleIconStyleClassName;
+ else if (style.ownerRule.type === WebInspector.CSSRule.Type.UserAgent)
+ iconClassName = WebInspector.CSSStyleDeclarationSection.UserAgentStyleRuleIconStyleClassName;
+ else if (style.ownerRule.type === WebInspector.CSSRule.Type.Inspector)
+ iconClassName = WebInspector.CSSStyleDeclarationSection.InspectorStyleRuleIconStyleClassName;
+ break;
</ins><span class="cx">
</span><del>- // Matches all situations except for User Agent styles.
- if (!(style.ownerRule && style.ownerRule.type === WebInspector.CSSRule.Type.UserAgent)) {
- this._iconElement.classList.add("toggle-able");
- this._iconElement.title = WebInspector.UIString("Comment All Properties");
- this._iconElement.addEventListener("click", this._toggleRuleOnOff.bind(this));
- }
</del><ins>+ case WebInspector.CSSStyleDeclaration.Type.Inline:
+ case WebInspector.CSSStyleDeclaration.Type.Attribute:
+ if (style.inherited)
+ iconClassName = WebInspector.CSSStyleDeclarationSection.InheritedElementStyleRuleIconStyleClassName;
+ else
+ iconClassName = WebInspector.DOMTreeElementPathComponent.DOMElementIconStyleClassName;
+ break;
+ }
</ins><span class="cx">
</span><del>- console.assert(iconClassName);
- this._element.classList.add(iconClassName);
</del><ins>+ // Matches all situations except for User Agent styles.
+ if (!(style.ownerRule && style.ownerRule.type === WebInspector.CSSRule.Type.UserAgent)) {
+ this._iconElement.classList.add("toggle-able");
+ this._iconElement.title = WebInspector.UIString("Comment All Properties");
+ this._iconElement.addEventListener("click", this._toggleRuleOnOff.bind(this));
+ }
</ins><span class="cx">
</span><del>- if (!style.editable)
- this._element.classList.add(WebInspector.CSSStyleDeclarationSection.LockedStyleClassName);
- else if (style.ownerRule) {
- this._style.ownerRule.addEventListener(WebInspector.CSSRule.Event.SelectorChanged, this._markSelector.bind(this));
- this._commitSelectorKeyboardShortcut = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.Enter, this._commitSelector.bind(this), this._selectorElement);
- this._selectorElement.addEventListener("blur", this._commitSelector.bind(this));
- } else
- this._element.classList.add(WebInspector.CSSStyleDeclarationSection.SelectorLockedStyleClassName);
</del><ins>+ console.assert(iconClassName);
+ this._element.classList.add(iconClassName);
</ins><span class="cx">
</span><del>- if (!WebInspector.CSSStyleDeclarationSection._generatedLockImages) {
- WebInspector.CSSStyleDeclarationSection._generatedLockImages = true;
</del><ins>+ if (!style.editable)
+ this._element.classList.add(WebInspector.CSSStyleDeclarationSection.LockedStyleClassName);
+ else if (style.ownerRule) {
+ this._style.ownerRule.addEventListener(WebInspector.CSSRule.Event.SelectorChanged, this._markSelector.bind(this));
+ this._commitSelectorKeyboardShortcut = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.Enter, this._commitSelector.bind(this), this._selectorElement);
+ this._selectorElement.addEventListener("blur", this._commitSelector.bind(this));
+ } else
+ this._element.classList.add(WebInspector.CSSStyleDeclarationSection.SelectorLockedStyleClassName);
</ins><span class="cx">
</span><del>- var specifications = {"style-lock-normal": {fillColor: [0, 0, 0, 0.5]}};
- generateColoredImagesForCSS("Images/Locked.svg", specifications, 8, 10);
- }
</del><ins>+ if (!WebInspector.CSSStyleDeclarationSection._generatedLockImages) {
+ WebInspector.CSSStyleDeclarationSection._generatedLockImages = true;
</ins><span class="cx">
</span><del>- this.refresh();
</del><ins>+ var specifications = {"style-lock-normal": {fillColor: [0, 0, 0, 0.5]}};
+ generateColoredImagesForCSS("Images/Locked.svg", specifications, 8, 10);
+ }
</ins><span class="cx">
</span><del>- this._headerElement.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this));
-};
</del><ins>+ this.refresh();
</ins><span class="cx">
</span><del>-WebInspector.CSSStyleDeclarationSection.LockedStyleClassName = "locked";
-WebInspector.CSSStyleDeclarationSection.SelectorLockedStyleClassName = "selector-locked";
-WebInspector.CSSStyleDeclarationSection.SelectorInvalidClassName = "invalid-selector";
-WebInspector.CSSStyleDeclarationSection.LastInGroupStyleClassName = "last-in-group";
-WebInspector.CSSStyleDeclarationSection.MatchedSelectorElementStyleClassName = "matched";
</del><ins>+ this._headerElement.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this));
+ }
</ins><span class="cx">
</span><del>-WebInspector.CSSStyleDeclarationSection.AuthorStyleRuleIconStyleClassName = "author-style-rule-icon";
-WebInspector.CSSStyleDeclarationSection.UserStyleRuleIconStyleClassName = "user-style-rule-icon";
-WebInspector.CSSStyleDeclarationSection.UserAgentStyleRuleIconStyleClassName = "user-agent-style-rule-icon";
-WebInspector.CSSStyleDeclarationSection.InspectorStyleRuleIconStyleClassName = "inspector-style-rule-icon";
-WebInspector.CSSStyleDeclarationSection.InheritedStyleRuleIconStyleClassName = "inherited-style-rule-icon";
-WebInspector.CSSStyleDeclarationSection.InheritedElementStyleRuleIconStyleClassName = "inherited-element-style-rule-icon";
-
-WebInspector.CSSStyleDeclarationSection.prototype = {
- constructor: WebInspector.CSSStyleDeclarationSection,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get element()
</span><span class="cx"> {
</span><span class="cx"> return this._element;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get style()
</span><span class="cx"> {
</span><span class="cx"> return this._style;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get lastInGroup()
</span><span class="cx"> {
</span><span class="cx"> return this._element.classList.contains(WebInspector.CSSStyleDeclarationSection.LastInGroupStyleClassName);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set lastInGroup(last)
</span><span class="cx"> {
</span><span class="lines">@@ -167,19 +153,19 @@
</span><span class="cx"> this._element.classList.add(WebInspector.CSSStyleDeclarationSection.LastInGroupStyleClassName);
</span><span class="cx"> else
</span><span class="cx"> this._element.classList.remove(WebInspector.CSSStyleDeclarationSection.LastInGroupStyleClassName);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get focused()
</span><span class="cx"> {
</span><span class="cx"> return this._propertiesTextEditor.focused;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- focus: function()
</del><ins>+ focus()
</ins><span class="cx"> {
</span><span class="cx"> this._propertiesTextEditor.focus();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- refresh: function()
</del><ins>+ refresh()
</ins><span class="cx"> {
</span><span class="cx"> this._selectorElement.removeChildren();
</span><span class="cx"> this._originElement.removeChildren();
</span><span class="lines">@@ -195,7 +181,7 @@
</span><span class="cx"> selectorElement.textContent = selector.text;
</span><span class="cx">
</span><span class="cx"> if (matched)
</span><del>- selectorElement.className = WebInspector.CSSStyleDeclarationSection.MatchedSelectorElementStyleClassName;
</del><ins>+ selectorElement.classList.add(WebInspector.CSSStyleDeclarationSection.MatchedSelectorElementStyleClassName);
</ins><span class="cx">
</span><span class="cx"> var specificity = selector.specificity;
</span><span class="cx"> if (specificity) {
</span><span class="lines">@@ -223,7 +209,7 @@
</span><span class="cx"> {
</span><span class="cx"> var selectorElement = document.createElement("span");
</span><span class="cx"> selectorElement.textContent = selectorText;
</span><del>- selectorElement.className = WebInspector.CSSStyleDeclarationSection.MatchedSelectorElementStyleClassName;
</del><ins>+ selectorElement.classList.add(WebInspector.CSSStyleDeclarationSection.MatchedSelectorElementStyleClassName);
</ins><span class="cx"> this._selectorElement.appendChild(selectorElement);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -283,9 +269,9 @@
</span><span class="cx"> this._originElement.appendChild(document.createTextNode(WebInspector.UIString("HTML Attributes")));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- highlightProperty: function(property)
</del><ins>+ highlightProperty(property)
</ins><span class="cx"> {
</span><span class="cx"> if (this._propertiesTextEditor.highlightProperty(property)) {
</span><span class="cx"> this._element.scrollIntoView();
</span><span class="lines">@@ -293,9 +279,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- findMatchingPropertiesAndSelectors: function(needle)
</del><ins>+ findMatchingPropertiesAndSelectors(needle)
</ins><span class="cx"> {
</span><span class="cx"> this._element.classList.remove(WebInspector.CSSStyleDetailsSidebarPanel.NoFilterMatchInSectionClassName, WebInspector.CSSStyleDetailsSidebarPanel.FilterMatchingSectionHasLabelClassName);
</span><span class="cx">
</span><span class="lines">@@ -323,25 +309,25 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> this._propertiesTextEditor.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- clearSelection: function()
</del><ins>+ clearSelection()
</ins><span class="cx"> {
</span><span class="cx"> this._propertiesTextEditor.clearSelection();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- cssStyleDeclarationTextEditorFocused: function()
</del><ins>+ cssStyleDeclarationTextEditorFocused()
</ins><span class="cx"> {
</span><span class="cx"> if (typeof this._delegate.cssStyleDeclarationSectionEditorFocused === "function")
</span><span class="cx"> this._delegate.cssStyleDeclarationSectionEditorFocused(this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- cssStyleDeclarationTextEditorSwitchRule: function(reverse)
</del><ins>+ cssStyleDeclarationTextEditorSwitchRule(reverse)
</ins><span class="cx"> {
</span><span class="cx"> if (!this._delegate)
</span><span class="cx"> return;
</span><span class="lines">@@ -350,9 +336,9 @@
</span><span class="cx"> this._delegate.cssStyleDeclarationSectionEditorPreviousRule(this);
</span><span class="cx"> else if (!reverse && typeof this._delegate.cssStyleDeclarationSectionEditorNextRule === "function")
</span><span class="cx"> this._delegate.cssStyleDeclarationSectionEditorNextRule(this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- focusRuleSelector: function(reverse)
</del><ins>+ focusRuleSelector(reverse)
</ins><span class="cx"> {
</span><span class="cx"> if (this.selectorLocked) {
</span><span class="cx"> this.focus();
</span><span class="lines">@@ -372,27 +358,27 @@
</span><span class="cx"> var range = document.createRange();
</span><span class="cx"> range.selectNodeContents(this._selectorElement);
</span><span class="cx"> selection.addRange(range);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- selectLastProperty: function()
</del><ins>+ selectLastProperty()
</ins><span class="cx"> {
</span><span class="cx"> this._propertiesTextEditor.selectLastProperty();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get selectorLocked()
</span><span class="cx"> {
</span><span class="cx"> return !this.locked && !this._style.ownerRule;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get locked()
</span><span class="cx"> {
</span><span class="cx"> return !this._style.editable;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get editorActive()
</span><span class="cx"> {
</span><span class="cx"> return this._editorActive;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><span class="lines">@@ -407,9 +393,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return selectorText.trim();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _handleSelectorPaste: function(event)
</del><ins>+ _handleSelectorPaste(event)
</ins><span class="cx"> {
</span><span class="cx"> if (this._style.type === WebInspector.CSSStyleDeclaration.Type.Inline || !this._style.ownerRule)
</span><span class="cx"> return;
</span><span class="lines">@@ -444,9 +430,9 @@
</span><span class="cx"> this._selectorElement.textContent = selector;
</span><span class="cx"> this._style.nodeStyles.changeRule(this._style.ownerRule, selector, match[2]);
</span><span class="cx"> event.preventDefault();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _handleContextMenuEvent: function(event)
</del><ins>+ _handleContextMenuEvent(event)
</ins><span class="cx"> {
</span><span class="cx"> if (window.getSelection().toString().length)
</span><span class="cx"> return;
</span><span class="lines">@@ -467,9 +453,9 @@
</span><span class="cx"> }.bind(this));
</span><span class="cx">
</span><span class="cx"> contextMenu.show();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _generateCSSRuleString: function()
</del><ins>+ _generateCSSRuleString()
</ins><span class="cx"> {
</span><span class="cx"> var numMediaQueries = 0;
</span><span class="cx"> var styleText = "";
</span><span class="lines">@@ -504,9 +490,9 @@
</span><span class="cx"> styleText += "}";
</span><span class="cx">
</span><span class="cx"> return styleText;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toggleRuleOnOff: function()
</del><ins>+ _toggleRuleOnOff()
</ins><span class="cx"> {
</span><span class="cx"> if (this._hasInvalidSelector)
</span><span class="cx"> return;
</span><span class="lines">@@ -514,9 +500,9 @@
</span><span class="cx"> this._ruleDisabled = this._ruleDisabled ? !this._propertiesTextEditor.uncommentAllProperties() : this._propertiesTextEditor.commentAllProperties();
</span><span class="cx"> this._iconElement.title = this._ruleDisabled ? WebInspector.UIString("Uncomment All Properties") : WebInspector.UIString("Comment All Properties");
</span><span class="cx"> this._element.classList.toggle("rule-disabled", this._ruleDisabled);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _highlightNodesWithSelector: function()
</del><ins>+ _highlightNodesWithSelector()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._style.ownerRule) {
</span><span class="cx"> WebInspector.domTreeManager.highlightDOMNode(this._style.node.id);
</span><span class="lines">@@ -524,24 +510,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebInspector.domTreeManager.highlightSelector(this._currentSelectorText, this._style.node.ownerDocument.frameIdentifier);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _hideDOMNodeHighlight: function()
</del><ins>+ _hideDOMNodeHighlight()
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.domTreeManager.hideDOMNodeHighlight();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _handleMouseOver: function(event)
</del><ins>+ _handleMouseOver(event)
</ins><span class="cx"> {
</span><span class="cx"> this._highlightNodesWithSelector();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _handleMouseOut: function(event)
</del><ins>+ _handleMouseOut(event)
</ins><span class="cx"> {
</span><span class="cx"> this._hideDOMNodeHighlight();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _handleKeyDown: function(event)
</del><ins>+ _handleKeyDown(event)
</ins><span class="cx"> {
</span><span class="cx"> if (event.keyCode !== 9) {
</span><span class="cx"> this._highlightNodesWithSelector();
</span><span class="lines">@@ -560,14 +546,14 @@
</span><span class="cx"> this._propertiesTextEditor.selectFirstProperty();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _handleKeyUp: function(event)
</del><ins>+ _handleKeyUp(event)
</ins><span class="cx"> {
</span><span class="cx"> this._highlightNodesWithSelector();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _commitSelector: function(mutations)
</del><ins>+ _commitSelector(mutations)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(this._style.ownerRule);
</span><span class="cx"> if (!this._style.ownerRule)
</span><span class="lines">@@ -581,9 +567,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._style.ownerRule.selectorText = newSelectorText;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _markSelector: function(event)
</del><ins>+ _markSelector(event)
</ins><span class="cx"> {
</span><span class="cx"> var valid = event && event.data && event.data.valid;
</span><span class="cx"> this._element.classList.toggle(WebInspector.CSSStyleDeclarationSection.SelectorInvalidClassName, !valid);
</span><span class="lines">@@ -598,19 +584,19 @@
</span><span class="cx"> this._selectorElement.title = WebInspector.UIString("Using the previous selector '%s'.").format(this._style.ownerRule.selectorText);
</span><span class="cx"> for (var i = 0; i < this._selectorElement.children.length; ++i)
</span><span class="cx"> this._selectorElement.children[i].title = null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get _hasInvalidSelector()
</span><span class="cx"> {
</span><span class="cx"> return this._element.classList.contains(WebInspector.CSSStyleDeclarationSection.SelectorInvalidClassName);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _editorContentChanged: function(event)
</del><ins>+ _editorContentChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> this._editorActive = true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _editorBlurred: function(event)
</del><ins>+ _editorBlurred(event)
</ins><span class="cx"> {
</span><span class="cx"> this._editorActive = false;
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.CSSStyleDeclarationSection.Event.Blurred);
</span><span class="lines">@@ -621,4 +607,15 @@
</span><span class="cx"> Blurred: "css-style-declaration-sections-blurred"
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.CSSStyleDeclarationSection.prototype.__proto__ = WebInspector.StyleDetailsPanel.prototype;
</del><ins>+WebInspector.CSSStyleDeclarationSection.LockedStyleClassName = "locked";
+WebInspector.CSSStyleDeclarationSection.SelectorLockedStyleClassName = "selector-locked";
+WebInspector.CSSStyleDeclarationSection.SelectorInvalidClassName = "invalid-selector";
+WebInspector.CSSStyleDeclarationSection.LastInGroupStyleClassName = "last-in-group";
+WebInspector.CSSStyleDeclarationSection.MatchedSelectorElementStyleClassName = "matched";
+
+WebInspector.CSSStyleDeclarationSection.AuthorStyleRuleIconStyleClassName = "author-style-rule-icon";
+WebInspector.CSSStyleDeclarationSection.UserStyleRuleIconStyleClassName = "user-style-rule-icon";
+WebInspector.CSSStyleDeclarationSection.UserAgentStyleRuleIconStyleClassName = "user-agent-style-rule-icon";
+WebInspector.CSSStyleDeclarationSection.InspectorStyleRuleIconStyleClassName = "inspector-style-rule-icon";
+WebInspector.CSSStyleDeclarationSection.InheritedStyleRuleIconStyleClassName = "inherited-style-rule-icon";
+WebInspector.CSSStyleDeclarationSection.InheritedElementStyleRuleIconStyleClassName = "inherited-element-style-rule-icon";
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js (193063 => 193064)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-12-03 18:42:09 UTC (rev 193063)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2015-12-03 18:42:19 UTC (rev 193064)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2015 Tobias Reiss <tobi+webkit@basecode.de>
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsConsolePromptjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsolePrompt.js (193063 => 193064)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsolePrompt.js 2015-12-03 18:42:09 UTC (rev 193063)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsolePrompt.js 2015-12-03 18:42:19 UTC (rev 193064)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,149 +23,144 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ConsolePrompt = function(delegate, mimeType, element)
</del><ins>+WebInspector.ConsolePrompt = class ConsolePrompt extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- // FIXME: Convert this to a WebInspector.Object subclass, and call super().
- // WebInspector.Object.call(this);
</del><ins>+ constructor(delegate, mimeType, element)
+ {
+ super();
</ins><span class="cx">
</span><del>- mimeType = parseMIMEType(mimeType).type;
</del><ins>+ mimeType = parseMIMEType(mimeType).type;
</ins><span class="cx">
</span><del>- this._element = element || document.createElement("div");
- this._element.classList.add("console-prompt");
- this._element.classList.add(WebInspector.SyntaxHighlightedStyleClassName);
</del><ins>+ this._element = element || document.createElement("div");
+ this._element.classList.add("console-prompt", WebInspector.SyntaxHighlightedStyleClassName);
</ins><span class="cx">
</span><del>- this._delegate = delegate || null;
</del><ins>+ this._delegate = delegate || null;
</ins><span class="cx">
</span><del>- this._codeMirror = CodeMirror(this.element, {
- lineWrapping: true,
- mode: mimeType,
- indentWithTabs: true,
- indentUnit: 4,
- matchBrackets: true
- });
</del><ins>+ this._codeMirror = CodeMirror(this.element, {
+ lineWrapping: true,
+ mode: mimeType,
+ indentWithTabs: true,
+ indentUnit: 4,
+ matchBrackets: true
+ });
</ins><span class="cx">
</span><del>- var keyMap = {
- "Up": this._handlePreviousKey.bind(this),
- "Down": this._handleNextKey.bind(this),
- "Ctrl-P": this._handlePreviousKey.bind(this),
- "Ctrl-N": this._handleNextKey.bind(this),
- "Enter": this._handleEnterKey.bind(this),
- "Cmd-Enter": this._handleCommandEnterKey.bind(this),
- "Tab": this._handleTabKey.bind(this),
- "Esc": this._handleEscapeKey.bind(this)
- };
</del><ins>+ var keyMap = {
+ "Up": this._handlePreviousKey.bind(this),
+ "Down": this._handleNextKey.bind(this),
+ "Ctrl-P": this._handlePreviousKey.bind(this),
+ "Ctrl-N": this._handleNextKey.bind(this),
+ "Enter": this._handleEnterKey.bind(this),
+ "Cmd-Enter": this._handleCommandEnterKey.bind(this),
+ "Tab": this._handleTabKey.bind(this),
+ "Esc": this._handleEscapeKey.bind(this)
+ };
</ins><span class="cx">
</span><del>- this._codeMirror.addKeyMap(keyMap);
</del><ins>+ this._codeMirror.addKeyMap(keyMap);
</ins><span class="cx">
</span><del>- this._completionController = new WebInspector.CodeMirrorCompletionController(this._codeMirror, this);
- this._completionController.addExtendedCompletionProvider("javascript", WebInspector.javaScriptRuntimeCompletionProvider);
</del><ins>+ this._completionController = new WebInspector.CodeMirrorCompletionController(this._codeMirror, this);
+ this._completionController.addExtendedCompletionProvider("javascript", WebInspector.javaScriptRuntimeCompletionProvider);
</ins><span class="cx">
</span><del>- this._history = [{}];
- this._historyIndex = 0;
-};
</del><ins>+ this._history = [{}];
+ this._historyIndex = 0;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ConsolePrompt.MaximumHistorySize = 30;
-
-WebInspector.ConsolePrompt.prototype = {
- constructor: WebInspector.ConsolePrompt,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get element()
</span><span class="cx"> {
</span><span class="cx"> return this._element;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get delegate()
</span><span class="cx"> {
</span><span class="cx"> return this._delegate;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set delegate(delegate)
</span><span class="cx"> {
</span><span class="cx"> this._delegate = delegate || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set escapeKeyHandlerWhenEmpty(handler)
</span><span class="cx"> {
</span><span class="cx"> this._escapeKeyHandlerWhenEmpty = handler;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get text()
</span><span class="cx"> {
</span><span class="cx"> return this._codeMirror.getValue();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set text(text)
</span><span class="cx"> {
</span><span class="cx"> this._codeMirror.setValue(text || "");
</span><span class="cx"> this._codeMirror.clearHistory();
</span><span class="cx"> this._codeMirror.markClean();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get history()
</span><span class="cx"> {
</span><span class="cx"> this._history[this._historyIndex] = this._historyEntryForCurrentText();
</span><span class="cx"> return this._history;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set history(history)
</span><span class="cx"> {
</span><span class="cx"> this._history = history instanceof Array ? history.slice(0, WebInspector.ConsolePrompt.MaximumHistorySize) : [{}];
</span><span class="cx"> this._historyIndex = 0;
</span><span class="cx"> this._restoreHistoryEntry(0);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get focused()
</span><span class="cx"> {
</span><span class="cx"> return this._codeMirror.getWrapperElement().classList.contains("CodeMirror-focused");
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- focus: function()
</del><ins>+ focus()
</ins><span class="cx"> {
</span><span class="cx"> this._codeMirror.focus();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><span class="cx"> this._codeMirror.refresh();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> this._codeMirror.refresh();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateCompletions: function(completions, implicitSuffix)
</del><ins>+ updateCompletions(completions, implicitSuffix)
</ins><span class="cx"> {
</span><span class="cx"> this._completionController.updateCompletions(completions, implicitSuffix);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- pushHistoryItem: function(text)
</del><ins>+ pushHistoryItem(text)
</ins><span class="cx"> {
</span><span class="cx"> this._commitHistoryEntry({text});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Protected
</span><span class="cx">
</span><del>- completionControllerCompletionsNeeded: function(completionController, prefix, defaultCompletions, base, suffix, forced)
</del><ins>+ completionControllerCompletionsNeeded(completionController, prefix, defaultCompletions, base, suffix, forced)
</ins><span class="cx"> {
</span><span class="cx"> if (this.delegate && typeof this.delegate.consolePromptCompletionsNeeded === "function")
</span><span class="cx"> this.delegate.consolePromptCompletionsNeeded(this, defaultCompletions, base, prefix, suffix, forced);
</span><span class="cx"> else
</span><span class="cx"> this._completionController.updateCompletions(defaultCompletions);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- completionControllerShouldAllowEscapeCompletion: function(completionController)
</del><ins>+ completionControllerShouldAllowEscapeCompletion(completionController)
</ins><span class="cx"> {
</span><span class="cx"> // Only allow escape to complete if there is text in the prompt. Otherwise allow it to pass through
</span><span class="cx"> // so escape to toggle the quick console still works.
</span><span class="cx"> return !!this.text;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _handleTabKey: function(codeMirror)
</del><ins>+ _handleTabKey(codeMirror)
</ins><span class="cx"> {
</span><span class="cx"> var cursor = codeMirror.getCursor();
</span><span class="cx"> var line = codeMirror.getLine(cursor.line);
</span><span class="lines">@@ -182,9 +177,9 @@
</span><span class="cx"> if (result === WebInspector.CodeMirrorCompletionController.UpdatePromise.NoCompletionsFound)
</span><span class="cx"> InspectorFrontendHost.beep();
</span><span class="cx"> });
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _handleEscapeKey: function(codeMirror)
</del><ins>+ _handleEscapeKey(codeMirror)
</ins><span class="cx"> {
</span><span class="cx"> if (this.text)
</span><span class="cx"> return CodeMirror.Pass;
</span><span class="lines">@@ -193,9 +188,9 @@
</span><span class="cx"> return CodeMirror.Pass;
</span><span class="cx">
</span><span class="cx"> this._escapeKeyHandlerWhenEmpty();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _handlePreviousKey: function(codeMirror)
</del><ins>+ _handlePreviousKey(codeMirror)
</ins><span class="cx"> {
</span><span class="cx"> if (this._codeMirror.somethingSelected())
</span><span class="cx"> return CodeMirror.Pass;
</span><span class="lines">@@ -213,9 +208,9 @@
</span><span class="cx"> ++this._historyIndex;
</span><span class="cx">
</span><span class="cx"> this._restoreHistoryEntry(this._historyIndex);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _handleNextKey: function(codeMirror)
</del><ins>+ _handleNextKey(codeMirror)
</ins><span class="cx"> {
</span><span class="cx"> if (this._codeMirror.somethingSelected())
</span><span class="cx"> return CodeMirror.Pass;
</span><span class="lines">@@ -233,9 +228,9 @@
</span><span class="cx"> --this._historyIndex;
</span><span class="cx">
</span><span class="cx"> this._restoreHistoryEntry(this._historyIndex);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _handleEnterKey: function(codeMirror, forceCommit)
</del><ins>+ _handleEnterKey(codeMirror, forceCommit)
</ins><span class="cx"> {
</span><span class="cx"> var currentText = this.text;
</span><span class="cx">
</span><span class="lines">@@ -282,9 +277,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> commitTextOrInsertNewLine.call(this, true);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _commitHistoryEntry: function(historyEntry)
</del><ins>+ _commitHistoryEntry(historyEntry)
</ins><span class="cx"> {
</span><span class="cx"> // Replace the previous entry if it does not have text or if the text is the same.
</span><span class="cx"> if (this._history[1] && (!this._history[1].text || this._history[1].text === historyEntry.text)) {
</span><span class="lines">@@ -301,14 +296,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._historyIndex = 0;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _handleCommandEnterKey: function(codeMirror)
</del><ins>+ _handleCommandEnterKey(codeMirror)
</ins><span class="cx"> {
</span><span class="cx"> this._handleEnterKey(codeMirror, true);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _restoreHistoryEntry: function(index)
</del><ins>+ _restoreHistoryEntry(index)
</ins><span class="cx"> {
</span><span class="cx"> var historyEntry = this._history[index];
</span><span class="cx">
</span><span class="lines">@@ -320,14 +315,14 @@
</span><span class="cx"> this._codeMirror.clearHistory();
</span><span class="cx">
</span><span class="cx"> this._codeMirror.setCursor(historyEntry.cursor || {line: 0});
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _historyEntryForCurrentText: function()
</del><ins>+ _historyEntryForCurrentText()
</ins><span class="cx"> {
</span><span class="cx"> return {text: this.text, undoHistory: this._codeMirror.getHistory(), cursor: this._codeMirror.getCursor()};
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _rememberCurrentTextInHistory: function()
</del><ins>+ _rememberCurrentTextInHistory()
</ins><span class="cx"> {
</span><span class="cx"> this._history[this._historyIndex] = this._historyEntryForCurrentText();
</span><span class="cx">
</span><span class="lines">@@ -336,4 +331,4 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.ConsolePrompt.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.ConsolePrompt.MaximumHistorySize = 30;
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsContentBrowserjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js (193063 => 193064)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2015-12-03 18:42:09 UTC (rev 193063)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2015-12-03 18:42:19 UTC (rev 193064)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,107 +23,97 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ContentBrowser = function(element, delegate, disableBackForward)
</del><ins>+WebInspector.ContentBrowser = class ContentBrowser extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- // FIXME: Convert this to a WebInspector.Object subclass, and call super().
- // WebInspector.Object.call(this);
</del><ins>+ constructor(element, delegate, disableBackForward)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._element = element || document.createElement("div");
- this._element.classList.add("content-browser");
</del><ins>+ this._element = element || document.createElement("div");
+ this._element.classList.add("content-browser");
</ins><span class="cx">
</span><del>- this._navigationBar = new WebInspector.NavigationBar;
- this._element.appendChild(this._navigationBar.element);
</del><ins>+ this._navigationBar = new WebInspector.NavigationBar;
+ this._element.appendChild(this._navigationBar.element);
</ins><span class="cx">
</span><del>- this._contentViewContainer = new WebInspector.ContentViewContainer;
- this._contentViewContainer.addEventListener(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange, this._currentContentViewDidChange, this);
- this._element.appendChild(this._contentViewContainer.element);
</del><ins>+ this._contentViewContainer = new WebInspector.ContentViewContainer;
+ this._contentViewContainer.addEventListener(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange, this._currentContentViewDidChange, this);
+ this._element.appendChild(this._contentViewContainer.element);
</ins><span class="cx">
</span><del>- this._findBanner = new WebInspector.FindBanner(this);
- this._findBanner.addEventListener(WebInspector.FindBanner.Event.DidShow, this._findBannerDidShow, this);
- this._findBanner.addEventListener(WebInspector.FindBanner.Event.DidHide, this._findBannerDidHide, this);
</del><ins>+ this._findBanner = new WebInspector.FindBanner(this);
+ this._findBanner.addEventListener(WebInspector.FindBanner.Event.DidShow, this._findBannerDidShow, this);
+ this._findBanner.addEventListener(WebInspector.FindBanner.Event.DidHide, this._findBannerDidHide, this);
</ins><span class="cx">
</span><del>- this._findKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "F", this._showFindBanner.bind(this), this._element);
- this._saveKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "S", this._save.bind(this), this._element);
- this._saveAsKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "S", this._saveAs.bind(this), this._element);
</del><ins>+ this._findKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "F", this._showFindBanner.bind(this), this._element);
+ this._saveKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "S", this._save.bind(this), this._element);
+ this._saveAsKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "S", this._saveAs.bind(this), this._element);
</ins><span class="cx">
</span><del>- if (!disableBackForward) {
- this._backKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Left, this._backButtonClicked.bind(this), this._element);
- this._forwardKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Right, this._forwardButtonClicked.bind(this), this._element);
</del><ins>+ if (!disableBackForward) {
+ this._backKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Left, this._backButtonClicked.bind(this), this._element);
+ this._forwardKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Right, this._forwardButtonClicked.bind(this), this._element);
</ins><span class="cx">
</span><del>- this._backButtonNavigationItem = new WebInspector.ButtonNavigationItem("back", WebInspector.UIString("Back (%s)").format(this._backKeyboardShortcut.displayName), "Images/BackArrow.svg", 8, 13);
- this._backButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._backButtonClicked, this);
- this._backButtonNavigationItem.enabled = false;
- this._navigationBar.addNavigationItem(this._backButtonNavigationItem);
</del><ins>+ this._backButtonNavigationItem = new WebInspector.ButtonNavigationItem("back", WebInspector.UIString("Back (%s)").format(this._backKeyboardShortcut.displayName), "Images/BackArrow.svg", 8, 13);
+ this._backButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._backButtonClicked, this);
+ this._backButtonNavigationItem.enabled = false;
+ this._navigationBar.addNavigationItem(this._backButtonNavigationItem);
</ins><span class="cx">
</span><del>- this._forwardButtonNavigationItem = new WebInspector.ButtonNavigationItem("forward", WebInspector.UIString("Forward (%s)").format(this._forwardKeyboardShortcut.displayName), "Images/ForwardArrow.svg", 8, 13);
- this._forwardButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._forwardButtonClicked, this);
- this._forwardButtonNavigationItem.enabled = false;
- this._navigationBar.addNavigationItem(this._forwardButtonNavigationItem);
</del><ins>+ this._forwardButtonNavigationItem = new WebInspector.ButtonNavigationItem("forward", WebInspector.UIString("Forward (%s)").format(this._forwardKeyboardShortcut.displayName), "Images/ForwardArrow.svg", 8, 13);
+ this._forwardButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._forwardButtonClicked, this);
+ this._forwardButtonNavigationItem.enabled = false;
+ this._navigationBar.addNavigationItem(this._forwardButtonNavigationItem);
</ins><span class="cx">
</span><del>- this._navigationBar.addNavigationItem(new WebInspector.DividerNavigationItem);
- }
</del><ins>+ this._navigationBar.addNavigationItem(new WebInspector.DividerNavigationItem);
+ }
</ins><span class="cx">
</span><del>- this._hierarchicalPathNavigationItem = new WebInspector.HierarchicalPathNavigationItem;
- this._hierarchicalPathNavigationItem.addEventListener(WebInspector.HierarchicalPathNavigationItem.Event.PathComponentWasSelected, this._hierarchicalPathComponentWasSelected, this);
- this._navigationBar.addNavigationItem(this._hierarchicalPathNavigationItem);
</del><ins>+ this._hierarchicalPathNavigationItem = new WebInspector.HierarchicalPathNavigationItem;
+ this._hierarchicalPathNavigationItem.addEventListener(WebInspector.HierarchicalPathNavigationItem.Event.PathComponentWasSelected, this._hierarchicalPathComponentWasSelected, this);
+ this._navigationBar.addNavigationItem(this._hierarchicalPathNavigationItem);
</ins><span class="cx">
</span><del>- this._contentViewSelectionPathNavigationItem = new WebInspector.HierarchicalPathNavigationItem;
</del><ins>+ this._contentViewSelectionPathNavigationItem = new WebInspector.HierarchicalPathNavigationItem;
</ins><span class="cx">
</span><del>- this._dividingFlexibleSpaceNavigationItem = new WebInspector.FlexibleSpaceNavigationItem;
- this._navigationBar.addNavigationItem(this._dividingFlexibleSpaceNavigationItem);
</del><ins>+ this._dividingFlexibleSpaceNavigationItem = new WebInspector.FlexibleSpaceNavigationItem;
+ this._navigationBar.addNavigationItem(this._dividingFlexibleSpaceNavigationItem);
</ins><span class="cx">
</span><del>- WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.SelectionPathComponentsDidChange, this._contentViewSelectionPathComponentDidChange, this);
- WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.SupplementalRepresentedObjectsDidChange, this._contentViewSupplementalRepresentedObjectsDidChange, this);
- WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.NumberOfSearchResultsDidChange, this._contentViewNumberOfSearchResultsDidChange, this);
- WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.NavigationItemsDidChange, this._contentViewNavigationItemsDidChange, this);
</del><ins>+ WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.SelectionPathComponentsDidChange, this._contentViewSelectionPathComponentDidChange, this);
+ WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.SupplementalRepresentedObjectsDidChange, this._contentViewSupplementalRepresentedObjectsDidChange, this);
+ WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.NumberOfSearchResultsDidChange, this._contentViewNumberOfSearchResultsDidChange, this);
+ WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.NavigationItemsDidChange, this._contentViewNavigationItemsDidChange, this);
</ins><span class="cx">
</span><del>- this._delegate = delegate || null;
</del><ins>+ this._delegate = delegate || null;
</ins><span class="cx">
</span><del>- this._currentContentViewNavigationItems = [];
-};
</del><ins>+ this._currentContentViewNavigationItems = [];
+ }
</ins><span class="cx">
</span><del>-// FIXME: Move to a WebInspector.Object subclass and we can remove this.
-WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.ContentBrowser);
-
-WebInspector.ContentBrowser.Event = {
- CurrentRepresentedObjectsDidChange: "content-browser-current-represented-objects-did-change",
- CurrentContentViewDidChange: "content-browser-current-content-view-did-change"
-};
-
-WebInspector.ContentBrowser.prototype = {
- constructor: WebInspector.ContentBrowser,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get element()
</span><span class="cx"> {
</span><span class="cx"> return this._element;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get navigationBar()
</span><span class="cx"> {
</span><span class="cx"> return this._navigationBar;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get contentViewContainer()
</span><span class="cx"> {
</span><span class="cx"> return this._contentViewContainer;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get delegate()
</span><span class="cx"> {
</span><span class="cx"> return this._delegate;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set delegate(newDelegate)
</span><span class="cx"> {
</span><span class="cx"> this._delegate = newDelegate || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get currentContentView()
</span><span class="cx"> {
</span><span class="cx"> return this._contentViewContainer.currentContentView;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get currentRepresentedObjects()
</span><span class="cx"> {
</span><span class="lines">@@ -145,53 +135,53 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return representedObjects;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> this._navigationBar.updateLayout();
</span><span class="cx"> this._contentViewContainer.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showContentViewForRepresentedObject: function(representedObject, cookie, extraArguments)
</del><ins>+ showContentViewForRepresentedObject(representedObject, cookie, extraArguments)
</ins><span class="cx"> {
</span><span class="cx"> var contentView = this.contentViewForRepresentedObject(representedObject, false, extraArguments);
</span><span class="cx"> return this._contentViewContainer.showContentView(contentView, cookie);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showContentView: function(contentView, cookie)
</del><ins>+ showContentView(contentView, cookie)
</ins><span class="cx"> {
</span><span class="cx"> return this._contentViewContainer.showContentView(contentView, cookie);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- contentViewForRepresentedObject: function(representedObject, onlyExisting, extraArguments)
</del><ins>+ contentViewForRepresentedObject(representedObject, onlyExisting, extraArguments)
</ins><span class="cx"> {
</span><span class="cx"> return this._contentViewContainer.contentViewForRepresentedObject(representedObject, onlyExisting, extraArguments);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateHierarchicalPathForCurrentContentView: function()
</del><ins>+ updateHierarchicalPathForCurrentContentView()
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> this._updateHierarchicalPathNavigationItem(currentContentView ? currentContentView.representedObject : null);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canGoBack: function()
</del><ins>+ canGoBack()
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (currentContentView && currentContentView.canGoBack())
</span><span class="cx"> return true;
</span><span class="cx"> return this._contentViewContainer.canGoBack();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canGoForward: function()
</del><ins>+ canGoForward()
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (currentContentView && currentContentView.canGoForward())
</span><span class="cx"> return true;
</span><span class="cx"> return this._contentViewContainer.canGoForward();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- goBack: function()
</del><ins>+ goBack()
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (currentContentView && currentContentView.canGoBack()) {
</span><span class="lines">@@ -204,9 +194,9 @@
</span><span class="cx">
</span><span class="cx"> // The _updateBackForwardButtons function is called by _currentContentViewDidChange,
</span><span class="cx"> // so it does not need to be called here.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- goForward: function()
</del><ins>+ goForward()
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (currentContentView && currentContentView.canGoForward()) {
</span><span class="lines">@@ -219,133 +209,133 @@
</span><span class="cx">
</span><span class="cx"> // The _updateBackForwardButtons function is called by _currentContentViewDidChange,
</span><span class="cx"> // so it does not need to be called here.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- findBannerPerformSearch: function(findBanner, query)
</del><ins>+ findBannerPerformSearch(findBanner, query)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> currentContentView.performSearch(query);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- findBannerSearchCleared: function(findBanner)
</del><ins>+ findBannerSearchCleared(findBanner)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> currentContentView.searchCleared();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- findBannerSearchQueryForSelection: function(findBanner)
</del><ins>+ findBannerSearchQueryForSelection(findBanner)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return null;
</span><span class="cx">
</span><span class="cx"> return currentContentView.searchQueryWithSelection();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- findBannerRevealPreviousResult: function(findBanner)
</del><ins>+ findBannerRevealPreviousResult(findBanner)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> currentContentView.revealPreviousSearchResult(!findBanner.showing);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- findBannerRevealNextResult: function(findBanner)
</del><ins>+ findBannerRevealNextResult(findBanner)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> currentContentView.revealNextSearchResult(!findBanner.showing);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><span class="cx"> this._contentViewContainer.shown();
</span><span class="cx">
</span><span class="cx"> this._findBanner.enableKeyboardShortcuts();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hidden: function()
</del><ins>+ hidden()
</ins><span class="cx"> {
</span><span class="cx"> this._contentViewContainer.hidden();
</span><span class="cx">
</span><span class="cx"> this._findBanner.disableKeyboardShortcuts();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _backButtonClicked: function(event)
</del><ins>+ _backButtonClicked(event)
</ins><span class="cx"> {
</span><span class="cx"> this.goBack();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _forwardButtonClicked: function(event)
</del><ins>+ _forwardButtonClicked(event)
</ins><span class="cx"> {
</span><span class="cx"> this.goForward();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _save: function(event)
</del><ins>+ _save(event)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSave)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WebInspector.saveDataToFile(currentContentView.saveData);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _saveAs: function(event)
</del><ins>+ _saveAs(event)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSave)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WebInspector.saveDataToFile(currentContentView.saveData, true);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _showFindBanner: function(event)
</del><ins>+ _showFindBanner(event)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._findBanner.show();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _findBannerDidShow: function(event)
</del><ins>+ _findBannerDidShow(event)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> currentContentView.automaticallyRevealFirstSearchResult = true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _findBannerDidHide: function(event)
</del><ins>+ _findBannerDidHide(event)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> currentContentView.automaticallyRevealFirstSearchResult = false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentViewNumberOfSearchResultsDidChange: function(event)
</del><ins>+ _contentViewNumberOfSearchResultsDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> if (event.target !== this.currentContentView)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._findBanner.numberOfResults = this.currentContentView.numberOfSearchResults;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _updateHierarchicalPathNavigationItem: function(representedObject)
</del><ins>+ _updateHierarchicalPathNavigationItem(representedObject)
</ins><span class="cx"> {
</span><span class="cx"> if (!this.delegate || typeof this.delegate.contentBrowserTreeElementForRepresentedObject !== "function")
</span><span class="cx"> return;
</span><span class="lines">@@ -360,9 +350,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._hierarchicalPathNavigationItem.components = pathComponents;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _updateContentViewSelectionPathNavigationItem: function(contentView)
</del><ins>+ _updateContentViewSelectionPathNavigationItem(contentView)
</ins><span class="cx"> {
</span><span class="cx"> var selectionPathComponents = contentView ? contentView.selectionPathComponents || [] : [];
</span><span class="cx"> this._contentViewSelectionPathNavigationItem.components = selectionPathComponents;
</span><span class="lines">@@ -380,18 +370,18 @@
</span><span class="cx"> this._navigationBar.insertNavigationItem(this._contentViewSelectionPathNavigationItem, hierarchicalPathItemIndex + 1);
</span><span class="cx"> this._hierarchicalPathNavigationItem.alwaysShowLastPathComponentSeparator = true;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _updateBackForwardButtons: function()
</del><ins>+ _updateBackForwardButtons()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._backButtonNavigationItem || !this._forwardButtonNavigationItem)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._backButtonNavigationItem.enabled = this.canGoBack();
</span><span class="cx"> this._forwardButtonNavigationItem.enabled = this.canGoForward();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _updateContentViewNavigationItems: function()
</del><ins>+ _updateContentViewNavigationItems()
</ins><span class="cx"> {
</span><span class="cx"> var navigationBar = this.navigationBar;
</span><span class="cx">
</span><span class="lines">@@ -427,9 +417,9 @@
</span><span class="cx"> // Remember the navigation items we inserted so we can remove them
</span><span class="cx"> // for the next content view.
</span><span class="cx"> this._currentContentViewNavigationItems = newNavigationItems;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _updateFindBanner: function(currentContentView)
</del><ins>+ _updateFindBanner(currentContentView)
</ins><span class="cx"> {
</span><span class="cx"> if (!currentContentView) {
</span><span class="cx"> this._findBanner.targetElement = null;
</span><span class="lines">@@ -444,16 +434,16 @@
</span><span class="cx"> currentContentView.automaticallyRevealFirstSearchResult = this._findBanner.showing;
</span><span class="cx"> currentContentView.performSearch(this._findBanner.searchQuery);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _dispatchCurrentRepresentedObjectsDidChangeEventSoon: function()
</del><ins>+ _dispatchCurrentRepresentedObjectsDidChangeEventSoon()
</ins><span class="cx"> {
</span><span class="cx"> if (this._currentRepresentedObjectsDidChangeTimeout)
</span><span class="cx"> return;
</span><span class="cx"> this._currentRepresentedObjectsDidChangeTimeout = setTimeout(this._dispatchCurrentRepresentedObjectsDidChangeEvent.bind(this), 0);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _dispatchCurrentRepresentedObjectsDidChangeEvent: function()
</del><ins>+ _dispatchCurrentRepresentedObjectsDidChangeEvent()
</ins><span class="cx"> {
</span><span class="cx"> if (this._currentRepresentedObjectsDidChangeTimeout) {
</span><span class="cx"> clearTimeout(this._currentRepresentedObjectsDidChangeTimeout);
</span><span class="lines">@@ -461,9 +451,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentBrowser.Event.CurrentRepresentedObjectsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentViewSelectionPathComponentDidChange: function(event)
</del><ins>+ _contentViewSelectionPathComponentDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> if (event.target !== this.currentContentView)
</span><span class="cx"> return;
</span><span class="lines">@@ -476,17 +466,17 @@
</span><span class="cx"> this._navigationBar.updateLayout();
</span><span class="cx">
</span><span class="cx"> this._dispatchCurrentRepresentedObjectsDidChangeEventSoon();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentViewSupplementalRepresentedObjectsDidChange: function(event)
</del><ins>+ _contentViewSupplementalRepresentedObjectsDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> if (event.target !== this.currentContentView)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._dispatchCurrentRepresentedObjectsDidChangeEventSoon();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _currentContentViewDidChange: function(event)
</del><ins>+ _currentContentViewDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx">
</span><span class="lines">@@ -502,18 +492,18 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentBrowser.Event.CurrentContentViewDidChange);
</span><span class="cx">
</span><span class="cx"> this._dispatchCurrentRepresentedObjectsDidChangeEvent();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentViewNavigationItemsDidChange: function(event)
</del><ins>+ _contentViewNavigationItemsDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> if (event.target !== this.currentContentView)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._updateContentViewNavigationItems();
</span><span class="cx"> this._navigationBar.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _hierarchicalPathComponentWasSelected: function(event)
</del><ins>+ _hierarchicalPathComponentWasSelected(event)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(event.data.pathComponent instanceof WebInspector.GeneralTreeElementPathComponent);
</span><span class="cx">
</span><span class="lines">@@ -531,4 +521,7 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.ContentBrowser.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.ContentBrowser.Event = {
+ CurrentRepresentedObjectsDidChange: "content-browser-current-represented-objects-did-change",
+ CurrentContentViewDidChange: "content-browser-current-content-view-did-change"
+};
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsContentViewContainerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js (193063 => 193064)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2015-12-03 18:42:09 UTC (rev 193063)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2015-12-03 18:42:19 UTC (rev 193064)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,64 +23,58 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ContentViewContainer = function(element)
</del><ins>+WebInspector.ContentViewContainer = class ContentViewContainer extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- // FIXME: Convert this to a WebInspector.Object subclass, and call super().
- // WebInspector.Object.call(this);
</del><ins>+ constructor(element)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._element = element || document.createElement("div");
- this._element.classList.add("content-view-container");
</del><ins>+ this._element = element || document.createElement("div");
+ this._element.classList.add("content-view-container");
</ins><span class="cx">
</span><del>- this._backForwardList = [];
- this._currentIndex = -1;
-};
</del><ins>+ this._backForwardList = [];
+ this._currentIndex = -1;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ContentViewContainer.Event = {
- CurrentContentViewDidChange: "content-view-container-current-content-view-did-change"
-};
-
-WebInspector.ContentViewContainer.prototype = {
- constructor: WebInspector.ContentViewContainer,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get element()
</span><span class="cx"> {
</span><span class="cx"> return this._element;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get currentIndex()
</span><span class="cx"> {
</span><span class="cx"> return this._currentIndex;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get backForwardList()
</span><span class="cx"> {
</span><span class="cx"> return this._backForwardList;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get currentContentView()
</span><span class="cx"> {
</span><span class="cx"> if (this._currentIndex < 0 || this._currentIndex > this._backForwardList.length - 1)
</span><span class="cx"> return null;
</span><span class="cx"> return this._backForwardList[this._currentIndex].contentView;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get currentBackForwardEntry()
</span><span class="cx"> {
</span><span class="cx"> if (this._currentIndex < 0 || this._currentIndex > this._backForwardList.length - 1)
</span><span class="cx"> return null;
</span><span class="cx"> return this._backForwardList[this._currentIndex];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (currentContentView)
</span><span class="cx"> currentContentView.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- contentViewForRepresentedObject: function(representedObject, onlyExisting, extraArguments)
</del><ins>+ contentViewForRepresentedObject(representedObject, onlyExisting, extraArguments)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(representedObject);
</span><span class="cx"> if (!representedObject)
</span><span class="lines">@@ -123,9 +117,9 @@
</span><span class="cx"> representedObject.__contentViews.push(contentView);
</span><span class="cx">
</span><span class="cx"> return contentView;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showContentViewForRepresentedObject: function(representedObject, extraArguments)
</del><ins>+ showContentViewForRepresentedObject(representedObject, extraArguments)
</ins><span class="cx"> {
</span><span class="cx"> var contentView = this.contentViewForRepresentedObject(representedObject, false, extraArguments);
</span><span class="cx"> if (!contentView)
</span><span class="lines">@@ -134,9 +128,9 @@
</span><span class="cx"> this.showContentView(contentView);
</span><span class="cx">
</span><span class="cx"> return contentView;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showContentView: function(contentView, cookie)
</del><ins>+ showContentView(contentView, cookie)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(contentView instanceof WebInspector.ContentView);
</span><span class="cx"> if (!(contentView instanceof WebInspector.ContentView))
</span><span class="lines">@@ -186,9 +180,9 @@
</span><span class="cx"> this.showBackForwardEntryForIndex(newIndex);
</span><span class="cx">
</span><span class="cx"> return contentView;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showBackForwardEntryForIndex: function(index)
</del><ins>+ showBackForwardEntryForIndex(index)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(index >= 0 && index <= this._backForwardList.length - 1);
</span><span class="cx"> if (index < 0 || index > this._backForwardList.length - 1)
</span><span class="lines">@@ -212,9 +206,9 @@
</span><span class="cx"> this._showEntry(currentEntry, false);
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- replaceContentView: function(oldContentView, newContentView)
</del><ins>+ replaceContentView(oldContentView, newContentView)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(oldContentView instanceof WebInspector.ContentView);
</span><span class="cx"> if (!(oldContentView instanceof WebInspector.ContentView))
</span><span class="lines">@@ -253,9 +247,9 @@
</span><span class="cx"> this._showEntry(this.currentBackForwardEntry, true);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closeAllContentViewsOfPrototype: function(constructor)
</del><ins>+ closeAllContentViewsOfPrototype(constructor)
</ins><span class="cx"> {
</span><span class="cx"> if (!this._backForwardList.length) {
</span><span class="cx"> console.assert(this._currentIndex === -1);
</span><span class="lines">@@ -309,9 +303,9 @@
</span><span class="cx"> this._showEntry(currentEntry, true);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closeContentView: function(contentViewToClose)
</del><ins>+ closeContentView(contentViewToClose)
</ins><span class="cx"> {
</span><span class="cx"> if (!this._backForwardList.length) {
</span><span class="cx"> console.assert(this._currentIndex === -1);
</span><span class="lines">@@ -365,9 +359,9 @@
</span><span class="cx"> this._showEntry(currentEntry, true);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closeAllContentViews: function()
</del><ins>+ closeAllContentViews()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._backForwardList.length) {
</span><span class="cx"> console.assert(this._currentIndex === -1);
</span><span class="lines">@@ -388,65 +382,65 @@
</span><span class="cx"> this._currentIndex = -1;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canGoBack: function()
</del><ins>+ canGoBack()
</ins><span class="cx"> {
</span><span class="cx"> return this._currentIndex > 0;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canGoForward: function()
</del><ins>+ canGoForward()
</ins><span class="cx"> {
</span><span class="cx"> return this._currentIndex < this._backForwardList.length - 1;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- goBack: function()
</del><ins>+ goBack()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.canGoBack())
</span><span class="cx"> return;
</span><span class="cx"> this.showBackForwardEntryForIndex(this._currentIndex - 1);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- goForward: function()
</del><ins>+ goForward()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.canGoForward())
</span><span class="cx"> return;
</span><span class="cx"> this.showBackForwardEntryForIndex(this._currentIndex + 1);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><span class="cx"> var currentEntry = this.currentBackForwardEntry;
</span><span class="cx"> if (!currentEntry)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._showEntry(currentEntry, true);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hidden: function()
</del><ins>+ hidden()
</ins><span class="cx"> {
</span><span class="cx"> var currentEntry = this.currentBackForwardEntry;
</span><span class="cx"> if (!currentEntry)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._hideEntry(currentEntry);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _addContentViewElement: function(contentView)
</del><ins>+ _addContentViewElement(contentView)
</ins><span class="cx"> {
</span><span class="cx"> if (contentView.element.parentNode !== this._element)
</span><span class="cx"> this._element.appendChild(contentView.element);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _removeContentViewElement: function(contentView)
</del><ins>+ _removeContentViewElement(contentView)
</ins><span class="cx"> {
</span><span class="cx"> if (contentView.element.parentNode)
</span><span class="cx"> contentView.element.parentNode.removeChild(contentView.element);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _disassociateFromContentView: function(contentView)
</del><ins>+ _disassociateFromContentView(contentView)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!contentView.visible);
</span><span class="cx">
</span><span class="lines">@@ -460,17 +454,17 @@
</span><span class="cx"> representedObject.__contentViews.remove(contentView);
</span><span class="cx">
</span><span class="cx"> contentView.closed();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _showEntry: function(entry, shouldCallShown)
</del><ins>+ _showEntry(entry, shouldCallShown)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(entry instanceof WebInspector.BackForwardEntry);
</span><span class="cx">
</span><span class="cx"> this._addContentViewElement(entry.contentView);
</span><span class="cx"> entry.prepareToShow(shouldCallShown);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _hideEntry: function(entry)
</del><ins>+ _hideEntry(entry)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(entry instanceof WebInspector.BackForwardEntry);
</span><span class="cx">
</span><span class="lines">@@ -479,4 +473,6 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.ContentViewContainer.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.ContentViewContainer.Event = {
+ CurrentContentViewDidChange: "content-view-container-current-content-view-did-change"
+};
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDOMTreeDataGridNodejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeDataGridNode.js (193063 => 193064)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeDataGridNode.js 2015-12-03 18:42:09 UTC (rev 193063)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeDataGridNode.js 2015-12-03 18:42:19 UTC (rev 193064)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Adobe Systems Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,65 +24,63 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DOMTreeDataGridNode = function(domNode)
</del><ins>+WebInspector.DOMTreeDataGridNode = class DOMTreeDataGridNode extends WebInspector.DataGridNode
</ins><span class="cx"> {
</span><del>- WebInspector.DataGridNode.call(this);
</del><ins>+ constructor(domNode)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._nameLabel = null;
- this._domNode = domNode;
- this._updateNodeName();
-};
</del><ins>+ this._nameLabel = null;
+ this._domNode = domNode;
+ this._updateNodeName();
+ }
</ins><span class="cx">
</span><del>-WebInspector.DOMTreeDataGridNode.prototype = {
- constructor: WebInspector.DOMTreeDataGridNode,
- __proto__: WebInspector.DataGridNode.prototype,
-
</del><span class="cx"> get domNode()
</span><span class="cx"> {
</span><span class="cx"> return this._domNode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // DataGridNode Overrides.
</span><span class="cx">
</span><del>- createCellContent: function(columnIdentifier, cell)
</del><ins>+ createCellContent(columnIdentifier, cell)
</ins><span class="cx"> {
</span><span class="cx"> if (columnIdentifier !== "name")
</span><del>- return WebInspector.DataGridNode.prototype.createCellContent.call(this, columnIdentifier, cell);
</del><ins>+ return super.createCellContent(columnIdentifier, cell);
</ins><span class="cx">
</span><span class="cx"> var cell = this._makeNameCell();
</span><span class="cx"> this._updateNameCellData();
</span><span class="cx"> return cell;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _updateNodeName: function()
</del><ins>+ _updateNodeName()
</ins><span class="cx"> {
</span><span class="cx"> this.data = {name: WebInspector.displayNameForNode(this._domNode)};
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _makeNameCell: function()
</del><ins>+ _makeNameCell()
</ins><span class="cx"> {
</span><span class="cx"> var fragment = document.createDocumentFragment();
</span><span class="cx">
</span><del>- fragment.appendChild(document.createElement("img")).className = "icon";
</del><ins>+ fragment.appendChild(document.createElement("img")).classList.add("icon");
</ins><span class="cx">
</span><span class="cx"> this._nameLabel = document.createElement("div");
</span><del>- this._nameLabel.className = "label";
</del><ins>+ this._nameLabel.classList.add("label");
</ins><span class="cx"> fragment.appendChild(this._nameLabel);
</span><span class="cx">
</span><span class="cx"> var goToButton = fragment.appendChild(WebInspector.createGoToArrowButton());
</span><span class="cx"> goToButton.addEventListener("click", this._goToArrowWasClicked.bind(this), false);
</span><span class="cx">
</span><span class="cx"> return fragment;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _updateNameCellData: function()
</del><ins>+ _updateNameCellData()
</ins><span class="cx"> {
</span><span class="cx"> this._nameLabel.textContent = this.data.name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _goToArrowWasClicked: function()
</del><ins>+ _goToArrowWasClicked()
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.showMainFrameDOMTree(this._domNode);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsIndeterminateProgressSpinnerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/IndeterminateProgressSpinner.js (193063 => 193064)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/IndeterminateProgressSpinner.js 2015-12-03 18:42:09 UTC (rev 193063)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/IndeterminateProgressSpinner.js 2015-12-03 18:42:19 UTC (rev 193064)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,20 +23,16 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.IndeterminateProgressSpinner = function()
</del><ins>+WebInspector.IndeterminateProgressSpinner = class IndeterminateProgressSpinner extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- // FIXME: Convert this to a WebInspector.Object subclass, and call super().
- // WebInspector.Object.call(this);
</del><ins>+ constructor()
+ {
+ super();
</ins><span class="cx">
</span><del>- this._element = document.createElement("div");
- this._element.className = WebInspector.IndeterminateProgressSpinner.StyleClassName;
-};
</del><ins>+ this._element = document.createElement("div");
+ this._element.classList.add("indeterminate-progress-spinner");
+ }
</ins><span class="cx">
</span><del>-WebInspector.IndeterminateProgressSpinner.StyleClassName = "indeterminate-progress-spinner";
-
-WebInspector.IndeterminateProgressSpinner.prototype = {
- constructor: WebInspector.IndeterminateProgressSpinner,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get element()
</span><span class="lines">@@ -44,5 +40,3 @@
</span><span class="cx"> return this._element;
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.IndeterminateProgressSpinner.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsNavigationBarjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NavigationBar.js (193063 => 193064)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NavigationBar.js 2015-12-03 18:42:09 UTC (rev 193063)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NavigationBar.js 2015-12-03 18:42:19 UTC (rev 193064)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,59 +23,48 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.NavigationBar = function(element, navigationItems, role, label) {
- // FIXME: Convert this to a WebInspector.Object subclass, and call super().
- // WebInspector.Object.call(this);
</del><ins>+WebInspector.NavigationBar = class NavigationBar extends WebInspector.Object
+{
+ constructor(element, navigationItems, role, label)
+ {
+ super();
</ins><span class="cx">
</span><del>- this._element = element || document.createElement("div");
- this._element.classList.add(this.constructor.StyleClassName || WebInspector.NavigationBar.StyleClassName);
- this._element.tabIndex = 0;
</del><ins>+ this._element = element || document.createElement("div");
+ this._element.classList.add(this.constructor.StyleClassName || "navigation-bar");
+ this._element.tabIndex = 0;
</ins><span class="cx">
</span><del>- if (role)
- this._element.setAttribute("role", role);
- if (label)
- this._element.setAttribute("aria-label", label);
</del><ins>+ if (role)
+ this._element.setAttribute("role", role);
+ if (label)
+ this._element.setAttribute("aria-label", label);
</ins><span class="cx">
</span><del>- this._element.addEventListener("focus", this._focus.bind(this), false);
- this._element.addEventListener("blur", this._blur.bind(this), false);
- this._element.addEventListener("keydown", this._keyDown.bind(this), false);
- this._element.addEventListener("mousedown", this._mouseDown.bind(this), false);
</del><ins>+ this._element.addEventListener("focus", this._focus.bind(this), false);
+ this._element.addEventListener("blur", this._blur.bind(this), false);
+ this._element.addEventListener("keydown", this._keyDown.bind(this), false);
+ this._element.addEventListener("mousedown", this._mouseDown.bind(this), false);
</ins><span class="cx">
</span><del>- document.addEventListener("load", this.updateLayout.bind(this), false);
</del><ins>+ document.addEventListener("load", this.updateLayout.bind(this), false);
</ins><span class="cx">
</span><del>- this._styleElement = document.createElement("style");
</del><ins>+ this._styleElement = document.createElement("style");
</ins><span class="cx">
</span><del>- this._navigationItems = [];
</del><ins>+ this._navigationItems = [];
</ins><span class="cx">
</span><del>- if (navigationItems) {
- for (var i = 0; i < navigationItems.length; ++i)
- this.addNavigationItem(navigationItems[i]);
</del><ins>+ if (navigationItems) {
+ for (var i = 0; i < navigationItems.length; ++i)
+ this.addNavigationItem(navigationItems[i]);
+ }
+
+ document.head.appendChild(this._styleElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- document.head.appendChild(this._styleElement);
-};
-
-// FIXME: Move to a WebInspector.Object subclass and we can remove this.
-WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.NavigationBar);
-
-WebInspector.NavigationBar.StyleClassName = "navigation-bar";
-WebInspector.NavigationBar.CollapsedStyleClassName = "collapsed";
-
-WebInspector.NavigationBar.Event = {
- NavigationItemSelected: "navigation-bar-navigation-item-selected"
-};
-
-WebInspector.NavigationBar.prototype = {
- constructor: WebInspector.NavigationBar,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><del>- addNavigationItem: function(navigationItem, parentElement)
</del><ins>+ addNavigationItem(navigationItem, parentElement)
</ins><span class="cx"> {
</span><span class="cx"> return this.insertNavigationItem(navigationItem, this._navigationItems.length, parentElement);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- insertNavigationItem: function(navigationItem, index, parentElement)
</del><ins>+ insertNavigationItem(navigationItem, index, parentElement)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(navigationItem instanceof WebInspector.NavigationItem);
</span><span class="cx"> if (!(navigationItem instanceof WebInspector.NavigationItem))
</span><span class="lines">@@ -107,9 +96,9 @@
</span><span class="cx"> this.updateLayoutSoon();
</span><span class="cx">
</span><span class="cx"> return navigationItem;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- removeNavigationItem: function(navigationItemOrIdentifierOrIndex)
</del><ins>+ removeNavigationItem(navigationItemOrIdentifierOrIndex)
</ins><span class="cx"> {
</span><span class="cx"> var navigationItem = this._findNavigationItem(navigationItemOrIdentifierOrIndex);
</span><span class="cx"> if (!navigationItem)
</span><span class="lines">@@ -129,9 +118,9 @@
</span><span class="cx"> this.updateLayoutSoon();
</span><span class="cx">
</span><span class="cx"> return navigationItem;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayoutSoon: function()
</del><ins>+ updateLayoutSoon()
</ins><span class="cx"> {
</span><span class="cx"> if (this._updateLayoutTimeout)
</span><span class="cx"> return;
</span><span class="lines">@@ -147,9 +136,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._updateLayoutTimeout = setTimeout(update.bind(this), 0);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> if (this._updateLayoutTimeout) {
</span><span class="cx"> clearTimeout(this._updateLayoutTimeout);
</span><span class="lines">@@ -191,12 +180,12 @@
</span><span class="cx"> // Give each navigation item the opportunity to collapse further.
</span><span class="cx"> for (var i = 0; i < this._navigationItems.length; ++i)
</span><span class="cx"> this._navigationItems[i].updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get selectedNavigationItem()
</span><span class="cx"> {
</span><span class="cx"> return this._selectedNavigationItem || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set selectedNavigationItem(navigationItemOrIdentifierOrIndex)
</span><span class="cx"> {
</span><span class="lines">@@ -221,17 +210,17 @@
</span><span class="cx"> // This prevents sending the event while the user is scrubbing the bar.
</span><span class="cx"> if (!this._mouseIsDown)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.NavigationBar.Event.NavigationItemSelected);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get navigationItems()
</span><span class="cx"> {
</span><span class="cx"> return this._navigationItems;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get element()
</span><span class="cx"> {
</span><span class="cx"> return this._element;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get minimumWidth()
</span><span class="cx"> {
</span><span class="lines">@@ -241,17 +230,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return this._minimumWidth;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sizesToFit()
</span><span class="cx"> {
</span><span class="cx"> // Can be overriden by subclasses.
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _findNavigationItem: function(navigationItemOrIdentifierOrIndex)
</del><ins>+ _findNavigationItem(navigationItemOrIdentifierOrIndex)
</ins><span class="cx"> {
</span><span class="cx"> var navigationItem = null;
</span><span class="cx">
</span><span class="lines">@@ -270,9 +259,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return navigationItem;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _mouseDown: function(event)
</del><ins>+ _mouseDown(event)
</ins><span class="cx"> {
</span><span class="cx"> // Only handle left mouse clicks.
</span><span class="cx"> if (event.button !== 0)
</span><span class="lines">@@ -306,9 +295,9 @@
</span><span class="cx">
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> event.stopPropagation();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _mouseMoved: function(event)
</del><ins>+ _mouseMoved(event)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(event.button === 0);
</span><span class="cx"> console.assert(this._mouseIsDown);
</span><span class="lines">@@ -337,9 +326,9 @@
</span><span class="cx"> this.selectedNavigationItem = itemElement.navigationItem;
</span><span class="cx">
</span><span class="cx"> this.selectedNavigationItem.active = true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _mouseUp: function(event)
</del><ins>+ _mouseUp(event)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(event.button === 0);
</span><span class="cx"> console.assert(this._mouseIsDown);
</span><span class="lines">@@ -369,9 +358,9 @@
</span><span class="cx">
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> event.stopPropagation();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _keyDown: function(event)
</del><ins>+ _keyDown(event)
</ins><span class="cx"> {
</span><span class="cx"> if (!this._focused)
</span><span class="cx"> return;
</span><span class="lines">@@ -401,23 +390,23 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.selectedNavigationItem = this._navigationItems[selectedNavigationItemIndex];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _focus: function(event)
</del><ins>+ _focus(event)
</ins><span class="cx"> {
</span><span class="cx"> this._focused = true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _blur: function(event)
</del><ins>+ _blur(event)
</ins><span class="cx"> {
</span><span class="cx"> this._focused = false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _updateStyle: function()
</del><ins>+ _updateStyle()
</ins><span class="cx"> {
</span><span class="cx"> this._needsStyleUpdated = false;
</span><span class="cx">
</span><del>- var parentSelector = "." + (this.constructor.StyleClassName || WebInspector.NavigationBar.StyleClassName);
</del><ins>+ var parentSelector = "." + (this.constructor.StyleClassName || "navigation-bar");
</ins><span class="cx">
</span><span class="cx"> var styleText = "";
</span><span class="cx"> for (var i = 0; i < this._navigationItems.length; ++i) {
</span><span class="lines">@@ -429,9 +418,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._styleElement.textContent = styleText;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _calculateMinimumWidth: function()
</del><ins>+ _calculateMinimumWidth()
</ins><span class="cx"> {
</span><span class="cx"> var wasCollapsed = this._element.classList.contains(WebInspector.NavigationBar.CollapsedStyleClassName);
</span><span class="cx">
</span><span class="lines">@@ -455,4 +444,8 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.NavigationBar.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.NavigationBar.CollapsedStyleClassName = "collapsed";
+
+WebInspector.NavigationBar.Event = {
+ NavigationItemSelected: "navigation-bar-navigation-item-selected"
+};
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsProbeSetDataGridNodejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGridNode.js (193063 => 193064)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGridNode.js 2015-12-03 18:42:09 UTC (rev 193063)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGridNode.js 2015-12-03 18:42:19 UTC (rev 193064)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 University of Washington. All rights reserved.
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -24,37 +24,32 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ProbeSetDataGridNode = function(dataGrid)
</del><ins>+WebInspector.ProbeSetDataGridNode = class ProbeSetDataGridNode extends WebInspector.DataGridNode
</ins><span class="cx"> {
</span><del>- console.assert(dataGrid instanceof WebInspector.ProbeSetDataGrid, "Invalid ProbeSetDataGrid argument:", dataGrid);
</del><ins>+ constructor(dataGrid)
+ {
+ console.assert(dataGrid instanceof WebInspector.ProbeSetDataGrid, "Invalid ProbeSetDataGrid argument:", dataGrid);
</ins><span class="cx">
</span><del>- WebInspector.DataGridNode.call(this, this.data);
- this.dataGrid = dataGrid; // This is set to null in DataGridNode's constructor.
- this._data = {};
</del><ins>+ super();
+ this.dataGrid = dataGrid; // This is set to null in DataGridNode's constructor.
+ this._data = {};
</ins><span class="cx">
</span><del>- this._element = document.createElement("tr");
- this._element.dataGridNode = this;
- this._element.classList.add("revealed");
-};
</del><ins>+ this._element = document.createElement("tr");
+ this._element.dataGridNode = this;
+ this._element.classList.add("revealed");
+ }
</ins><span class="cx">
</span><del>-WebInspector.ProbeSetDataGridNode.SeparatorStyleClassName = "separator";
-WebInspector.ProbeSetDataGridNode.UnknownValueStyleClassName = "unknown-value";
-
-WebInspector.ProbeSetDataGridNode.prototype = {
- constructor: WebInspector.ProbeSetDataGridNode,
- __proto__: WebInspector.DataGridNode.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get element()
</span><span class="cx"> {
</span><span class="cx"> return this._element;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get data()
</span><span class="cx"> {
</span><span class="cx"> return this._data;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set frame(value)
</span><span class="cx"> {
</span><span class="lines">@@ -70,18 +65,18 @@
</span><span class="cx"> data[probe.id] = sample.object;
</span><span class="cx"> }
</span><span class="cx"> this._data = data;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get frame()
</span><span class="cx"> {
</span><span class="cx"> return this._frame;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- createCellContent: function(columnIdentifier, cell)
</del><ins>+ createCellContent(columnIdentifier, cell)
</ins><span class="cx"> {
</span><span class="cx"> var sample = this.data[columnIdentifier];
</span><span class="cx"> if (sample === WebInspector.ProbeSetDataFrame.MissingValue) {
</span><del>- cell.classList.add(WebInspector.ProbeSetDataGridNode.UnknownValueStyleClassName);
</del><ins>+ cell.classList.add("unknown-value");
</ins><span class="cx"> return sample;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -89,14 +84,14 @@
</span><span class="cx"> return WebInspector.FormattedValue.createObjectTreeOrFormattedValueForRemoteObject(sample, null);
</span><span class="cx">
</span><span class="cx"> return sample;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateCellsFromFrame: function(frame, probeSet)
</del><ins>+ updateCellsFromFrame(frame, probeSet)
</ins><span class="cx"> {
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateCellsForSeparator: function(frame, probeSet)
</del><ins>+ updateCellsForSeparator(frame, probeSet)
</ins><span class="cx"> {
</span><del>- this._element.classList.add(WebInspector.ProbeSetDataGridNode.SeparatorStyleClassName);
</del><ins>+ this._element.classList.add("separator");
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsQuickConsoleNavigationBarjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/QuickConsoleNavigationBar.js (193063 => 193064)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/QuickConsoleNavigationBar.js 2015-12-03 18:42:09 UTC (rev 193063)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/QuickConsoleNavigationBar.js 2015-12-03 18:42:19 UTC (rev 193064)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,24 +23,16 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.QuickConsoleNavigationBar = function(element, navigationItems)
</del><ins>+WebInspector.QuickConsoleNavigationBar = class QuickConsoleNavigationBar extends WebInspector.NavigationBar
</ins><span class="cx"> {
</span><del>- WebInspector.NavigationBar.call(this, element, navigationItems);
-};
-
-WebInspector.QuickConsoleNavigationBar.prototype = {
- constructor: WebInspector.QuickConsoleNavigationBar,
-
</del><span class="cx"> get sizesToFit()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addNavigationItem: function(navigationItem)
</del><ins>+ addNavigationItem(navigationItem)
</ins><span class="cx"> {
</span><span class="cx"> // Add new navigation items to the left.
</span><span class="cx"> return this.insertNavigationItem(navigationItem, 0);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.QuickConsoleNavigationBar.prototype.__proto__ = WebInspector.NavigationBar.prototype;
</del></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsToolbarjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Toolbar.js (193063 => 193064)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Toolbar.js 2015-12-03 18:42:09 UTC (rev 193063)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/Toolbar.js 2015-12-03 18:42:19 UTC (rev 193064)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,87 +23,49 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.Toolbar = function(element, navigationItems, dontAllowModeChanges) {
- WebInspector.NavigationBar.call(this, element, navigationItems, "toolbar");
</del><ins>+WebInspector.Toolbar = class Toolbar extends WebInspector.NavigationBar
+{
+ constructor(element, navigationItems, dontAllowModeChanges)
+ {
+ super(element, navigationItems, "toolbar");
</ins><span class="cx">
</span><del>- this.displayMode = WebInspector.Toolbar.DisplayMode.IconAndLabelVertical;
- this.sizeMode = WebInspector.Toolbar.SizeMode.Normal;
</del><ins>+ this.displayMode = WebInspector.Toolbar.DisplayMode.IconAndLabelVertical;
+ this.sizeMode = WebInspector.Toolbar.SizeMode.Normal;
</ins><span class="cx">
</span><del>- this._controlSectionElement = document.createElement("div");
- this._controlSectionElement.className = WebInspector.Toolbar.ControlSectionStyleClassName;
- this._element.appendChild(this._controlSectionElement);
</del><ins>+ this._controlSectionElement = document.createElement("div");
+ this._controlSectionElement.className = WebInspector.Toolbar.ControlSectionStyleClassName;
+ this._element.appendChild(this._controlSectionElement);
</ins><span class="cx">
</span><del>- this._leftSectionElement = document.createElement("div");
- this._leftSectionElement.className = WebInspector.Toolbar.ItemSectionStyleClassName + " " + WebInspector.Toolbar.LeftItemSectionStyleClassName;
- this._element.appendChild(this._leftSectionElement);
</del><ins>+ this._leftSectionElement = document.createElement("div");
+ this._leftSectionElement.className = WebInspector.Toolbar.ItemSectionStyleClassName + " " + WebInspector.Toolbar.LeftItemSectionStyleClassName;
+ this._element.appendChild(this._leftSectionElement);
</ins><span class="cx">
</span><del>- this._centerLeftSectionElement = document.createElement("div");
- this._centerLeftSectionElement.className = WebInspector.Toolbar.ItemSectionStyleClassName + " " + WebInspector.Toolbar.CenterLeftItemSectionStyleClassName;
- this._element.appendChild(this._centerLeftSectionElement);
</del><ins>+ this._centerLeftSectionElement = document.createElement("div");
+ this._centerLeftSectionElement.className = WebInspector.Toolbar.ItemSectionStyleClassName + " " + WebInspector.Toolbar.CenterLeftItemSectionStyleClassName;
+ this._element.appendChild(this._centerLeftSectionElement);
</ins><span class="cx">
</span><del>- this._centerSectionElement = document.createElement("div");
- this._centerSectionElement.className = WebInspector.Toolbar.ItemSectionStyleClassName + " " + WebInspector.Toolbar.CenterItemSectionStyleClassName;
- this._element.appendChild(this._centerSectionElement);
</del><ins>+ this._centerSectionElement = document.createElement("div");
+ this._centerSectionElement.className = WebInspector.Toolbar.ItemSectionStyleClassName + " " + WebInspector.Toolbar.CenterItemSectionStyleClassName;
+ this._element.appendChild(this._centerSectionElement);
</ins><span class="cx">
</span><del>- this._centerRightSectionElement = document.createElement("div");
- this._centerRightSectionElement.className = WebInspector.Toolbar.ItemSectionStyleClassName + " " + WebInspector.Toolbar.CenterRightItemSectionStyleClassName;
- this._element.appendChild(this._centerRightSectionElement);
</del><ins>+ this._centerRightSectionElement = document.createElement("div");
+ this._centerRightSectionElement.className = WebInspector.Toolbar.ItemSectionStyleClassName + " " + WebInspector.Toolbar.CenterRightItemSectionStyleClassName;
+ this._element.appendChild(this._centerRightSectionElement);
</ins><span class="cx">
</span><del>- this._rightSectionElement = document.createElement("div");
- this._rightSectionElement.className = WebInspector.Toolbar.ItemSectionStyleClassName + " " + WebInspector.Toolbar.RightItemSectionStyleClassName;
- this._element.appendChild(this._rightSectionElement);
</del><ins>+ this._rightSectionElement = document.createElement("div");
+ this._rightSectionElement.className = WebInspector.Toolbar.ItemSectionStyleClassName + " " + WebInspector.Toolbar.RightItemSectionStyleClassName;
+ this._element.appendChild(this._rightSectionElement);
</ins><span class="cx">
</span><del>- if (!dontAllowModeChanges)
- this._element.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this), false);
-};
</del><ins>+ if (!dontAllowModeChanges)
+ this._element.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this), false);
+ }
</ins><span class="cx">
</span><del>-// FIXME: Move to a WebInspector.Object subclass and we can remove this.
-WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.Toolbar);
-
-WebInspector.Toolbar.StyleClassName = "toolbar";
-WebInspector.Toolbar.ControlSectionStyleClassName = "control-section";
-WebInspector.Toolbar.ItemSectionStyleClassName = "item-section";
-WebInspector.Toolbar.LeftItemSectionStyleClassName = "left";
-WebInspector.Toolbar.CenterLeftItemSectionStyleClassName = "center-left";
-WebInspector.Toolbar.CenterItemSectionStyleClassName = "center";
-WebInspector.Toolbar.CenterRightItemSectionStyleClassName = "center-right";
-WebInspector.Toolbar.RightItemSectionStyleClassName = "right";
-
-WebInspector.Toolbar.Event = {
- DisplayModeDidChange: "toolbar-display-mode-did-change",
- SizeModeDidChange: "toolbar-size-mode-did-change"
-};
-
-WebInspector.Toolbar.Section = {
- Control: "control",
- Left: "left",
- CenterLeft: "center-left",
- Center: "center",
- CenterRight: "center-right",
- Right: "right"
-};
-
-WebInspector.Toolbar.DisplayMode = {
- IconAndLabelVertical: "icon-and-label-vertical",
- IconAndLabelHorizontal: "icon-and-label-horizontal",
- IconOnly: "icon-only",
- LabelOnly: "label-only"
-};
-
-WebInspector.Toolbar.SizeMode = {
- Normal: "normal-size",
- Small: "small-size"
-};
-
-WebInspector.Toolbar.prototype = {
- constructor: WebInspector.Toolbar,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get displayMode()
</span><span class="cx"> {
</span><span class="cx"> return this._displayMode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set displayMode(mode)
</span><span class="cx"> {
</span><span class="lines">@@ -124,12 +86,12 @@
</span><span class="cx"> this.updateLayout();
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Toolbar.Event.DisplayModeDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get sizeMode()
</span><span class="cx"> {
</span><span class="cx"> return this._sizeMode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set sizeMode(mode)
</span><span class="cx"> {
</span><span class="lines">@@ -146,9 +108,9 @@
</span><span class="cx"> this.updateLayout();
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Toolbar.Event.SizeModeDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- customUpdateLayout: function()
</del><ins>+ customUpdateLayout()
</ins><span class="cx"> {
</span><span class="cx"> // Bail early if our sections are not created yet. This means we are being called during construction.
</span><span class="cx"> if (!this._leftSectionElement || !this._centerSectionElement || !this._rightSectionElement)
</span><span class="lines">@@ -193,9 +155,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._element.classList.add(WebInspector.NavigationBar.CollapsedStyleClassName);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addToolbarItem: function(toolbarItem, sectionIdentifier)
</del><ins>+ addToolbarItem(toolbarItem, sectionIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> var sectionElement;
</span><span class="cx">
</span><span class="lines">@@ -229,11 +191,11 @@
</span><span class="cx"> console.assert(sectionElement);
</span><span class="cx">
</span><span class="cx"> this.addNavigationItem(toolbarItem, sectionElement);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _handleContextMenuEvent: function(event)
</del><ins>+ _handleContextMenuEvent(event)
</ins><span class="cx"> {
</span><span class="cx"> var contextMenu = new WebInspector.ContextMenu(event);
</span><span class="cx">
</span><span class="lines">@@ -248,17 +210,50 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> contextMenu.show();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _changeDisplayMode: function(displayMode)
</del><ins>+ _changeDisplayMode(displayMode)
</ins><span class="cx"> {
</span><span class="cx"> this.displayMode = displayMode;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toggleSmallIcons: function()
</del><ins>+ _toggleSmallIcons()
</ins><span class="cx"> {
</span><span class="cx"> this.sizeMode = this._sizeMode === WebInspector.Toolbar.SizeMode.Normal ? WebInspector.Toolbar.SizeMode.Small : WebInspector.Toolbar.SizeMode.Normal;
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.Toolbar.prototype.__proto__ = WebInspector.NavigationBar.prototype;
</del><ins>+WebInspector.Toolbar.StyleClassName = "toolbar";
+WebInspector.Toolbar.ControlSectionStyleClassName = "control-section";
+WebInspector.Toolbar.ItemSectionStyleClassName = "item-section";
+WebInspector.Toolbar.LeftItemSectionStyleClassName = "left";
+WebInspector.Toolbar.CenterLeftItemSectionStyleClassName = "center-left";
+WebInspector.Toolbar.CenterItemSectionStyleClassName = "center";
+WebInspector.Toolbar.CenterRightItemSectionStyleClassName = "center-right";
+WebInspector.Toolbar.RightItemSectionStyleClassName = "right";
+
+WebInspector.Toolbar.Event = {
+ DisplayModeDidChange: "toolbar-display-mode-did-change",
+ SizeModeDidChange: "toolbar-size-mode-did-change"
+};
+
+WebInspector.Toolbar.Section = {
+ Control: "control",
+ Left: "left",
+ CenterLeft: "center-left",
+ Center: "center",
+ CenterRight: "center-right",
+ Right: "right"
+};
+
+WebInspector.Toolbar.DisplayMode = {
+ IconAndLabelVertical: "icon-and-label-vertical",
+ IconAndLabelHorizontal: "icon-and-label-horizontal",
+ IconOnly: "icon-only",
+ LabelOnly: "label-only"
+};
+
+WebInspector.Toolbar.SizeMode = {
+ Normal: "normal-size",
+ Small: "small-size"
+};
</ins></span></pre>
</div>
</div>
</body>
</html>