Bug 1249585 - Rename about:debugging components s/Component//g. r=janx

MozReview-Commit-ID: KETabxbUXhE --HG-- rename : devtools/client/aboutdebugging/components/addons.js => devtools/client/aboutdebugging/components/addons-tab.js rename : devtools/client/aboutdebugging/components/workers.js => devtools/client/aboutdebugging/components/workers-tab.js extra : rebase_source : 7d7a79167161e507084f540b0cf119f1dd28718e
2025-02-22 02:09:28 +00:00 · 2016-02-21 22:59:12 +01:00 · 2016-02-21 22:59:12 +01:00 · 849ebd468a
commit 849ebd468a
parent 9efe5908ba
10 changed files with 45 additions and 47 deletions
--- a/devtools/client/aboutdebugging/components/aboutdebugging.js
+++ b/devtools/client/aboutdebugging/components/aboutdebugging.js
@ -8,12 +8,12 @@

 loader.lazyRequireGetter(this, "React",
  "devtools/client/shared/vendor/react");
-loader.lazyRequireGetter(this, "AddonsComponent",
-  "devtools/client/aboutdebugging/components/addons", true);
-loader.lazyRequireGetter(this, "TabMenuComponent",
+loader.lazyRequireGetter(this, "AddonsTab",
+  "devtools/client/aboutdebugging/components/addons-tab", true);
+loader.lazyRequireGetter(this, "TabMenu",
  "devtools/client/aboutdebugging/components/tab-menu", true);
-loader.lazyRequireGetter(this, "WorkersComponent",
-  "devtools/client/aboutdebugging/components/workers", true);
+loader.lazyRequireGetter(this, "WorkersTab",
+  "devtools/client/aboutdebugging/components/workers-tab", true);

 const Strings = Services.strings.createBundle(
  "chrome://devtools/locale/aboutdebugging.properties");
@ -21,10 +21,10 @@ const Strings = Services.strings.createBundle(
 const tabs = [
  { id: "addons", name: Strings.GetStringFromName("addons"),
    icon: "chrome://devtools/skin/images/debugging-addons.svg",
-    component: AddonsComponent },
+    component: AddonsTab },
  { id: "workers", name: Strings.GetStringFromName("workers"),
    icon: "chrome://devtools/skin/images/debugging-workers.svg",
-    component: WorkersComponent },
+    component: WorkersTab },
 ];
 const defaultTabId = "addons";

