Bug 1155661 - 1 - Rename toolbar to global-toolbar; r=zer0
authorPatrick Brosset <pbrosset@mozilla.com>
Thu, 10 Sep 2015 11:11:05 +0200
changeset 295846 204ecb6628ce7f841068485906e522e707ed2518
parent 295752 a97f5b00b7727d6fadeea03b778dd10e3024d625
child 295847 6c3532823c25db03dbae91614c71341622f898cc
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerszer0
bugs1155661
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1155661 - 1 - Rename toolbar to global-toolbar; r=zer0
browser/devtools/animationinspector/animation-inspector.xhtml
browser/devtools/animationinspector/animation-panel.js
browser/devtools/animationinspector/test/browser_animation_toolbar_exists.js
browser/themes/shared/devtools/animationinspector.css
--- a/browser/devtools/animationinspector/animation-inspector.xhtml
+++ b/browser/devtools/animationinspector/animation-inspector.xhtml
@@ -10,17 +10,17 @@
   <head>
     <title>&title;</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" href="chrome://browser/skin/devtools/common.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://browser/skin/devtools/animationinspector.css" type="text/css"/>
     <script type="application/javascript;version=1.8" src="chrome://browser/content/devtools/theme-switching.js"/>
   </head>
   <body class="theme-sidebar devtools-monospace" role="application">
-    <div id="toolbar" class="theme-toolbar">
+    <div id="global-toolbar" class="theme-toolbar">
       <span class="label">&allAnimations;</span>
       <button id="toggle-all" standalone="true" class="devtools-button"></button>
     </div>
     <div id="players"></div>
     <div id="error-message">
       <p>&invalidElement;</p>
       <p>&selectElement;</p>
       <button id="element-picker" standalone="true" class="devtools-button"></button>
--- a/browser/devtools/animationinspector/animation-panel.js
+++ b/browser/devtools/animationinspector/animation-panel.js
@@ -36,19 +36,19 @@ var AnimationsPanel = {
     this.initialized = promise.defer();
 
     this.playersEl = document.querySelector("#players");
     this.errorMessageEl = document.querySelector("#error-message");
     this.pickerButtonEl = document.querySelector("#element-picker");
     this.toggleAllButtonEl = document.querySelector("#toggle-all");
 
     // If the server doesn't support toggling all animations at once, hide the
-    // whole bottom toolbar.
+    // whole global toolbar.
     if (!AnimationsController.traits.hasToggleAll) {
-      document.querySelector("#toolbar").style.display = "none";
+      document.querySelector("#global-toolbar").style.display = "none";
     }
 
     let hUtils = gToolbox.highlighterUtils;
     this.togglePicker = hUtils.togglePicker.bind(hUtils);
     this.onPickerStarted = this.onPickerStarted.bind(this);
     this.onPickerStopped = this.onPickerStopped.bind(this);
     this.refreshAnimations = this.refreshAnimations.bind(this);
     this.toggleAll = this.toggleAll.bind(this);
--- a/browser/devtools/animationinspector/test/browser_animation_toolbar_exists.js
+++ b/browser/devtools/animationinspector/test/browser_animation_toolbar_exists.js
@@ -7,20 +7,20 @@
 // Test that the animation panel has a top toolbar that contains the play/pause
 // button and that is displayed at all times.
 
 add_task(function*() {
   yield addTab(TEST_URL_ROOT + "doc_simple_animation.html");
   let {inspector, window} = yield openAnimationInspector();
   let doc = window.document;
 
-  let toolbar = doc.querySelector("#toolbar");
+  let toolbar = doc.querySelector("#global-toolbar");
   ok(toolbar, "The panel contains the toolbar element");
   ok(toolbar.querySelector("#toggle-all"), "The toolbar contains the toggle button");
   ok(isNodeVisible(toolbar), "The toolbar is visible");
 
   info("Select an animated node");
   yield selectNode(".animated", inspector);
 
-  toolbar = doc.querySelector("#toolbar");
+  toolbar = doc.querySelector("#global-toolbar");
   ok(toolbar, "The panel still contains the toolbar element");
   ok(isNodeVisible(toolbar), "The toolbar is still visible");
 });
--- a/browser/themes/shared/devtools/animationinspector.css
+++ b/browser/themes/shared/devtools/animationinspector.css
@@ -32,26 +32,26 @@ body {
   flex-direction: column;
   height: 100%;
   overflow: hidden;
   color: var(--theme-content-color3);
 }
 
 /* The top toolbar, containing the toggle-all button */
 
-#toolbar {
+#global-toolbar {
   border-bottom: 1px solid var(--theme-splitter-color);
   display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: flex-end;
   height: var(--toolbar-height);
 }
 
-#toolbar .label {
+#global-toolbar .label {
   padding: 1px 4px;
 }
 
 #toggle-all {
   border-width: 0 0 0 1px;
   min-height: var(--toolbar-height);
 }