Bug 689934 - Transition on infobar during webpage scrolling in highlighter, r=msucan
authorPaul Rouget <paul@mozilla.com>
Tue, 11 Oct 2011 10:10:13 -0300
changeset 78548 44411b4781c513c05df37365d13be7955810a88e
parent 78547 43611c1253109fae0e5f388346e8f18fd11ae9ec
child 78549 dbfe5c55ee81bce86a358f9eba7bd169f6a56d07
push id21312
push userrcampbell@mozilla.com
push dateTue, 11 Oct 2011 18:04:44 +0000
treeherdermozilla-central@1ca405a46f21 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmsucan
bugs689934
milestone10.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 689934 - Transition on infobar during webpage scrolling in highlighter, r=msucan
browser/base/content/highlighter.css
browser/devtools/highlighter/inspector.jsm
--- a/browser/base/content/highlighter.css
+++ b/browser/base/content/highlighter.css
@@ -37,16 +37,19 @@
 }
 
 /*
  * Node Infobar
  */
 
 #highlighter-nodeinfobar-container {
   position: absolute;
+}
+
+#highlighter-nodeinfobar-container:not([locked]) {
   -moz-transition-property: top, left;
   -moz-transition-duration: 0.1s;
   -moz-transition-timing-function: linear;
 }
 
 #highlighter-nodeinfobar {
   display: block;
   white-space: nowrap;
--- a/browser/devtools/highlighter/inspector.jsm
+++ b/browser/devtools/highlighter/inspector.jsm
@@ -1025,16 +1025,17 @@ InspectorUI.prototype = {
     if (this.treePanel && this.treePanel.editingContext)
       this.treePanel.closeEditor();
 
     this.inspectToolbutton.checked = true;
     this.attachPageListeners();
     this.inspecting = true;
     this.toolsDim(true);
     this.highlighter.veilContainer.removeAttribute("locked");
+    this.highlighter.nodeInfo.container.removeAttribute("locked");
   },
 
   /**
    * Stop inspecting webpage, detach page listeners, disable highlighter
    * event listeners.
    * @param aPreventScroll
    *        Prevent scroll in the HTML tree?
    */
@@ -1049,16 +1050,17 @@ InspectorUI.prototype = {
     this.inspecting = false;
     this.toolsDim(false);
     if (this.highlighter.node) {
       this.select(this.highlighter.node, true, true, !aPreventScroll);
     } else {
       this.select(null, true, true);
     }
     this.highlighter.veilContainer.setAttribute("locked", true);
+    this.highlighter.nodeInfo.container.setAttribute("locked", true);
   },
 
   /**
    * Select an object in the tree view.
    * @param aNode
    *        node to inspect
    * @param forceUpdate
    *        force an update?