@ -58,8 +58,7 @@ exports.AboutDebuggingApp = React.createClass({

    return React.createElement(
      "div", { className: "app"},
-        React.createElement(TabMenuComponent,
-                              { tabs, selectedTabId, selectTab }),
+        React.createElement(TabMenu, { tabs, selectedTabId, selectTab }),
        React.createElement("div", { className: "main-content" },
          React.createElement(selectedTab.component, { client }))
        );
--- a/devtools/client/aboutdebugging/components/addons-controls.js
+++ b/devtools/client/aboutdebugging/components/addons-controls.js
@ -17,8 +17,8 @@ loader.lazyImporter(this, "AddonManager",
 const Strings = Services.strings.createBundle(
  "chrome://devtools/locale/aboutdebugging.properties");

-exports.AddonsControlsComponent = React.createClass({
-  displayName: "AddonsControlsComponent",
+exports.AddonsControls = React.createClass({
+  displayName: "AddonsControls",

  render() {
    let { debugDisabled } = this.props;
--- a/devtools/client/aboutdebugging/components/addons-tab.js
+++ b/devtools/client/aboutdebugging/components/addons-tab.js
@ -2,17 +2,17 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

-/* global AddonManager, React, TargetListComponent */
+/* global AddonManager, React */

 "use strict";

 loader.lazyRequireGetter(this, "React",
  "devtools/client/shared/vendor/react");
-loader.lazyRequireGetter(this, "TargetListComponent",
+loader.lazyRequireGetter(this, "TargetList",
  "devtools/client/aboutdebugging/components/target-list", true);
-loader.lazyRequireGetter(this, "TabHeaderComponent",
+loader.lazyRequireGetter(this, "TabHeader",
  "devtools/client/aboutdebugging/components/tab-header", true);
-loader.lazyRequireGetter(this, "AddonsControlsComponent",
+loader.lazyRequireGetter(this, "AddonsControls",
  "devtools/client/aboutdebugging/components/addons-controls", true);
 loader.lazyRequireGetter(this, "Services");

@ -23,8 +23,8 @@ const ExtensionIcon = "chrome://mozapps/skin/extensions/extensionGeneric.svg";
 const Strings = Services.strings.createBundle(
  "chrome://devtools/locale/aboutdebugging.properties");

-exports.AddonsComponent = React.createClass({
-  displayName: "AddonsComponent",
+exports.AddonsTab = React.createClass({
+  displayName: "AddonsTab",

  getInitialState() {
    return {
@ -55,13 +55,13 @@ exports.AddonsComponent = React.createClass({
    return React.createElement(
      "div", { id: "tab-addons", className: "tab", role: "tabpanel",
        "aria-labelledby": "tab-addons-header-name" },
-        React.createElement(TabHeaderComponent, {
+        React.createElement(TabHeader, {
          id: "tab-addons-header-name",
          name: Strings.GetStringFromName("addons")}),
-        React.createElement(AddonsControlsComponent, { debugDisabled }),
+        React.createElement(AddonsControls, { debugDisabled }),
        React.createElement(
          "div", { id: "addons" },
-          React.createElement(TargetListComponent,
+          React.createElement(TargetList,
            { name, targets, client, debugDisabled })
      )
    );
--- a/devtools/client/aboutdebugging/components/moz.build
+++ b/devtools/client/aboutdebugging/components/moz.build
@ -5,11 +5,11 @@
 DevToolsModules(
    'aboutdebugging.js',
    'addons-controls.js',
-    'addons.js',
+    'addons-tab.js',
    'tab-header.js',
    'tab-menu-entry.js',
    'tab-menu.js',
    'target-list.js',
    'target.js',
-    'workers.js',
+    'workers-tab.js',
 )
--- a/devtools/client/aboutdebugging/components/tab-header.js
+++ b/devtools/client/aboutdebugging/components/tab-header.js
@ -9,8 +9,8 @@
 loader.lazyRequireGetter(this, "React",
  "devtools/client/shared/vendor/react");

-exports.TabHeaderComponent = React.createClass({
-  displayName: "TabHeaderComponent",
+exports.TabHeader = React.createClass({
+  displayName: "TabHeader",

  render() {
    let { name, id } = this.props;
--- a/devtools/client/aboutdebugging/components/tab-menu-entry.js
+++ b/devtools/client/aboutdebugging/components/tab-menu-entry.js
@ -9,8 +9,8 @@
 loader.lazyRequireGetter(this, "React",
  "devtools/client/shared/vendor/react");

-exports.TabMenuEntryComponent = React.createClass({
-  displayName: "TabMenuEntryComponent",
+exports.TabMenuEntry = React.createClass({
+  displayName: "TabMenuEntry",

  render() {
    let { icon, name, selected } = this.props;
--- a/devtools/client/aboutdebugging/components/tab-menu.js
+++ b/devtools/client/aboutdebugging/components/tab-menu.js
@ -8,17 +8,17 @@

 loader.lazyRequireGetter(this, "React",
  "devtools/client/shared/vendor/react");
-loader.lazyRequireGetter(this, "TabMenuEntryComponent",
+loader.lazyRequireGetter(this, "TabMenuEntry",
  "devtools/client/aboutdebugging/components/tab-menu-entry", true);

-exports.TabMenuComponent = React.createClass({
-  displayName: "TabMenuComponent",
+exports.TabMenu = React.createClass({
+  displayName: "TabMenu",

  render() {
    let { tabs, selectedTabId, selectTab } = this.props;
    let tabLinks = tabs.map(({ id, name, icon }) => {
      let selected = id == selectedTabId;
-      return React.createElement(TabMenuEntryComponent,
+      return React.createElement(TabMenuEntry,
        { tabId: id, name, icon, selected, selectTab });
    });

--- a/devtools/client/aboutdebugging/components/target-list.js
+++ b/devtools/client/aboutdebugging/components/target-list.js
@ -2,13 +2,13 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

-/* global React, TargetComponent */
+/* global React */

 "use strict";

 loader.lazyRequireGetter(this, "React",
  "devtools/client/shared/vendor/react");
-loader.lazyRequireGetter(this, "TargetComponent",
+loader.lazyRequireGetter(this, "Target",
  "devtools/client/aboutdebugging/components/target", true);
 loader.lazyRequireGetter(this, "Services");

@ -18,14 +18,13 @@ const LocaleCompare = (a, b) => {
  return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
 };

-exports.TargetListComponent = React.createClass({
-  displayName: "TargetListComponent",
+exports.TargetList = React.createClass({
+  displayName: "TargetList",

  render() {
    let { client, debugDisabled } = this.props;
    let targets = this.props.targets.sort(LocaleCompare).map(target => {
-      return React.createElement(TargetComponent,
-        { client, target, debugDisabled });
+      return React.createElement(Target, { client, target, debugDisabled });
    });
    return (
      React.createElement("div", { id: this.props.id, className: "targets" },
--- a/devtools/client/aboutdebugging/components/target.js
+++ b/devtools/client/aboutdebugging/components/target.js
@ -23,8 +23,8 @@ loader.lazyRequireGetter(this, "gDevTools",
 const Strings = Services.strings.createBundle(
  "chrome://devtools/locale/aboutdebugging.properties");

-exports.TargetComponent = React.createClass({
-  displayName: "TargetComponent",
+exports.Target = React.createClass({
+  displayName: "Target",

  debug() {
    let { client, target } = this.props;
--- a/devtools/client/aboutdebugging/components/workers-tab.js
+++ b/devtools/client/aboutdebugging/components/workers-tab.js
@ -2,7 +2,7 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

-/* global React, TargetListComponent */
+/* global React */

 "use strict";

@ -10,9 +10,9 @@ loader.lazyRequireGetter(this, "Ci",
  "chrome", true);
 loader.lazyRequireGetter(this, "React",
  "devtools/client/shared/vendor/react");
-loader.lazyRequireGetter(this, "TargetListComponent",
+loader.lazyRequireGetter(this, "TargetList",
  "devtools/client/aboutdebugging/components/target-list", true);
-loader.lazyRequireGetter(this, "TabHeaderComponent",
+loader.lazyRequireGetter(this, "TabHeader",
  "devtools/client/aboutdebugging/components/tab-header", true);
 loader.lazyRequireGetter(this, "Services");

@ -22,8 +22,8 @@ const Strings = Services.strings.createBundle(
  "chrome://devtools/locale/aboutdebugging.properties");
 const WorkerIcon = "chrome://devtools/skin/images/debugging-workers.svg";

-exports.WorkersComponent = React.createClass({
-  displayName: "WorkersComponent",
+exports.WorkersTab = React.createClass({
+  displayName: "WorkersTab",

  getInitialState() {
    return {
@ -55,20 +55,20 @@ exports.WorkersComponent = React.createClass({
    return React.createElement(
      "div", { id: "tab-workers", className: "tab", role: "tabpanel",
        "aria-labelledby": "tab-workers-header-name" },
-        React.createElement(TabHeaderComponent, {
+        React.createElement(TabHeader, {
          id: "tab-workers-header-name",
          name: Strings.GetStringFromName("workers")}),
        React.createElement(
          "div", { id: "workers", className: "inverted-icons" },
-          React.createElement(TargetListComponent, {
+          React.createElement(TargetList, {
            id: "service-workers",
            name: Strings.GetStringFromName("serviceWorkers"),
            targets: workers.service, client }),
-          React.createElement(TargetListComponent, {
+          React.createElement(TargetList, {
            id: "shared-workers",
            name: Strings.GetStringFromName("sharedWorkers"),
            targets: workers.shared, client }),
-          React.createElement(TargetListComponent, {
+          React.createElement(TargetList, {
            id: "other-workers",
            name: Strings.GetStringFromName("otherWorkers"),
            targets: workers.other, client }))