зеркало из https://github.com/mozilla/pjs.git
Merge central to inbound
This commit is contained in:
Marco Bonardo
Коммит
5cfccc3521
|
|
@ -49,6 +49,7 @@ EXTRA_JS_MODULES = \
|
||||||
domplate.jsm \
|
domplate.jsm \
|
||||||
InsideOutBox.jsm \
|
InsideOutBox.jsm \
|
||||||
TreePanel.jsm \
|
TreePanel.jsm \
|
||||||
|
highlighter.jsm \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
ifdef ENABLE_TESTS
|
ifdef ENABLE_TESTS
|
||||||
|
|
|
||||||
|
|
@ -361,7 +361,7 @@ TreePanel.prototype = {
|
||||||
this.IUI.stopInspecting(true);
|
this.IUI.stopInspecting(true);
|
||||||
} else {
|
} else {
|
||||||
this.IUI.select(node, true, false);
|
this.IUI.select(node, true, false);
|
||||||
this.IUI.highlighter.highlightNode(node);
|
this.IUI.highlighter.highlight(node);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,878 @@
|
||||||
|
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||||
|
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
|
||||||
|
/* ***** BEGIN LICENSE BLOCK *****
|
||||||
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
*
|
||||||
|
* The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
* http://www.mozilla.org/MPL/
|
||||||
|
*
|
||||||
|
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
* for the specific language governing rights and limitations under the
|
||||||
|
* License.
|
||||||
|
*
|
||||||
|
* The Original Code is the Mozilla Highlighter Module.
|
||||||
|
*
|
||||||
|
* The Initial Developer of the Original Code is
|
||||||
|
* The Mozilla Foundation.
|
||||||
|
* Portions created by the Initial Developer are Copyright (C) 2010
|
||||||
|
* the Initial Developer. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Contributor(s):
|
||||||
|
* Rob Campbell <rcampbell@mozilla.com> (original author)
|
||||||
|
* Mihai Șucan <mihai.sucan@gmail.com>
|
||||||
|
* Julian Viereck <jviereck@mozilla.com>
|
||||||
|
* Paul Rouget <paul@mozilla.com>
|
||||||
|
* Kyle Simpson <ksimpson@mozilla.com>
|
||||||
|
* Johan Charlez <johan.charlez@gmail.com>
|
||||||
|
*
|
||||||
|
* Alternatively, the contents of this file may be used under the terms of
|
||||||
|
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
* of those above. If you wish to allow use of your version of this file only
|
||||||
|
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
* use your version of this file under the terms of the MPL, indicate your
|
||||||
|
* decision by deleting the provisions above and replace them with the notice
|
||||||
|
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
* the provisions above, a recipient may use your version of this file under
|
||||||
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
*
|
||||||
|
* ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
|
const Cu = Components.utils;
|
||||||
|
Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
|
||||||
|
|
||||||
|
var EXPORTED_SYMBOLS = ["Highlighter"];
|
||||||
|
|
||||||
|
const INSPECTOR_INVISIBLE_ELEMENTS = {
|
||||||
|
"head": true,
|
||||||
|
"base": true,
|
||||||
|
"basefont": true,
|
||||||
|
"isindex": true,
|
||||||
|
"link": true,
|
||||||
|
"meta": true,
|
||||||
|
"script": true,
|
||||||
|
"style": true,
|
||||||
|
"title": true,
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A highlighter mechanism.
|
||||||
|
*
|
||||||
|
* The highlighter is built dynamically into the browser element.
|
||||||
|
* The caller is in charge of destroying the highlighter (ie, the highlighter
|
||||||
|
* won't be destroyed if a new tab is selected for example).
|
||||||
|
*
|
||||||
|
* API:
|
||||||
|
*
|
||||||
|
* // Constructor and destructor.
|
||||||
|
* // @param aWindow - browser.xul window.
|
||||||
|
* Highlighter(aWindow);
|
||||||
|
* void destroy();
|
||||||
|
*
|
||||||
|
* // Highlight a node.
|
||||||
|
* // @param aNode - node to highlight
|
||||||
|
* // @param aScroll - scroll to ensure the node is visible
|
||||||
|
* void highlight(aNode, aScroll);
|
||||||
|
*
|
||||||
|
* // Get the selected node.
|
||||||
|
* DOMNode getNode();
|
||||||
|
*
|
||||||
|
* // Lock and unlock the select node.
|
||||||
|
* void lock();
|
||||||
|
* void unlock();
|
||||||
|
*
|
||||||
|
* // Show and hide the highlighter
|
||||||
|
* void show();
|
||||||
|
* void hide();
|
||||||
|
* boolean isHidden();
|
||||||
|
*
|
||||||
|
* // Redraw the highlighter if the visible portion of the node has changed.
|
||||||
|
* void invalidateSize(aScroll);
|
||||||
|
*
|
||||||
|
* // Is a node highlightable.
|
||||||
|
* boolean isNodeHighlightable(aNode);
|
||||||
|
*
|
||||||
|
* // Add/Remove lsiteners
|
||||||
|
* // @param aEvent - event name
|
||||||
|
* // @param aListener - function callback
|
||||||
|
* void addListener(aEvent, aListener);
|
||||||
|
* void removeListener(aEvent, aListener);
|
||||||
|
*
|
||||||
|
* Events:
|
||||||
|
*
|
||||||
|
* "closed" - Highlighter is closing
|
||||||
|
* "nodeselected" - A new node has been selected
|
||||||
|
* "highlighting" - Highlighter is highlighting
|
||||||
|
* "locked" - The selected node has been locked
|
||||||
|
* "unlocked" - The selected ndoe has been unlocked
|
||||||
|
*
|
||||||
|
* Structure:
|
||||||
|
*
|
||||||
|
* <stack id="highlighter-container">
|
||||||
|
* <vbox id="highlighter-veil-container">...</vbox>
|
||||||
|
* <box id="highlighter-controls>...</vbox>
|
||||||
|
* </stack>
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor.
|
||||||
|
*
|
||||||
|
* @param object aWindow
|
||||||
|
*/
|
||||||
|
function Highlighter(aWindow)
|
||||||
|
{
|
||||||
|
this.chromeWin = aWindow;
|
||||||
|
this.tabbrowser = aWindow.gBrowser;
|
||||||
|
this.chromeDoc = aWindow.document;
|
||||||
|
this.browser = aWindow.gBrowser.selectedBrowser;
|
||||||
|
this.events = {};
|
||||||
|
|
||||||
|
this._init();
|
||||||
|
}
|
||||||
|
|
||||||
|
Highlighter.prototype = {
|
||||||
|
_init: function Highlighter__init()
|
||||||
|
{
|
||||||
|
let stack = this.browser.parentNode;
|
||||||
|
this.win = this.browser.contentWindow;
|
||||||
|
this._highlighting = false;
|
||||||
|
|
||||||
|
this.highlighterContainer = this.chromeDoc.createElement("stack");
|
||||||
|
this.highlighterContainer.id = "highlighter-container";
|
||||||
|
|
||||||
|
this.veilContainer = this.chromeDoc.createElement("vbox");
|
||||||
|
this.veilContainer.id = "highlighter-veil-container";
|
||||||
|
|
||||||
|
// The controlsBox will host the different interactive
|
||||||
|
// elements of the highlighter (buttons, toolbars, ...).
|
||||||
|
let controlsBox = this.chromeDoc.createElement("box");
|
||||||
|
controlsBox.id = "highlighter-controls";
|
||||||
|
this.highlighterContainer.appendChild(this.veilContainer);
|
||||||
|
this.highlighterContainer.appendChild(controlsBox);
|
||||||
|
|
||||||
|
stack.appendChild(this.highlighterContainer);
|
||||||
|
|
||||||
|
// The veil will make the whole page darker except
|
||||||
|
// for the region of the selected box.
|
||||||
|
this.buildVeil(this.veilContainer);
|
||||||
|
|
||||||
|
this.buildInfobar(controlsBox);
|
||||||
|
|
||||||
|
this.transitionDisabler = null;
|
||||||
|
|
||||||
|
this.computeZoomFactor();
|
||||||
|
this.unlock();
|
||||||
|
this.hide();
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Destroy the nodes. Remove listeners.
|
||||||
|
*/
|
||||||
|
destroy: function Highlighter_destroy()
|
||||||
|
{
|
||||||
|
this.detachKeysListeners();
|
||||||
|
this.detachMouseListeners();
|
||||||
|
this.detachPageListeners();
|
||||||
|
|
||||||
|
this.chromeWin.clearTimeout(this.transitionDisabler);
|
||||||
|
this.boundCloseEventHandler = null;
|
||||||
|
this._contentRect = null;
|
||||||
|
this._highlightRect = null;
|
||||||
|
this._highlighting = false;
|
||||||
|
this.veilTopBox = null;
|
||||||
|
this.veilLeftBox = null;
|
||||||
|
this.veilMiddleBox = null;
|
||||||
|
this.veilTransparentBox = null;
|
||||||
|
this.veilContainer = null;
|
||||||
|
this.node = null;
|
||||||
|
this.nodeInfo = null;
|
||||||
|
this.highlighterContainer.parentNode.removeChild(this.highlighterContainer);
|
||||||
|
this.highlighterContainer = null;
|
||||||
|
this.win = null
|
||||||
|
this.browser = null;
|
||||||
|
this.chromeDoc = null;
|
||||||
|
this.chromeWin = null;
|
||||||
|
this.tabbrowser = null;
|
||||||
|
|
||||||
|
this.emitEvent("closed");
|
||||||
|
this.removeAllListeners();
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show the veil, and select a node.
|
||||||
|
* If no node is specified, the previous selected node is highlighted if any.
|
||||||
|
* If no node was selected, the root element is selected.
|
||||||
|
*
|
||||||
|
* @param aNode [optional] - The node to be selected.
|
||||||
|
* @param aScroll [optional] boolean
|
||||||
|
* Should we scroll to ensure that the selected node is visible.
|
||||||
|
*/
|
||||||
|
highlight: function Highlighter_highlight(aNode, aScroll)
|
||||||
|
{
|
||||||
|
if (this.hidden)
|
||||||
|
this.show();
|
||||||
|
|
||||||
|
let oldNode = this.node;
|
||||||
|
|
||||||
|
if (!aNode) {
|
||||||
|
if (!this.node)
|
||||||
|
this.node = this.win.document.documentElement;
|
||||||
|
} else {
|
||||||
|
this.node = aNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (oldNode !== this.node) {
|
||||||
|
this.updateInfobar();
|
||||||
|
}
|
||||||
|
|
||||||
|
this.invalidateSize(!!aScroll);
|
||||||
|
|
||||||
|
if (oldNode !== this.node) {
|
||||||
|
this.emitEvent("nodeselected");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update the highlighter size and position.
|
||||||
|
*/
|
||||||
|
invalidateSize: function Highlighter_invalidateSize(aScroll)
|
||||||
|
{
|
||||||
|
let rect = null;
|
||||||
|
|
||||||
|
if (this.node && this.isNodeHighlightable(this.node)) {
|
||||||
|
|
||||||
|
if (aScroll &&
|
||||||
|
this.node.scrollIntoView) { // XUL elements don't have such method
|
||||||
|
this.node.scrollIntoView();
|
||||||
|
}
|
||||||
|
let clientRect = this.node.getBoundingClientRect();
|
||||||
|
rect = LayoutHelpers.getDirtyRect(this.node);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.highlightRectangle(rect);
|
||||||
|
|
||||||
|
this.moveInfobar();
|
||||||
|
|
||||||
|
if (this._highlighting) {
|
||||||
|
this.emitEvent("highlighting");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the selected node.
|
||||||
|
*
|
||||||
|
* @returns node
|
||||||
|
*/
|
||||||
|
getNode: function() {
|
||||||
|
return this.node;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show the highlighter if it has been hidden.
|
||||||
|
*/
|
||||||
|
show: function() {
|
||||||
|
if (!this.hidden) return;
|
||||||
|
this.veilContainer.removeAttribute("hidden");
|
||||||
|
this.nodeInfo.container.removeAttribute("hidden");
|
||||||
|
this.attachKeysListeners();
|
||||||
|
this.attachPageListeners();
|
||||||
|
this.invalidateSize();
|
||||||
|
this.hidden = false;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hide the highlighter, the veil and the infobar.
|
||||||
|
*/
|
||||||
|
hide: function() {
|
||||||
|
if (this.hidden) return;
|
||||||
|
this.veilContainer.setAttribute("hidden", "true");
|
||||||
|
this.nodeInfo.container.setAttribute("hidden", "true");
|
||||||
|
this.detachKeysListeners();
|
||||||
|
this.detachPageListeners();
|
||||||
|
this.hidden = true;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is the highlighter visible?
|
||||||
|
*
|
||||||
|
* @return boolean
|
||||||
|
*/
|
||||||
|
isHidden: function() {
|
||||||
|
return this.hidden;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Lock a node. Stops the inspection.
|
||||||
|
*/
|
||||||
|
lock: function() {
|
||||||
|
if (this.locked === true) return;
|
||||||
|
this.veilContainer.setAttribute("locked", "true");
|
||||||
|
this.nodeInfo.container.setAttribute("locked", "true");
|
||||||
|
this.detachMouseListeners();
|
||||||
|
this.locked = true;
|
||||||
|
this.emitEvent("locked");
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Start inspecting.
|
||||||
|
* Unlock the current node (if any), and select any node being hovered.
|
||||||
|
*/
|
||||||
|
unlock: function() {
|
||||||
|
if (this.locked === false) return;
|
||||||
|
this.veilContainer.removeAttribute("locked");
|
||||||
|
this.nodeInfo.container.removeAttribute("locked");
|
||||||
|
this.attachMouseListeners();
|
||||||
|
this.locked = false;
|
||||||
|
this.emitEvent("unlocked");
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is the specified node highlightable?
|
||||||
|
*
|
||||||
|
* @param nsIDOMNode aNode
|
||||||
|
* the DOM element in question
|
||||||
|
* @returns boolean
|
||||||
|
* True if the node is highlightable or false otherwise.
|
||||||
|
*/
|
||||||
|
isNodeHighlightable: function Highlighter_isNodeHighlightable(aNode)
|
||||||
|
{
|
||||||
|
if (aNode.nodeType != aNode.ELEMENT_NODE) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
let nodeName = aNode.nodeName.toLowerCase();
|
||||||
|
return !INSPECTOR_INVISIBLE_ELEMENTS[nodeName];
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* Build the veil:
|
||||||
|
*
|
||||||
|
* <vbox id="highlighter-veil-container">
|
||||||
|
* <box id="highlighter-veil-topbox" class="highlighter-veil"/>
|
||||||
|
* <hbox id="highlighter-veil-middlebox">
|
||||||
|
* <box id="highlighter-veil-leftbox" class="highlighter-veil"/>
|
||||||
|
* <box id="highlighter-veil-transparentbox"/>
|
||||||
|
* <box id="highlighter-veil-rightbox" class="highlighter-veil"/>
|
||||||
|
* </hbox>
|
||||||
|
* <box id="highlighter-veil-bottombox" class="highlighter-veil"/>
|
||||||
|
* </vbox>
|
||||||
|
*
|
||||||
|
* @param nsIDOMElement aParent
|
||||||
|
* The container of the veil boxes.
|
||||||
|
*/
|
||||||
|
|
||||||
|
buildVeil: function Highlighter_buildVeil(aParent)
|
||||||
|
{
|
||||||
|
// We will need to resize these boxes to surround a node.
|
||||||
|
// See highlightRectangle().
|
||||||
|
|
||||||
|
this.veilTopBox = this.chromeDoc.createElement("box");
|
||||||
|
this.veilTopBox.id = "highlighter-veil-topbox";
|
||||||
|
this.veilTopBox.className = "highlighter-veil";
|
||||||
|
|
||||||
|
this.veilMiddleBox = this.chromeDoc.createElement("hbox");
|
||||||
|
this.veilMiddleBox.id = "highlighter-veil-middlebox";
|
||||||
|
|
||||||
|
this.veilLeftBox = this.chromeDoc.createElement("box");
|
||||||
|
this.veilLeftBox.id = "highlighter-veil-leftbox";
|
||||||
|
this.veilLeftBox.className = "highlighter-veil";
|
||||||
|
|
||||||
|
this.veilTransparentBox = this.chromeDoc.createElement("box");
|
||||||
|
this.veilTransparentBox.id = "highlighter-veil-transparentbox";
|
||||||
|
|
||||||
|
// We don't need any references to veilRightBox and veilBottomBox.
|
||||||
|
// These boxes are automatically resized (flex=1)
|
||||||
|
|
||||||
|
let veilRightBox = this.chromeDoc.createElement("box");
|
||||||
|
veilRightBox.id = "highlighter-veil-rightbox";
|
||||||
|
veilRightBox.className = "highlighter-veil";
|
||||||
|
|
||||||
|
let veilBottomBox = this.chromeDoc.createElement("box");
|
||||||
|
veilBottomBox.id = "highlighter-veil-bottombox";
|
||||||
|
veilBottomBox.className = "highlighter-veil";
|
||||||
|
|
||||||
|
this.veilMiddleBox.appendChild(this.veilLeftBox);
|
||||||
|
this.veilMiddleBox.appendChild(this.veilTransparentBox);
|
||||||
|
this.veilMiddleBox.appendChild(veilRightBox);
|
||||||
|
|
||||||
|
aParent.appendChild(this.veilTopBox);
|
||||||
|
aParent.appendChild(this.veilMiddleBox);
|
||||||
|
aParent.appendChild(veilBottomBox);
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Build the node Infobar.
|
||||||
|
*
|
||||||
|
* <box id="highlighter-nodeinfobar-container">
|
||||||
|
* <box id="Highlighter-nodeinfobar-arrow-top"/>
|
||||||
|
* <vbox id="highlighter-nodeinfobar">
|
||||||
|
* <label id="highlighter-nodeinfobar-tagname"/>
|
||||||
|
* <label id="highlighter-nodeinfobar-id"/>
|
||||||
|
* <vbox id="highlighter-nodeinfobar-classes"/>
|
||||||
|
* </vbox>
|
||||||
|
* <box id="Highlighter-nodeinfobar-arrow-bottom"/>
|
||||||
|
* </box>
|
||||||
|
*
|
||||||
|
* @param nsIDOMElement aParent
|
||||||
|
* The container of the infobar.
|
||||||
|
*/
|
||||||
|
buildInfobar: function Highlighter_buildInfobar(aParent)
|
||||||
|
{
|
||||||
|
let container = this.chromeDoc.createElement("box");
|
||||||
|
container.id = "highlighter-nodeinfobar-container";
|
||||||
|
container.setAttribute("position", "top");
|
||||||
|
container.setAttribute("disabled", "true");
|
||||||
|
|
||||||
|
let nodeInfobar = this.chromeDoc.createElement("hbox");
|
||||||
|
nodeInfobar.id = "highlighter-nodeinfobar";
|
||||||
|
|
||||||
|
let arrowBoxTop = this.chromeDoc.createElement("box");
|
||||||
|
arrowBoxTop.className = "highlighter-nodeinfobar-arrow";
|
||||||
|
arrowBoxTop.id = "highlighter-nodeinfobar-arrow-top";
|
||||||
|
|
||||||
|
let arrowBoxBottom = this.chromeDoc.createElement("box");
|
||||||
|
arrowBoxBottom.className = "highlighter-nodeinfobar-arrow";
|
||||||
|
arrowBoxBottom.id = "highlighter-nodeinfobar-arrow-bottom";
|
||||||
|
|
||||||
|
let tagNameLabel = this.chromeDoc.createElement("label");
|
||||||
|
tagNameLabel.id = "highlighter-nodeinfobar-tagname";
|
||||||
|
tagNameLabel.className = "plain";
|
||||||
|
|
||||||
|
let idLabel = this.chromeDoc.createElement("label");
|
||||||
|
idLabel.id = "highlighter-nodeinfobar-id";
|
||||||
|
idLabel.className = "plain";
|
||||||
|
|
||||||
|
let classesBox = this.chromeDoc.createElement("hbox");
|
||||||
|
classesBox.id = "highlighter-nodeinfobar-classes";
|
||||||
|
|
||||||
|
nodeInfobar.appendChild(tagNameLabel);
|
||||||
|
nodeInfobar.appendChild(idLabel);
|
||||||
|
nodeInfobar.appendChild(classesBox);
|
||||||
|
container.appendChild(arrowBoxTop);
|
||||||
|
container.appendChild(nodeInfobar);
|
||||||
|
container.appendChild(arrowBoxBottom);
|
||||||
|
|
||||||
|
aParent.appendChild(container);
|
||||||
|
|
||||||
|
let barHeight = container.getBoundingClientRect().height;
|
||||||
|
|
||||||
|
this.nodeInfo = {
|
||||||
|
tagNameLabel: tagNameLabel,
|
||||||
|
idLabel: idLabel,
|
||||||
|
classesBox: classesBox,
|
||||||
|
container: container,
|
||||||
|
barHeight: barHeight,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Highlight a rectangular region.
|
||||||
|
*
|
||||||
|
* @param object aRect
|
||||||
|
* The rectangle region to highlight.
|
||||||
|
* @returns boolean
|
||||||
|
* True if the rectangle was highlighted, false otherwise.
|
||||||
|
*/
|
||||||
|
highlightRectangle: function Highlighter_highlightRectangle(aRect)
|
||||||
|
{
|
||||||
|
if (!aRect) {
|
||||||
|
this.unhighlight();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let oldRect = this._contentRect;
|
||||||
|
|
||||||
|
if (oldRect && aRect.top == oldRect.top && aRect.left == oldRect.left &&
|
||||||
|
aRect.width == oldRect.width && aRect.height == oldRect.height) {
|
||||||
|
return; // same rectangle
|
||||||
|
}
|
||||||
|
|
||||||
|
let aRectScaled = LayoutHelpers.getZoomedRect(this.win, aRect);
|
||||||
|
|
||||||
|
if (aRectScaled.left >= 0 && aRectScaled.top >= 0 &&
|
||||||
|
aRectScaled.width > 0 && aRectScaled.height > 0) {
|
||||||
|
|
||||||
|
this.veilTransparentBox.style.visibility = "visible";
|
||||||
|
|
||||||
|
// The bottom div and the right div are flexibles (flex=1).
|
||||||
|
// We don't need to resize them.
|
||||||
|
this.veilTopBox.style.height = aRectScaled.top + "px";
|
||||||
|
this.veilLeftBox.style.width = aRectScaled.left + "px";
|
||||||
|
this.veilMiddleBox.style.height = aRectScaled.height + "px";
|
||||||
|
this.veilTransparentBox.style.width = aRectScaled.width + "px";
|
||||||
|
|
||||||
|
this._highlighting = true;
|
||||||
|
} else {
|
||||||
|
this.unhighlight();
|
||||||
|
}
|
||||||
|
|
||||||
|
this._contentRect = aRect; // save orig (non-scaled) rect
|
||||||
|
this._highlightRect = aRectScaled; // and save the scaled rect.
|
||||||
|
|
||||||
|
return;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear the highlighter surface.
|
||||||
|
*/
|
||||||
|
unhighlight: function Highlighter_unhighlight()
|
||||||
|
{
|
||||||
|
this._highlighting = false;
|
||||||
|
this.veilMiddleBox.style.height = 0;
|
||||||
|
this.veilTransparentBox.style.width = 0;
|
||||||
|
this.veilTransparentBox.style.visibility = "hidden";
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update node information (tagName#id.class)
|
||||||
|
*/
|
||||||
|
updateInfobar: function Highlighter_updateInfobar()
|
||||||
|
{
|
||||||
|
// Tag name
|
||||||
|
this.nodeInfo.tagNameLabel.textContent = this.node.tagName;
|
||||||
|
|
||||||
|
// ID
|
||||||
|
this.nodeInfo.idLabel.textContent = this.node.id ? "#" + this.node.id : "";
|
||||||
|
|
||||||
|
// Classes
|
||||||
|
let classes = this.nodeInfo.classesBox;
|
||||||
|
while (classes.hasChildNodes()) {
|
||||||
|
classes.removeChild(classes.firstChild);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.node.className) {
|
||||||
|
let fragment = this.chromeDoc.createDocumentFragment();
|
||||||
|
for (let i = 0; i < this.node.classList.length; i++) {
|
||||||
|
let classLabel = this.chromeDoc.createElement("label");
|
||||||
|
classLabel.className = "highlighter-nodeinfobar-class plain";
|
||||||
|
classLabel.textContent = "." + this.node.classList[i];
|
||||||
|
fragment.appendChild(classLabel);
|
||||||
|
}
|
||||||
|
classes.appendChild(fragment);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Move the Infobar to the right place in the highlighter.
|
||||||
|
*/
|
||||||
|
moveInfobar: function Highlighter_moveInfobar()
|
||||||
|
{
|
||||||
|
if (this._highlightRect) {
|
||||||
|
let winHeight = this.win.innerHeight * this.zoom;
|
||||||
|
let winWidth = this.win.innerWidth * this.zoom;
|
||||||
|
|
||||||
|
let rect = {top: this._highlightRect.top,
|
||||||
|
left: this._highlightRect.left,
|
||||||
|
width: this._highlightRect.width,
|
||||||
|
height: this._highlightRect.height};
|
||||||
|
|
||||||
|
rect.top = Math.max(rect.top, 0);
|
||||||
|
rect.left = Math.max(rect.left, 0);
|
||||||
|
rect.width = Math.max(rect.width, 0);
|
||||||
|
rect.height = Math.max(rect.height, 0);
|
||||||
|
|
||||||
|
rect.top = Math.min(rect.top, winHeight);
|
||||||
|
rect.left = Math.min(rect.left, winWidth);
|
||||||
|
|
||||||
|
this.nodeInfo.container.removeAttribute("disabled");
|
||||||
|
// Can the bar be above the node?
|
||||||
|
if (rect.top < this.nodeInfo.barHeight) {
|
||||||
|
// No. Can we move the toolbar under the node?
|
||||||
|
if (rect.top + rect.height +
|
||||||
|
this.nodeInfo.barHeight > winHeight) {
|
||||||
|
// No. Let's move it inside.
|
||||||
|
this.nodeInfo.container.style.top = rect.top + "px";
|
||||||
|
this.nodeInfo.container.setAttribute("position", "overlap");
|
||||||
|
} else {
|
||||||
|
// Yes. Let's move it under the node.
|
||||||
|
this.nodeInfo.container.style.top = rect.top + rect.height + "px";
|
||||||
|
this.nodeInfo.container.setAttribute("position", "bottom");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Yes. Let's move it on top of the node.
|
||||||
|
this.nodeInfo.container.style.top =
|
||||||
|
rect.top - this.nodeInfo.barHeight + "px";
|
||||||
|
this.nodeInfo.container.setAttribute("position", "top");
|
||||||
|
}
|
||||||
|
|
||||||
|
let barWidth = this.nodeInfo.container.getBoundingClientRect().width;
|
||||||
|
let left = rect.left + rect.width / 2 - barWidth / 2;
|
||||||
|
|
||||||
|
// Make sure the whole infobar is visible
|
||||||
|
if (left < 0) {
|
||||||
|
left = 0;
|
||||||
|
this.nodeInfo.container.setAttribute("hide-arrow", "true");
|
||||||
|
} else {
|
||||||
|
if (left + barWidth > winWidth) {
|
||||||
|
left = winWidth - barWidth;
|
||||||
|
this.nodeInfo.container.setAttribute("hide-arrow", "true");
|
||||||
|
} else {
|
||||||
|
this.nodeInfo.container.removeAttribute("hide-arrow");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.nodeInfo.container.style.left = left + "px";
|
||||||
|
} else {
|
||||||
|
this.nodeInfo.container.style.left = "0";
|
||||||
|
this.nodeInfo.container.style.top = "0";
|
||||||
|
this.nodeInfo.container.setAttribute("position", "top");
|
||||||
|
this.nodeInfo.container.setAttribute("hide-arrow", "true");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Store page zoom factor.
|
||||||
|
*/
|
||||||
|
computeZoomFactor: function Highlighter_computeZoomFactor() {
|
||||||
|
this.zoom =
|
||||||
|
this.win.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
|
||||||
|
.getInterface(Components.interfaces.nsIDOMWindowUtils)
|
||||||
|
.screenPixelsPerCSSPixel;
|
||||||
|
},
|
||||||
|
|
||||||
|
/////////////////////////////////////////////////////////////////////////
|
||||||
|
//// Event Emitter Mechanism
|
||||||
|
|
||||||
|
addListener: function Highlighter_addListener(aEvent, aListener)
|
||||||
|
{
|
||||||
|
if (!(aEvent in this.events))
|
||||||
|
this.events[aEvent] = [];
|
||||||
|
this.events[aEvent].push(aListener);
|
||||||
|
},
|
||||||
|
|
||||||
|
removeListener: function Highlighter_removeListener(aEvent, aListener)
|
||||||
|
{
|
||||||
|
if (!(aEvent in this.events))
|
||||||
|
return;
|
||||||
|
let idx = this.events[aEvent].indexOf(aListener);
|
||||||
|
if (idx > -1)
|
||||||
|
this.events[aEvent].splice(idx, 1);
|
||||||
|
},
|
||||||
|
|
||||||
|
emitEvent: function Highlighter_emitEvent(aEvent, aArgv)
|
||||||
|
{
|
||||||
|
if (!(aEvent in this.events))
|
||||||
|
return;
|
||||||
|
|
||||||
|
let listeners = this.events[aEvent];
|
||||||
|
let highlighter = this;
|
||||||
|
listeners.forEach(function(aListener) {
|
||||||
|
try {
|
||||||
|
aListener.apply(highlighter, aArgv);
|
||||||
|
} catch(e) {}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
removeAllListeners: function Highlighter_removeAllIsteners()
|
||||||
|
{
|
||||||
|
for (let event in this.events) {
|
||||||
|
delete this.events[event];
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/////////////////////////////////////////////////////////////////////////
|
||||||
|
//// Event Handling
|
||||||
|
|
||||||
|
attachMouseListeners: function Highlighter_attachMouseListeners()
|
||||||
|
{
|
||||||
|
this.browser.addEventListener("mousemove", this, true);
|
||||||
|
this.browser.addEventListener("click", this, true);
|
||||||
|
this.browser.addEventListener("dblclick", this, true);
|
||||||
|
this.browser.addEventListener("mousedown", this, true);
|
||||||
|
this.browser.addEventListener("mouseup", this, true);
|
||||||
|
},
|
||||||
|
|
||||||
|
detachMouseListeners: function Highlighter_detachMouseListeners()
|
||||||
|
{
|
||||||
|
this.browser.removeEventListener("mousemove", this, true);
|
||||||
|
this.browser.removeEventListener("click", this, true);
|
||||||
|
this.browser.removeEventListener("dblclick", this, true);
|
||||||
|
this.browser.removeEventListener("mousedown", this, true);
|
||||||
|
this.browser.removeEventListener("mouseup", this, true);
|
||||||
|
},
|
||||||
|
|
||||||
|
attachPageListeners: function Highlighter_attachPageListeners()
|
||||||
|
{
|
||||||
|
this.browser.addEventListener("resize", this, true);
|
||||||
|
this.browser.addEventListener("scroll", this, true);
|
||||||
|
},
|
||||||
|
|
||||||
|
detachPageListeners: function Highlighter_detachPageListeners()
|
||||||
|
{
|
||||||
|
this.browser.removeEventListener("resize", this, true);
|
||||||
|
this.browser.removeEventListener("scroll", this, true);
|
||||||
|
},
|
||||||
|
|
||||||
|
attachKeysListeners: function Highlighter_attachKeysListeners()
|
||||||
|
{
|
||||||
|
this.browser.addEventListener("keypress", this, true);
|
||||||
|
this.highlighterContainer.addEventListener("keypress", this, true);
|
||||||
|
},
|
||||||
|
|
||||||
|
detachKeysListeners: function Highlighter_detachKeysListeners()
|
||||||
|
{
|
||||||
|
this.browser.removeEventListener("keypress", this, true);
|
||||||
|
this.highlighterContainer.removeEventListener("keypress", this, true);
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generic event handler.
|
||||||
|
*
|
||||||
|
* @param nsIDOMEvent aEvent
|
||||||
|
* The DOM event object.
|
||||||
|
*/
|
||||||
|
handleEvent: function Highlighter_handleEvent(aEvent)
|
||||||
|
{
|
||||||
|
switch (aEvent.type) {
|
||||||
|
case "click":
|
||||||
|
this.handleClick(aEvent);
|
||||||
|
break;
|
||||||
|
case "mousemove":
|
||||||
|
this.handleMouseMove(aEvent);
|
||||||
|
break;
|
||||||
|
case "resize":
|
||||||
|
case "scroll":
|
||||||
|
this.computeZoomFactor();
|
||||||
|
this.brieflyDisableTransitions();
|
||||||
|
this.invalidateSize();
|
||||||
|
break;
|
||||||
|
case "dblclick":
|
||||||
|
case "mousedown":
|
||||||
|
case "mouseup":
|
||||||
|
aEvent.stopPropagation();
|
||||||
|
aEvent.preventDefault();
|
||||||
|
break;
|
||||||
|
break;
|
||||||
|
case "keypress":
|
||||||
|
switch (aEvent.keyCode) {
|
||||||
|
case this.chromeWin.KeyEvent.DOM_VK_RETURN:
|
||||||
|
this.locked ? this.unlock() : this.lock();
|
||||||
|
aEvent.preventDefault();
|
||||||
|
aEvent.stopPropagation();
|
||||||
|
break;
|
||||||
|
case this.chromeWin.KeyEvent.DOM_VK_LEFT:
|
||||||
|
let node;
|
||||||
|
if (this.node) {
|
||||||
|
node = this.node.parentNode;
|
||||||
|
} else {
|
||||||
|
node = this.defaultSelection;
|
||||||
|
}
|
||||||
|
if (node && this.isNodeHighlightable(node)) {
|
||||||
|
this.highlight(node);
|
||||||
|
}
|
||||||
|
aEvent.preventDefault();
|
||||||
|
aEvent.stopPropagation();
|
||||||
|
break;
|
||||||
|
case this.chromeWin.KeyEvent.DOM_VK_RIGHT:
|
||||||
|
if (this.node) {
|
||||||
|
// Find the first child that is highlightable.
|
||||||
|
for (let i = 0; i < this.node.childNodes.length; i++) {
|
||||||
|
node = this.node.childNodes[i];
|
||||||
|
if (node && this.isNodeHighlightable(node)) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
node = this.defaultSelection;
|
||||||
|
}
|
||||||
|
if (node && this.isNodeHighlightable(node)) {
|
||||||
|
this.highlight(node, true);
|
||||||
|
}
|
||||||
|
aEvent.preventDefault();
|
||||||
|
aEvent.stopPropagation();
|
||||||
|
break;
|
||||||
|
case this.chromeWin.KeyEvent.DOM_VK_UP:
|
||||||
|
if (this.node) {
|
||||||
|
// Find a previous sibling that is highlightable.
|
||||||
|
node = this.node.previousSibling;
|
||||||
|
while (node && !this.isNodeHighlightable(node)) {
|
||||||
|
node = node.previousSibling;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
node = this.defaultSelection;
|
||||||
|
}
|
||||||
|
if (node && this.isNodeHighlightable(node)) {
|
||||||
|
this.highlight(node, true);
|
||||||
|
}
|
||||||
|
aEvent.preventDefault();
|
||||||
|
aEvent.stopPropagation();
|
||||||
|
break;
|
||||||
|
case this.chromeWin.KeyEvent.DOM_VK_DOWN:
|
||||||
|
if (this.node) {
|
||||||
|
// Find a next sibling that is highlightable.
|
||||||
|
node = this.node.nextSibling;
|
||||||
|
while (node && !this.isNodeHighlightable(node)) {
|
||||||
|
node = node.nextSibling;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
node = this.defaultSelection;
|
||||||
|
}
|
||||||
|
if (node && this.isNodeHighlightable(node)) {
|
||||||
|
this.highlight(node, true);
|
||||||
|
}
|
||||||
|
aEvent.preventDefault();
|
||||||
|
aEvent.stopPropagation();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Disable the CSS transitions for a short time to avoid laggy animations
|
||||||
|
* during scrolling or resizing.
|
||||||
|
*/
|
||||||
|
brieflyDisableTransitions: function Highlighter_brieflyDisableTransitions()
|
||||||
|
{
|
||||||
|
if (this.transitionDisabler) {
|
||||||
|
this.chromeWin.clearTimeout(this.transitionDisabler);
|
||||||
|
} else {
|
||||||
|
this.veilContainer.setAttribute("disable-transitions", "true");
|
||||||
|
this.nodeInfo.container.setAttribute("disable-transitions", "true");
|
||||||
|
}
|
||||||
|
this.transitionDisabler =
|
||||||
|
this.chromeWin.setTimeout(function() {
|
||||||
|
this.veilContainer.removeAttribute("disable-transitions");
|
||||||
|
this.nodeInfo.container.removeAttribute("disable-transitions");
|
||||||
|
this.transitionDisabler = null;
|
||||||
|
}.bind(this), 500);
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle clicks.
|
||||||
|
*
|
||||||
|
* @param nsIDOMEvent aEvent
|
||||||
|
* The DOM event.
|
||||||
|
*/
|
||||||
|
handleClick: function Highlighter_handleClick(aEvent)
|
||||||
|
{
|
||||||
|
// Stop inspection when the user clicks on a node.
|
||||||
|
if (aEvent.button == 0) {
|
||||||
|
let win = aEvent.target.ownerDocument.defaultView;
|
||||||
|
this.lock();
|
||||||
|
win.focus();
|
||||||
|
}
|
||||||
|
aEvent.preventDefault();
|
||||||
|
aEvent.stopPropagation();
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle mousemoves in panel.
|
||||||
|
*
|
||||||
|
* @param nsiDOMEvent aEvent
|
||||||
|
* The MouseEvent triggering the method.
|
||||||
|
*/
|
||||||
|
handleMouseMove: function Highlighter_handleMouseMove(aEvent)
|
||||||
|
{
|
||||||
|
let element = LayoutHelpers.getElementFromPoint(aEvent.target.ownerDocument,
|
||||||
|
aEvent.clientX, aEvent.clientY);
|
||||||
|
if (element && element != this.node) {
|
||||||
|
this.highlight(element);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -66,9 +66,10 @@ _BROWSER_FILES = \
|
||||||
browser_inspector_breadcrumbs.html \
|
browser_inspector_breadcrumbs.html \
|
||||||
browser_inspector_breadcrumbs.js \
|
browser_inspector_breadcrumbs.js \
|
||||||
browser_inspector_bug_699308_iframe_navigation.js \
|
browser_inspector_bug_699308_iframe_navigation.js \
|
||||||
browser_inspector_changes.js \
|
browser_inspector_changes.js \
|
||||||
browser_inspector_ruleviewstore.js \
|
browser_inspector_ruleviewstore.js \
|
||||||
browser_inspector_duplicate_ruleview.js \
|
browser_inspector_duplicate_ruleview.js \
|
||||||
|
head.js \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
# Disabled due to constant failures
|
# Disabled due to constant failures
|
||||||
|
|
|
||||||
|
|
@ -48,9 +48,7 @@ function test()
|
||||||
|
|
||||||
cursor = 0;
|
cursor = 0;
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
Services.obs.addObserver(nodeSelected,
|
InspectorUI.highlighter.addListener("nodeselected", nodeSelected);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
|
|
||||||
InspectorUI.inspectNode(nodes[0].node);
|
InspectorUI.inspectNode(nodes[0].node);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -62,8 +60,7 @@ function test()
|
||||||
cursor++;
|
cursor++;
|
||||||
if (cursor >= nodes.length) {
|
if (cursor >= nodes.length) {
|
||||||
|
|
||||||
Services.obs.removeObserver(nodeSelected,
|
InspectorUI.highlighter.removeListener("nodeselected", nodeSelected);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
|
||||||
Services.obs.addObserver(finishUp,
|
Services.obs.addObserver(finishUp,
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
|
InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -34,8 +34,7 @@ function test()
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
|
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
|
||||||
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
Services.obs.addObserver(performTestComparison,
|
InspectorUI.highlighter.addListener("nodeselected", performTestComparison);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
|
|
||||||
InspectorUI.inspectNode(objectNode);
|
InspectorUI.inspectNode(objectNode);
|
||||||
});
|
});
|
||||||
|
|
@ -43,8 +42,7 @@ function test()
|
||||||
|
|
||||||
function performTestComparison()
|
function performTestComparison()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(performTestComparison,
|
InspectorUI.highlighter.removeListener("nodeselected", performTestComparison);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
|
||||||
|
|
||||||
is(InspectorUI.selection, objectNode, "selection matches node");
|
is(InspectorUI.selection, objectNode, "selection matches node");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,9 +38,7 @@ function test()
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
|
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
|
||||||
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
Services.obs.addObserver(highlightBodyNode,
|
InspectorUI.highlighter.addListener("nodeselected", highlightBodyNode);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING,
|
|
||||||
false);
|
|
||||||
// Test that navigating around without a selected node gets us to the
|
// Test that navigating around without a selected node gets us to the
|
||||||
// body element.
|
// body element.
|
||||||
node = doc.querySelector("body");
|
node = doc.querySelector("body");
|
||||||
|
|
@ -50,14 +48,11 @@ function test()
|
||||||
|
|
||||||
function highlightBodyNode()
|
function highlightBodyNode()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(highlightBodyNode,
|
InspectorUI.highlighter.removeListener("nodeselected", highlightBodyNode);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
|
||||||
is(InspectorUI.selection, node, "selected body element");
|
is(InspectorUI.selection, node, "selected body element");
|
||||||
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
Services.obs.addObserver(highlightHeaderNode,
|
InspectorUI.highlighter.addListener("nodeselected", highlightHeaderNode);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING,
|
|
||||||
false);
|
|
||||||
// Test that moving to the child works.
|
// Test that moving to the child works.
|
||||||
node = doc.querySelector("h1");
|
node = doc.querySelector("h1");
|
||||||
EventUtils.synthesizeKey("VK_RIGHT", { });
|
EventUtils.synthesizeKey("VK_RIGHT", { });
|
||||||
|
|
@ -66,14 +61,11 @@ function test()
|
||||||
|
|
||||||
function highlightHeaderNode()
|
function highlightHeaderNode()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(highlightHeaderNode,
|
InspectorUI.highlighter.removeListener("nodeselected", highlightHeaderNode);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
|
||||||
is(InspectorUI.selection, node, "selected h1 element");
|
is(InspectorUI.selection, node, "selected h1 element");
|
||||||
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
Services.obs.addObserver(highlightParagraphNode,
|
InspectorUI.highlighter.addListener("nodeselected", highlightParagraphNode);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING,
|
|
||||||
false);
|
|
||||||
// Test that moving to the next sibling works.
|
// Test that moving to the next sibling works.
|
||||||
node = doc.querySelector("p");
|
node = doc.querySelector("p");
|
||||||
EventUtils.synthesizeKey("VK_DOWN", { });
|
EventUtils.synthesizeKey("VK_DOWN", { });
|
||||||
|
|
@ -82,14 +74,11 @@ function test()
|
||||||
|
|
||||||
function highlightParagraphNode()
|
function highlightParagraphNode()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(highlightParagraphNode,
|
InspectorUI.highlighter.removeListener("nodeselected", highlightParagraphNode);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
|
||||||
is(InspectorUI.selection, node, "selected p element");
|
is(InspectorUI.selection, node, "selected p element");
|
||||||
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
Services.obs.addObserver(highlightHeaderNodeAgain,
|
InspectorUI.highlighter.addListener("nodeselected", highlightHeaderNodeAgain);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING,
|
|
||||||
false);
|
|
||||||
// Test that moving to the previous sibling works.
|
// Test that moving to the previous sibling works.
|
||||||
node = doc.querySelector("h1");
|
node = doc.querySelector("h1");
|
||||||
EventUtils.synthesizeKey("VK_UP", { });
|
EventUtils.synthesizeKey("VK_UP", { });
|
||||||
|
|
@ -98,14 +87,11 @@ function test()
|
||||||
|
|
||||||
function highlightHeaderNodeAgain()
|
function highlightHeaderNodeAgain()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(highlightHeaderNodeAgain,
|
InspectorUI.highlighter.removeListener("nodeselected", highlightHeaderNodeAgain);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
|
||||||
is(InspectorUI.selection, node, "selected h1 element");
|
is(InspectorUI.selection, node, "selected h1 element");
|
||||||
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
Services.obs.addObserver(highlightParentNode,
|
InspectorUI.highlighter.addListener("nodeselected", highlightParentNode);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING,
|
|
||||||
false);
|
|
||||||
// Test that moving to the parent works.
|
// Test that moving to the parent works.
|
||||||
node = doc.querySelector("body");
|
node = doc.querySelector("body");
|
||||||
EventUtils.synthesizeKey("VK_LEFT", { });
|
EventUtils.synthesizeKey("VK_LEFT", { });
|
||||||
|
|
@ -114,8 +100,7 @@ function test()
|
||||||
|
|
||||||
function highlightParentNode()
|
function highlightParentNode()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(highlightParentNode,
|
InspectorUI.highlighter.removeListener("nodeselected", highlightParentNode);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
|
||||||
is(InspectorUI.selection, node, "selected body element");
|
is(InspectorUI.selection, node, "selected body element");
|
||||||
|
|
||||||
// Test that locking works.
|
// Test that locking works.
|
||||||
|
|
|
||||||
|
|
@ -57,8 +57,7 @@ function test()
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
|
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
|
||||||
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
Services.obs.addObserver(isTheIframeSelected,
|
InspectorUI.highlighter.addListener("nodeselected", isTheIframeSelected);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
|
|
||||||
moveMouseOver(iframeNode, 1, 1);
|
moveMouseOver(iframeNode, 1, 1);
|
||||||
});
|
});
|
||||||
|
|
@ -66,26 +65,21 @@ function test()
|
||||||
|
|
||||||
function isTheIframeSelected()
|
function isTheIframeSelected()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(isTheIframeSelected,
|
InspectorUI.highlighter.removeListener("nodeselected", isTheIframeSelected);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
|
||||||
|
|
||||||
is(InspectorUI.selection, iframeNode, "selection matches node");
|
is(InspectorUI.selection, iframeNode, "selection matches node");
|
||||||
iframeNode.style.marginBottom = doc.defaultView.innerHeight + "px";
|
iframeNode.style.marginBottom = doc.defaultView.innerHeight + "px";
|
||||||
doc.defaultView.scrollBy(0, 40);
|
doc.defaultView.scrollBy(0, 40);
|
||||||
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
Services.obs.addObserver(isTheIframeContentSelected,
|
InspectorUI.highlighter.addListener("nodeselected", isTheIframeContentSelected);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
|
|
||||||
moveMouseOver(iframeNode, 40, 40);
|
moveMouseOver(iframeNode, 40, 40);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function isTheIframeContentSelected()
|
function isTheIframeContentSelected()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(isTheIframeContentSelected,
|
InspectorUI.highlighter.removeListener("nodeselected", isTheIframeContentSelected);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
|
||||||
|
|
||||||
is(InspectorUI.selection, iframeBodyNode, "selection matches node");
|
is(InspectorUI.selection, iframeBodyNode, "selection matches node");
|
||||||
// 184 == 200 + 11(border) + 13(padding) - 40(scroll)
|
// 184 == 200 + 11(border) + 13(padding) - 40(scroll)
|
||||||
is(InspectorUI.highlighter._highlightRect.height, 184,
|
is(InspectorUI.highlighter._highlightRect.height, 184,
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ function runEditorTests()
|
||||||
function highlighterTrap()
|
function highlighterTrap()
|
||||||
{
|
{
|
||||||
// bug 696107
|
// bug 696107
|
||||||
Services.obs.removeObserver(highlighterTrap, InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
InspectorUI.highlighter.removeListener("nodeselected", highlighterTrap);
|
||||||
ok(false, "Highlighter moved. Shouldn't be here!");
|
ok(false, "Highlighter moved. Shouldn't be here!");
|
||||||
finishUp();
|
finishUp();
|
||||||
}
|
}
|
||||||
|
|
@ -115,8 +115,7 @@ function doEditorTestSteps()
|
||||||
editorInput.value = "Hello World";
|
editorInput.value = "Hello World";
|
||||||
editorInput.focus();
|
editorInput.focus();
|
||||||
|
|
||||||
Services.obs.addObserver(highlighterTrap,
|
InspectorUI.highlighter.addListener("nodeselected", highlighterTrap);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
|
|
||||||
// hit <enter> to save the textbox value
|
// hit <enter> to save the textbox value
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
|
|
@ -130,7 +129,7 @@ function doEditorTestSteps()
|
||||||
yield; // End of Step 2
|
yield; // End of Step 2
|
||||||
|
|
||||||
// remove this from previous step
|
// remove this from previous step
|
||||||
Services.obs.removeObserver(highlighterTrap, InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
InspectorUI.highlighter.removeListener("nodeselected", highlighterTrap);
|
||||||
|
|
||||||
// Step 3: validate that the previous editing session saved correctly, then open editor on `class` attribute value
|
// Step 3: validate that the previous editing session saved correctly, then open editor on `class` attribute value
|
||||||
ok(!treePanel.editingContext, "Step 3: editor session ended");
|
ok(!treePanel.editingContext, "Step 3: editor session ended");
|
||||||
|
|
|
||||||
|
|
@ -103,37 +103,33 @@ function runSelectionTests(subject)
|
||||||
"InspectorUI accessible in the observer");
|
"InspectorUI accessible in the observer");
|
||||||
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
Services.obs.addObserver(performTestComparisons,
|
InspectorUI.highlighter.addListener("nodeselected", performTestComparisons);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
EventUtils.synthesizeMouse(h1, 2, 2, {type: "mousemove"}, content);
|
EventUtils.synthesizeMouse(h1, 2, 2, {type: "mousemove"}, content);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function performTestComparisons(evt)
|
function performTestComparisons(evt)
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(performTestComparisons,
|
InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
|
||||||
|
|
||||||
InspectorUI.stopInspecting();
|
InspectorUI.stopInspecting();
|
||||||
ok(InspectorUI.highlighter.isHighlighting, "highlighter is highlighting");
|
ok(isHighlighting(), "highlighter is highlighting");
|
||||||
is(InspectorUI.highlighter.highlitNode, h1, "highlighter matches selection")
|
is(getHighlitNode(), h1, "highlighter matches selection")
|
||||||
is(InspectorUI.selection, h1, "selection matches node");
|
is(InspectorUI.selection, h1, "selection matches node");
|
||||||
is(InspectorUI.selection, InspectorUI.highlighter.highlitNode, "selection matches highlighter");
|
is(InspectorUI.selection, getHighlitNode(), "selection matches highlighter");
|
||||||
|
|
||||||
|
|
||||||
div = doc.querySelector("div#checkOutThisWickedSpread");
|
div = doc.querySelector("div#checkOutThisWickedSpread");
|
||||||
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
Services.obs.addObserver(finishTestComparisons,
|
InspectorUI.highlighter.addListener("nodeselected", finishTestComparisons);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
InspectorUI.inspectNode(div);
|
InspectorUI.inspectNode(div);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function finishTestComparisons()
|
function finishTestComparisons()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(finishTestComparisons,
|
InspectorUI.highlighter.removeListener("nodeselected", finishTestComparisons);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
|
||||||
|
|
||||||
// get dimensions of div element
|
// get dimensions of div element
|
||||||
let divDims = div.getBoundingClientRect();
|
let divDims = div.getBoundingClientRect();
|
||||||
|
|
|
||||||
|
|
@ -95,34 +95,32 @@ function runIframeTests()
|
||||||
Services.obs.removeObserver(runIframeTests,
|
Services.obs.removeObserver(runIframeTests,
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
|
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
|
||||||
|
|
||||||
Services.obs.addObserver(performTestComparisons1,
|
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
|
|
||||||
executeSoon(moveMouseOver.bind(this, div1));
|
executeSoon(function() {
|
||||||
|
InspectorUI.highlighter.addListener("nodeselected", performTestComparisons1);
|
||||||
|
moveMouseOver(div1)
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function performTestComparisons1()
|
function performTestComparisons1()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(performTestComparisons1,
|
InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons1);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
|
|
||||||
is(InspectorUI.selection, div1, "selection matches div1 node");
|
is(InspectorUI.selection, div1, "selection matches div1 node");
|
||||||
is(InspectorUI.highlighter.highlitNode, div1, "highlighter matches selection");
|
is(getHighlitNode(), div1, "highlighter matches selection");
|
||||||
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
Services.obs.addObserver(performTestComparisons2,
|
InspectorUI.highlighter.addListener("nodeselected", performTestComparisons2);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
moveMouseOver(div2);
|
moveMouseOver(div2);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function performTestComparisons2()
|
function performTestComparisons2()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(performTestComparisons2,
|
InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons2);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
|
|
||||||
is(InspectorUI.selection, div2, "selection matches div2 node");
|
is(InspectorUI.selection, div2, "selection matches div2 node");
|
||||||
is(InspectorUI.highlighter.highlitNode, div2, "highlighter matches selection");
|
is(getHighlitNode(), div2, "highlighter matches selection");
|
||||||
|
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -172,7 +172,7 @@ function inspectNodesFromContextTestWhileOpen()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(inspectNodesFromContextTestWhileOpen, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
|
Services.obs.removeObserver(inspectNodesFromContextTestWhileOpen, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
|
||||||
Services.obs.addObserver(inspectNodesFromContextTestTrap, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
|
Services.obs.addObserver(inspectNodesFromContextTestTrap, InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
|
||||||
Services.obs.addObserver(inspectNodesFromContextTestHighlight, InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
InspectorUI.highlighter.addListener("nodeselected", inspectNodesFromContextTestHighlight);
|
||||||
is(InspectorUI.selection, salutation, "Inspector is highlighting salutation");
|
is(InspectorUI.selection, salutation, "Inspector is highlighting salutation");
|
||||||
closing = doc.getElementById("closing");
|
closing = doc.getElementById("closing");
|
||||||
ok(closing, "we have the closing statement");
|
ok(closing, "we have the closing statement");
|
||||||
|
|
@ -184,7 +184,7 @@ function inspectNodesFromContextTestWhileOpen()
|
||||||
function inspectNodesFromContextTestHighlight()
|
function inspectNodesFromContextTestHighlight()
|
||||||
{
|
{
|
||||||
winId = InspectorUI.winID;
|
winId = InspectorUI.winID;
|
||||||
Services.obs.removeObserver(inspectNodesFromContextTestHighlight, InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
InspectorUI.highlighter.removeListener("nodeselected", inspectNodesFromContextTestHighlight);
|
||||||
Services.obs.addObserver(finishInspectorTests, InspectorUI.INSPECTOR_NOTIFICATIONS.DESTROYED, false);
|
Services.obs.addObserver(finishInspectorTests, InspectorUI.INSPECTOR_NOTIFICATIONS.DESTROYED, false);
|
||||||
is(InspectorUI.selection, closing, "InspectorUI.selection is header");
|
is(InspectorUI.selection, closing, "InspectorUI.selection is header");
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
|
|
|
||||||
|
|
@ -32,18 +32,14 @@ function test()
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
|
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED);
|
||||||
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
Services.obs.addObserver(lockNode,
|
InspectorUI.highlighter.addListener("nodeselected", lockNode);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
|
|
||||||
InspectorUI.inspectNode(node);
|
InspectorUI.inspectNode(node);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function lockNode()
|
function lockNode()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(lockNode,
|
InspectorUI.highlighter.removeListener("nodeselected", lockNode);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
|
||||||
|
|
||||||
EventUtils.synthesizeKey("VK_RETURN", { });
|
EventUtils.synthesizeKey("VK_RETURN", { });
|
||||||
|
|
||||||
executeSoon(isTheNodeLocked);
|
executeSoon(isTheNodeLocked);
|
||||||
|
|
|
||||||
|
|
@ -96,13 +96,13 @@ function inspectorOpen()
|
||||||
toolsLength = InspectorUI.tools.length;
|
toolsLength = InspectorUI.tools.length;
|
||||||
toolEvents = InspectorUI.toolEvents.length;
|
toolEvents = InspectorUI.toolEvents.length;
|
||||||
info("tools registered");
|
info("tools registered");
|
||||||
Services.obs.addObserver(startToolTests, InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
InspectorUI.highlighter.addListener("nodeselected", startToolTests);
|
||||||
InspectorUI.inspectNode(h1);
|
InspectorUI.inspectNode(h1);
|
||||||
}
|
}
|
||||||
|
|
||||||
function startToolTests(evt)
|
function startToolTests(evt)
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(startToolTests, InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
InspectorUI.highlighter.removeListener("nodeselected", startToolTests);
|
||||||
InspectorUI.stopInspecting();
|
InspectorUI.stopInspecting();
|
||||||
info("Getting InspectorUI.tools");
|
info("Getting InspectorUI.tools");
|
||||||
let tools = InspectorUI.tools;
|
let tools = InspectorUI.tools;
|
||||||
|
|
|
||||||
|
|
@ -73,8 +73,8 @@ function inspectNode()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(inspectNode,
|
Services.obs.removeObserver(inspectNode,
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
|
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
|
||||||
Services.obs.addObserver(performScrollingTest,
|
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
InspectorUI.highlighter.addListener("nodeselected", performScrollingTest);
|
||||||
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
InspectorUI.inspectNode(div);
|
InspectorUI.inspectNode(div);
|
||||||
|
|
@ -83,12 +83,13 @@ function inspectNode()
|
||||||
|
|
||||||
function performScrollingTest()
|
function performScrollingTest()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(performScrollingTest,
|
InspectorUI.highlighter.removeListener("nodeselected", performScrollingTest);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
|
|
||||||
EventUtils.synthesizeMouseScroll(div, 10, 10,
|
executeSoon(function() {
|
||||||
{axis:"vertical", delta:50, type:"MozMousePixelScroll"},
|
EventUtils.synthesizeMouseScroll(div, 10, 10,
|
||||||
iframe.contentWindow);
|
{axis:"vertical", delta:50, type:"MozMousePixelScroll"},
|
||||||
|
iframe.contentWindow);
|
||||||
|
});
|
||||||
|
|
||||||
gBrowser.selectedBrowser.addEventListener("scroll", function() {
|
gBrowser.selectedBrowser.addEventListener("scroll", function() {
|
||||||
gBrowser.selectedBrowser.removeEventListener("scroll", arguments.callee,
|
gBrowser.selectedBrowser.removeEventListener("scroll", arguments.callee,
|
||||||
|
|
|
||||||
|
|
@ -34,24 +34,21 @@ function test() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function testNode1() {
|
function testNode1() {
|
||||||
dump("testNode1\n");
|
|
||||||
Services.obs.removeObserver(testNode1, InspectorUI.INSPECTOR_NOTIFICATIONS.TREEPANELREADY);
|
Services.obs.removeObserver(testNode1, InspectorUI.INSPECTOR_NOTIFICATIONS.TREEPANELREADY);
|
||||||
is(InspectorUI.selection, node1, "selection matches node");
|
is(InspectorUI.selection, node1, "selection matches node");
|
||||||
is(InspectorUI.highlighter.node, node1, "selection matches node");
|
is(getHighlitNode(), node1, "selection matches node");
|
||||||
testNode2();
|
testNode2();
|
||||||
}
|
}
|
||||||
|
|
||||||
function testNode2() {
|
function testNode2() {
|
||||||
dump("testNode2\n")
|
InspectorUI.highlighter.addListener("nodeselected", testHighlightingNode2);
|
||||||
Services.obs.addObserver(testHighlightingNode2, InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
InspectorUI.treePanelSelect("node2");
|
InspectorUI.treePanelSelect("node2");
|
||||||
}
|
}
|
||||||
|
|
||||||
function testHighlightingNode2() {
|
function testHighlightingNode2() {
|
||||||
dump("testHighlightingNode2\n")
|
InspectorUI.highlighter.removeListener("nodeselected", testHighlightingNode2);
|
||||||
Services.obs.removeObserver(testHighlightingNode2, InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING);
|
|
||||||
is(InspectorUI.selection, node2, "selection matches node");
|
is(InspectorUI.selection, node2, "selection matches node");
|
||||||
is(InspectorUI.highlighter.node, node2, "selection matches node");
|
is(getHighlitNode(), node2, "selection matches node");
|
||||||
Services.obs.addObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
|
Services.obs.addObserver(finishUp, InspectorUI.INSPECTOR_NOTIFICATIONS.CLOSED, false);
|
||||||
InspectorUI.closeInspectorUI();
|
InspectorUI.closeInspectorUI();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -76,21 +76,20 @@ function runSelectionTests()
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(runSelectionTests,
|
Services.obs.removeObserver(runSelectionTests,
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
|
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
|
||||||
Services.obs.addObserver(performTestComparisons,
|
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
|
InspectorUI.highlighter.addListener("nodeselected", performTestComparisons);
|
||||||
InspectorUI.inspectNode(h1);
|
InspectorUI.inspectNode(h1);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function performTestComparisons(evt)
|
function performTestComparisons(evt)
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(performTestComparisons,
|
InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
|
|
||||||
is(h1, InspectorUI.selection, "selection matches node");
|
is(h1, InspectorUI.selection, "selection matches node");
|
||||||
ok(InspectorUI.highlighter.isHighlighting, "highlighter is highlighting");
|
ok(isHighlighting(), "highlighter is highlighting");
|
||||||
is(InspectorUI.highlighter.highlitNode, h1, "highlighter highlighting correct node");
|
is(getHighlitNode(), h1, "highlighter highlighting correct node");
|
||||||
|
|
||||||
finishUp();
|
finishUp();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,78 @@
|
||||||
|
/* ***** BEGIN LICENSE BLOCK *****
|
||||||
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
*
|
||||||
|
* The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
* http://www.mozilla.org/MPL/
|
||||||
|
*
|
||||||
|
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
* for the specific language governing rights and limitations under the
|
||||||
|
* License.
|
||||||
|
*
|
||||||
|
* The Original Code is DevTools test code.
|
||||||
|
*
|
||||||
|
* The Initial Developer of the Original Code is
|
||||||
|
* The Mozilla Foundation.
|
||||||
|
*
|
||||||
|
* Portions created by the Initial Developer are Copyright (C) 2011
|
||||||
|
* the Initial Developer. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Contributor(s):
|
||||||
|
* Paul Rouget <paul@mozilla.com> (Original author)
|
||||||
|
*
|
||||||
|
* Alternatively, the contents of this file may be used under the terms of
|
||||||
|
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
* of those above. If you wish to allow use of your version of this file only
|
||||||
|
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
* use your version of this file under the terms of the MPL, indicate your
|
||||||
|
* decision by deleting the provisions above and replace them with the notice
|
||||||
|
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
* the provisions above, a recipient may use your version of this file under
|
||||||
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
*
|
||||||
|
* ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
|
const Cu = Components.utils;
|
||||||
|
Cu.import("resource:///modules/devtools/LayoutHelpers.jsm");
|
||||||
|
|
||||||
|
function isHighlighting()
|
||||||
|
{
|
||||||
|
let veil = InspectorUI.highlighter.veilTransparentBox;
|
||||||
|
return !(veil.style.visibility == "hidden");
|
||||||
|
}
|
||||||
|
|
||||||
|
function getHighlitNode()
|
||||||
|
{
|
||||||
|
let h = InspectorUI.highlighter;
|
||||||
|
if (!isHighlighting() || !h._contentRect)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
let a = {
|
||||||
|
x: h._contentRect.left,
|
||||||
|
y: h._contentRect.top
|
||||||
|
};
|
||||||
|
|
||||||
|
let b = {
|
||||||
|
x: a.x + h._contentRect.width,
|
||||||
|
y: a.y + h._contentRect.height
|
||||||
|
};
|
||||||
|
|
||||||
|
// Get midpoint of diagonal line.
|
||||||
|
let midpoint = midPoint(a, b);
|
||||||
|
|
||||||
|
return LayoutHelpers.getElementFromPoint(h.win.document, midpoint.x,
|
||||||
|
midpoint.y);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function midPoint(aPointA, aPointB)
|
||||||
|
{
|
||||||
|
let pointC = { };
|
||||||
|
pointC.x = (aPointB.x - aPointA.x) / 2 + aPointA.x;
|
||||||
|
pointC.y = (aPointB.y - aPointA.y) / 2 + aPointA.y;
|
||||||
|
return pointC;
|
||||||
|
}
|
||||||
|
|
@ -12,4 +12,5 @@ browser.jar:
|
||||||
content/browser/orion.js (sourceeditor/orion/orion.js)
|
content/browser/orion.js (sourceeditor/orion/orion.js)
|
||||||
content/browser/orion.css (sourceeditor/orion/orion.css)
|
content/browser/orion.css (sourceeditor/orion/orion.css)
|
||||||
content/browser/orion-mozilla.css (sourceeditor/orion/mozilla.css)
|
content/browser/orion-mozilla.css (sourceeditor/orion/mozilla.css)
|
||||||
|
content/browser/source-editor-overlay.xul (sourceeditor/source-editor-overlay.xul)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,7 @@
|
||||||
]>
|
]>
|
||||||
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
|
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
|
||||||
<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
|
<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
|
||||||
|
<?xul-overlay href="chrome://browser/content/source-editor-overlay.xul"?>
|
||||||
|
|
||||||
<window id="main-window"
|
<window id="main-window"
|
||||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
|
|
@ -58,6 +59,7 @@
|
||||||
<script type="application/javascript" src="chrome://browser/content/scratchpad.js"/>
|
<script type="application/javascript" src="chrome://browser/content/scratchpad.js"/>
|
||||||
|
|
||||||
<commandset id="editMenuCommands"/>
|
<commandset id="editMenuCommands"/>
|
||||||
|
<commandset id="sourceEditorCommands"/>
|
||||||
|
|
||||||
<commandset id="sp-commandset">
|
<commandset id="sp-commandset">
|
||||||
<command id="sp-cmd-newWindow" oncommand="Scratchpad.openScratchpad();"/>
|
<command id="sp-cmd-newWindow" oncommand="Scratchpad.openScratchpad();"/>
|
||||||
|
|
@ -142,6 +144,32 @@
|
||||||
key="&webConsoleCmd.commandkey;"
|
key="&webConsoleCmd.commandkey;"
|
||||||
command="sp-cmd-webConsole"
|
command="sp-cmd-webConsole"
|
||||||
modifiers="accel,shift"/>
|
modifiers="accel,shift"/>
|
||||||
|
<key id="key_find"
|
||||||
|
key="&findCmd.key;"
|
||||||
|
command="cmd_find"
|
||||||
|
modifiers="accel"/>
|
||||||
|
#ifdef XP_MACOSX
|
||||||
|
<key id="key_findAgain"
|
||||||
|
key="&findAgainCmd.key;"
|
||||||
|
command="cmd_findAgain"
|
||||||
|
modifiers="accel"/>
|
||||||
|
<key id="key_findPrevious"
|
||||||
|
key="&findPreviousCmd.key;"
|
||||||
|
command="cmd_findPrevious"
|
||||||
|
modifiers="accel,shift"/>
|
||||||
|
#else
|
||||||
|
<key id="key_findAgain"
|
||||||
|
keycode="VK_F3"
|
||||||
|
command="cmd_findAgain"/>
|
||||||
|
<key id="key_findPrevious"
|
||||||
|
keycode="VK_F3"
|
||||||
|
command="cmd_findPrevious"
|
||||||
|
modifiers="shift"/>
|
||||||
|
#endif
|
||||||
|
<key id="key_gotoLine"
|
||||||
|
key="&gotoLineCmd.key;"
|
||||||
|
command="cmd_gotoLine"
|
||||||
|
modifiers="accel"/>
|
||||||
</keyset>
|
</keyset>
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -223,23 +251,23 @@
|
||||||
key="key_selectAll"
|
key="key_selectAll"
|
||||||
accesskey="&selectAllCmd.accesskey;"
|
accesskey="&selectAllCmd.accesskey;"
|
||||||
command="cmd_selectAll"/>
|
command="cmd_selectAll"/>
|
||||||
|
<menuseparator/>
|
||||||
<!-- TODO: bug 650345 - implement search and replace
|
|
||||||
<menuitem id="sp-menu-find"
|
<menuitem id="sp-menu-find"
|
||||||
label="&findOnCmd.label;"
|
label="&findCmd.label;"
|
||||||
accesskey="&findOnCmd.accesskey;"
|
accesskey="&findCmd.accesskey;"
|
||||||
key="key_find"
|
key="key_find"
|
||||||
disabled="true"
|
|
||||||
command="cmd_find"/>
|
command="cmd_find"/>
|
||||||
<menuitem id="sp-menu-findAgain"
|
<menuitem id="sp-menu-findAgain"
|
||||||
label="&findAgainCmd.label;"
|
label="&findAgainCmd.label;"
|
||||||
accesskey="&findAgainCmd.accesskey;"
|
accesskey="&findAgainCmd.accesskey;"
|
||||||
key="key_findAgain"
|
key="key_findAgain"
|
||||||
disabled="true"
|
|
||||||
command="cmd_findAgain"/>
|
command="cmd_findAgain"/>
|
||||||
<menuseparator id="sp-execute-separator"/>
|
<menuseparator/>
|
||||||
-->
|
<menuitem id="sp-menu-gotoLine"
|
||||||
|
label="&gotoLineCmd.label;"
|
||||||
|
accesskey="&gotoLineCmd.accesskey;"
|
||||||
|
key="key_gotoLine"
|
||||||
|
command="cmd_gotoLine"/>
|
||||||
</menupopup>
|
</menupopup>
|
||||||
</menu>
|
</menu>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -58,10 +58,12 @@ _BROWSER_TEST_FILES = \
|
||||||
browser_scratchpad_bug_679467_falsy.js \
|
browser_scratchpad_bug_679467_falsy.js \
|
||||||
browser_scratchpad_bug_699130_edit_ui_updates.js \
|
browser_scratchpad_bug_699130_edit_ui_updates.js \
|
||||||
browser_scratchpad_bug_669612_unsaved.js \
|
browser_scratchpad_bug_669612_unsaved.js \
|
||||||
head.js \
|
|
||||||
browser_scratchpad_bug_653427_confirm_close.js \
|
browser_scratchpad_bug_653427_confirm_close.js \
|
||||||
browser_scratchpad_bug684546_reset_undo.js \
|
browser_scratchpad_bug684546_reset_undo.js \
|
||||||
browser_scratchpad_bug690552_display_outputs_errors.js \
|
browser_scratchpad_bug690552_display_outputs_errors.js \
|
||||||
|
browser_scratchpad_bug650345_find_ui.js \
|
||||||
|
browser_scratchpad_bug714942_goto_line_ui.js \
|
||||||
|
head.js \
|
||||||
|
|
||||||
libs:: $(_BROWSER_TEST_FILES)
|
libs:: $(_BROWSER_TEST_FILES)
|
||||||
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
|
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,97 @@
|
||||||
|
/* Any copyright is dedicated to the Public Domain.
|
||||||
|
http://creativecommons.org/publicdomain/zero/1.0/ */
|
||||||
|
|
||||||
|
function test()
|
||||||
|
{
|
||||||
|
waitForExplicitFinish();
|
||||||
|
|
||||||
|
gBrowser.selectedTab = gBrowser.addTab();
|
||||||
|
gBrowser.selectedBrowser.addEventListener("load", function browserLoad() {
|
||||||
|
gBrowser.selectedBrowser.removeEventListener("load", browserLoad, true);
|
||||||
|
openScratchpad(runTests);
|
||||||
|
}, true);
|
||||||
|
|
||||||
|
content.location = "data:text/html,<p>test the Find feature in Scratchpad";
|
||||||
|
}
|
||||||
|
|
||||||
|
function runTests(aWindow, aScratchpad)
|
||||||
|
{
|
||||||
|
let editor = aScratchpad.editor;
|
||||||
|
let text = "foobar bug650345\nBug650345 bazbaz\nfoobar omg\ntest";
|
||||||
|
editor.setText(text);
|
||||||
|
|
||||||
|
let needle = "foobar";
|
||||||
|
editor.setSelection(0, needle.length);
|
||||||
|
|
||||||
|
let oldPrompt = Services.prompt;
|
||||||
|
Services.prompt = {
|
||||||
|
prompt: function() { return true; },
|
||||||
|
};
|
||||||
|
|
||||||
|
let findKey = "F";
|
||||||
|
info("test Ctrl/Cmd-" + findKey + " (find)");
|
||||||
|
EventUtils.synthesizeKey(findKey, {accelKey: true}, aWindow);
|
||||||
|
let selection = editor.getSelection();
|
||||||
|
let newIndex = text.indexOf(needle, needle.length);
|
||||||
|
is(selection.start, newIndex, "selection.start is correct");
|
||||||
|
is(selection.end, newIndex + needle.length, "selection.end is correct");
|
||||||
|
|
||||||
|
info("test cmd_find");
|
||||||
|
aWindow.goDoCommand("cmd_find");
|
||||||
|
selection = editor.getSelection();
|
||||||
|
is(selection.start, 0, "selection.start is correct");
|
||||||
|
is(selection.end, needle.length, "selection.end is correct");
|
||||||
|
|
||||||
|
let findNextKey = Services.appinfo.OS == "Darwin" ? "G" : "VK_F3";
|
||||||
|
let findNextKeyOptions = Services.appinfo.OS == "Darwin" ?
|
||||||
|
{accelKey: true} : {};
|
||||||
|
|
||||||
|
info("test " + findNextKey + " (findNext)");
|
||||||
|
EventUtils.synthesizeKey(findNextKey, findNextKeyOptions, aWindow);
|
||||||
|
selection = editor.getSelection();
|
||||||
|
is(selection.start, newIndex, "selection.start is correct");
|
||||||
|
is(selection.end, newIndex + needle.length, "selection.end is correct");
|
||||||
|
|
||||||
|
info("test cmd_findAgain");
|
||||||
|
aWindow.goDoCommand("cmd_findAgain");
|
||||||
|
selection = editor.getSelection();
|
||||||
|
is(selection.start, 0, "selection.start is correct");
|
||||||
|
is(selection.end, needle.length, "selection.end is correct");
|
||||||
|
|
||||||
|
let findPreviousKey = Services.appinfo.OS == "Darwin" ? "G" : "VK_F3";
|
||||||
|
let findPreviousKeyOptions = Services.appinfo.OS == "Darwin" ?
|
||||||
|
{accelKey: true, shiftKey: true} : {shiftKey: true};
|
||||||
|
|
||||||
|
info("test " + findPreviousKey + " (findPrevious)");
|
||||||
|
EventUtils.synthesizeKey(findPreviousKey, findPreviousKeyOptions, aWindow);
|
||||||
|
selection = editor.getSelection();
|
||||||
|
is(selection.start, newIndex, "selection.start is correct");
|
||||||
|
is(selection.end, newIndex + needle.length, "selection.end is correct");
|
||||||
|
|
||||||
|
info("test cmd_findPrevious");
|
||||||
|
aWindow.goDoCommand("cmd_findPrevious");
|
||||||
|
selection = editor.getSelection();
|
||||||
|
is(selection.start, 0, "selection.start is correct");
|
||||||
|
is(selection.end, needle.length, "selection.end is correct");
|
||||||
|
|
||||||
|
needle = "BAZbaz";
|
||||||
|
newIndex = text.toLowerCase().indexOf(needle.toLowerCase());
|
||||||
|
|
||||||
|
Services.prompt = {
|
||||||
|
prompt: function(aWindow, aTitle, aMessage, aValue) {
|
||||||
|
aValue.value = needle;
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
info("test Ctrl/Cmd-" + findKey + " (find) with a custom value");
|
||||||
|
EventUtils.synthesizeKey(findKey, {accelKey: true}, aWindow);
|
||||||
|
selection = editor.getSelection();
|
||||||
|
is(selection.start, newIndex, "selection.start is correct");
|
||||||
|
is(selection.end, newIndex + needle.length, "selection.end is correct");
|
||||||
|
|
||||||
|
Services.prompt = oldPrompt;
|
||||||
|
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
/* vim: set ts=2 et sw=2 tw=80: */
|
||||||
|
/* Any copyright is dedicated to the Public Domain.
|
||||||
|
http://creativecommons.org/publicdomain/zero/1.0/ */
|
||||||
|
|
||||||
|
function test()
|
||||||
|
{
|
||||||
|
waitForExplicitFinish();
|
||||||
|
|
||||||
|
gBrowser.selectedTab = gBrowser.addTab();
|
||||||
|
gBrowser.selectedBrowser.addEventListener("load", function browserLoad() {
|
||||||
|
gBrowser.selectedBrowser.removeEventListener("load", browserLoad, true);
|
||||||
|
openScratchpad(runTests);
|
||||||
|
}, true);
|
||||||
|
|
||||||
|
content.location = "data:text/html,<p>test the 'Jump to line' feature in Scratchpad";
|
||||||
|
}
|
||||||
|
|
||||||
|
function runTests(aWindow, aScratchpad)
|
||||||
|
{
|
||||||
|
let editor = aScratchpad.editor;
|
||||||
|
let text = "foobar bug650345\nBug650345 bazbaz\nfoobar omg\ntest";
|
||||||
|
editor.setText(text);
|
||||||
|
editor.setCaretOffset(0);
|
||||||
|
|
||||||
|
let oldPrompt = Services.prompt;
|
||||||
|
let desiredValue = null;
|
||||||
|
Services.prompt = {
|
||||||
|
prompt: function(aWindow, aTitle, aMessage, aValue) {
|
||||||
|
aValue.value = desiredValue;
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
desiredValue = 3;
|
||||||
|
EventUtils.synthesizeKey("J", {accelKey: true}, aWindow);
|
||||||
|
is(editor.getCaretOffset(), 34, "caret offset is correct");
|
||||||
|
|
||||||
|
desiredValue = 2;
|
||||||
|
aWindow.goDoCommand("cmd_gotoLine")
|
||||||
|
is(editor.getCaretOffset(), 17, "caret offset is correct (again)");
|
||||||
|
|
||||||
|
Services.prompt = oldPrompt;
|
||||||
|
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,204 @@
|
||||||
|
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||||
|
/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
|
||||||
|
/* ***** BEGIN LICENSE BLOCK *****
|
||||||
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
*
|
||||||
|
* The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
* http://www.mozilla.org/MPL/
|
||||||
|
*
|
||||||
|
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
* for the specific language governing rights and limitations under the
|
||||||
|
* License.
|
||||||
|
*
|
||||||
|
* The Original Code is the Mozilla LayoutHelpers Module.
|
||||||
|
*
|
||||||
|
* The Initial Developer of the Original Code is
|
||||||
|
* The Mozilla Foundation.
|
||||||
|
* Portions created by the Initial Developer are Copyright (C) 2010
|
||||||
|
* the Initial Developer. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Contributor(s):
|
||||||
|
* Rob Campbell <rcampbell@mozilla.com> (original author)
|
||||||
|
* Mihai Șucan <mihai.sucan@gmail.com>
|
||||||
|
* Julian Viereck <jviereck@mozilla.com>
|
||||||
|
* Paul Rouget <paul@mozilla.com>
|
||||||
|
* Kyle Simpson <ksimpson@mozilla.com>
|
||||||
|
*
|
||||||
|
* Alternatively, the contents of this file may be used under the terms of
|
||||||
|
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
* of those above. If you wish to allow use of your version of this file only
|
||||||
|
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
* use your version of this file under the terms of the MPL, indicate your
|
||||||
|
* decision by deleting the provisions above and replace them with the notice
|
||||||
|
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
* the provisions above, a recipient may use your version of this file under
|
||||||
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
*
|
||||||
|
* ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
|
const Cu = Components.utils;
|
||||||
|
const Ci = Components.interfaces;
|
||||||
|
const Cr = Components.results;
|
||||||
|
|
||||||
|
var EXPORTED_SYMBOLS = ["LayoutHelpers"];
|
||||||
|
|
||||||
|
LayoutHelpers = {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Compute the position and the dimensions for the visible portion
|
||||||
|
* of a node, relativalely to the root window.
|
||||||
|
*
|
||||||
|
* @param nsIDOMNode aNode
|
||||||
|
* a DOM element to be highlighted
|
||||||
|
*/
|
||||||
|
getDirtyRect: function LH_getDirectyRect(aNode) {
|
||||||
|
let frameWin = aNode.ownerDocument.defaultView;
|
||||||
|
let clientRect = aNode.getBoundingClientRect();
|
||||||
|
|
||||||
|
// Go up in the tree of frames to determine the correct rectangle.
|
||||||
|
// clientRect is read-only, we need to be able to change properties.
|
||||||
|
rect = {top: clientRect.top,
|
||||||
|
left: clientRect.left,
|
||||||
|
width: clientRect.width,
|
||||||
|
height: clientRect.height};
|
||||||
|
|
||||||
|
// We iterate through all the parent windows.
|
||||||
|
while (true) {
|
||||||
|
|
||||||
|
// Does the selection overflow on the right of its window?
|
||||||
|
let diffx = frameWin.innerWidth - (rect.left + rect.width);
|
||||||
|
if (diffx < 0) {
|
||||||
|
rect.width += diffx;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Does the selection overflow on the bottom of its window?
|
||||||
|
let diffy = frameWin.innerHeight - (rect.top + rect.height);
|
||||||
|
if (diffy < 0) {
|
||||||
|
rect.height += diffy;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Does the selection overflow on the left of its window?
|
||||||
|
if (rect.left < 0) {
|
||||||
|
rect.width += rect.left;
|
||||||
|
rect.left = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Does the selection overflow on the top of its window?
|
||||||
|
if (rect.top < 0) {
|
||||||
|
rect.height += rect.top;
|
||||||
|
rect.top = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Selection has been clipped to fit in its own window.
|
||||||
|
|
||||||
|
// Are we in the top-level window?
|
||||||
|
if (frameWin.parent === frameWin || !frameWin.frameElement) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// We are in an iframe.
|
||||||
|
// We take into account the parent iframe position and its
|
||||||
|
// offset (borders and padding).
|
||||||
|
let frameRect = frameWin.frameElement.getBoundingClientRect();
|
||||||
|
|
||||||
|
let [offsetTop, offsetLeft] =
|
||||||
|
this.getIframeContentOffset(frameWin.frameElement);
|
||||||
|
|
||||||
|
rect.top += frameRect.top + offsetTop;
|
||||||
|
rect.left += frameRect.left + offsetLeft;
|
||||||
|
|
||||||
|
frameWin = frameWin.parent;
|
||||||
|
}
|
||||||
|
|
||||||
|
return rect;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns iframe content offset (iframe border + padding).
|
||||||
|
* Note: this function shouldn't need to exist, had the platform provided a
|
||||||
|
* suitable API for determining the offset between the iframe's content and
|
||||||
|
* its bounding client rect. Bug 626359 should provide us with such an API.
|
||||||
|
*
|
||||||
|
* @param aIframe
|
||||||
|
* The iframe.
|
||||||
|
* @returns array [offsetTop, offsetLeft]
|
||||||
|
* offsetTop is the distance from the top of the iframe and the
|
||||||
|
* top of the content document.
|
||||||
|
* offsetLeft is the distance from the left of the iframe and the
|
||||||
|
* left of the content document.
|
||||||
|
*/
|
||||||
|
getIframeContentOffset: function LH_getIframeContentOffset(aIframe) {
|
||||||
|
let style = aIframe.contentWindow.getComputedStyle(aIframe, null);
|
||||||
|
|
||||||
|
let paddingTop = parseInt(style.getPropertyValue("padding-top"));
|
||||||
|
let paddingLeft = parseInt(style.getPropertyValue("padding-left"));
|
||||||
|
|
||||||
|
let borderTop = parseInt(style.getPropertyValue("border-top-width"));
|
||||||
|
let borderLeft = parseInt(style.getPropertyValue("border-left-width"));
|
||||||
|
|
||||||
|
return [borderTop + paddingTop, borderLeft + paddingLeft];
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Apply the page zoom factor.
|
||||||
|
*/
|
||||||
|
getZoomedRect: function LH_getZoomedRect(aWin, aRect) {
|
||||||
|
// get page zoom factor, if any
|
||||||
|
let zoom =
|
||||||
|
aWin.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
|
||||||
|
.getInterface(Components.interfaces.nsIDOMWindowUtils)
|
||||||
|
.screenPixelsPerCSSPixel;
|
||||||
|
|
||||||
|
// adjust rect for zoom scaling
|
||||||
|
let aRectScaled = {};
|
||||||
|
for (let prop in aRect) {
|
||||||
|
aRectScaled[prop] = aRect[prop] * zoom;
|
||||||
|
}
|
||||||
|
|
||||||
|
return aRectScaled;
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find an element from the given coordinates. This method descends through
|
||||||
|
* frames to find the element the user clicked inside frames.
|
||||||
|
*
|
||||||
|
* @param DOMDocument aDocument the document to look into.
|
||||||
|
* @param integer aX
|
||||||
|
* @param integer aY
|
||||||
|
* @returns Node|null the element node found at the given coordinates.
|
||||||
|
*/
|
||||||
|
getElementFromPoint: function LH_elementFromPoint(aDocument, aX, aY)
|
||||||
|
{
|
||||||
|
let node = aDocument.elementFromPoint(aX, aY);
|
||||||
|
if (node && node.contentDocument) {
|
||||||
|
if (node instanceof Ci.nsIDOMHTMLIFrameElement) {
|
||||||
|
let rect = node.getBoundingClientRect();
|
||||||
|
|
||||||
|
// Gap between the iframe and its content window.
|
||||||
|
let [offsetTop, offsetLeft] = LayoutHelpers.getIframeContentOffset(node);
|
||||||
|
|
||||||
|
aX -= rect.left + offsetLeft;
|
||||||
|
aY -= rect.top + offsetTop;
|
||||||
|
|
||||||
|
if (aX < 0 || aY < 0) {
|
||||||
|
// Didn't reach the content document, still over the iframe.
|
||||||
|
return node;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (node instanceof Ci.nsIDOMHTMLIFrameElement ||
|
||||||
|
node instanceof Ci.nsIDOMHTMLFrameElement) {
|
||||||
|
let subnode = this.getElementFromPoint(node.contentDocument, aX, aY);
|
||||||
|
if (subnode) {
|
||||||
|
node = subnode;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return node;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
@ -54,3 +54,4 @@ include $(topsrcdir)/config/rules.mk
|
||||||
libs::
|
libs::
|
||||||
$(NSINSTALL) $(srcdir)/Templater.jsm $(FINAL_TARGET)/modules/devtools
|
$(NSINSTALL) $(srcdir)/Templater.jsm $(FINAL_TARGET)/modules/devtools
|
||||||
$(NSINSTALL) $(srcdir)/Promise.jsm $(FINAL_TARGET)/modules/devtools
|
$(NSINSTALL) $(srcdir)/Promise.jsm $(FINAL_TARGET)/modules/devtools
|
||||||
|
$(NSINSTALL) $(srcdir)/LayoutHelpers.jsm $(FINAL_TARGET)/modules/devtools
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@ EXTRA_JS_MODULES = \
|
||||||
source-editor.jsm \
|
source-editor.jsm \
|
||||||
source-editor-orion.jsm \
|
source-editor-orion.jsm \
|
||||||
source-editor-textarea.jsm \
|
source-editor-textarea.jsm \
|
||||||
|
source-editor-ui.jsm \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,7 @@ const Ci = Components.interfaces;
|
||||||
|
|
||||||
Cu.import("resource://gre/modules/Services.jsm");
|
Cu.import("resource://gre/modules/Services.jsm");
|
||||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||||
|
Cu.import("resource:///modules/source-editor-ui.jsm");
|
||||||
|
|
||||||
XPCOMUtils.defineLazyServiceGetter(this, "clipboardHelper",
|
XPCOMUtils.defineLazyServiceGetter(this, "clipboardHelper",
|
||||||
"@mozilla.org/widget/clipboardhelper;1",
|
"@mozilla.org/widget/clipboardhelper;1",
|
||||||
|
|
@ -126,6 +127,8 @@ function SourceEditor() {
|
||||||
Services.prefs.getBoolPref(SourceEditor.PREFS.EXPAND_TAB);
|
Services.prefs.getBoolPref(SourceEditor.PREFS.EXPAND_TAB);
|
||||||
|
|
||||||
this._onOrionSelection = this._onOrionSelection.bind(this);
|
this._onOrionSelection = this._onOrionSelection.bind(this);
|
||||||
|
|
||||||
|
this.ui = new SourceEditorUI(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
SourceEditor.prototype = {
|
SourceEditor.prototype = {
|
||||||
|
|
@ -143,6 +146,13 @@ SourceEditor.prototype = {
|
||||||
_tabSize: null,
|
_tabSize: null,
|
||||||
_iframeWindow: null,
|
_iframeWindow: null,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The Source Editor user interface manager.
|
||||||
|
* @type object
|
||||||
|
* An instance of the SourceEditorUI.
|
||||||
|
*/
|
||||||
|
ui: null,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The editor container element.
|
* The editor container element.
|
||||||
* @type nsIDOMElement
|
* @type nsIDOMElement
|
||||||
|
|
@ -204,6 +214,7 @@ SourceEditor.prototype = {
|
||||||
this.parentElement = aElement;
|
this.parentElement = aElement;
|
||||||
this._config = aConfig;
|
this._config = aConfig;
|
||||||
this._onReadyCallback = aCallback;
|
this._onReadyCallback = aCallback;
|
||||||
|
this.ui.init();
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -272,11 +283,22 @@ SourceEditor.prototype = {
|
||||||
|
|
||||||
this._dragAndDrop = new TextDND(this._view, this._undoStack);
|
this._dragAndDrop = new TextDND(this._view, this._undoStack);
|
||||||
|
|
||||||
this._view.setAction("undo", this.undo.bind(this));
|
let actions = {
|
||||||
this._view.setAction("redo", this.redo.bind(this));
|
"undo": [this.undo, this],
|
||||||
this._view.setAction("tab", this._doTab.bind(this));
|
"redo": [this.redo, this],
|
||||||
this._view.setAction("Unindent Lines", this._doUnindentLines.bind(this));
|
"tab": [this._doTab, this],
|
||||||
this._view.setAction("enter", this._doEnter.bind(this));
|
"Unindent Lines": [this._doUnindentLines, this],
|
||||||
|
"enter": [this._doEnter, this],
|
||||||
|
"Find...": [this.ui.find, this.ui],
|
||||||
|
"Find Next Occurrence": [this.ui.findNext, this.ui],
|
||||||
|
"Find Previous Occurrence": [this.ui.findPrevious, this.ui],
|
||||||
|
"Goto Line...": [this.ui.gotoLine, this.ui],
|
||||||
|
};
|
||||||
|
|
||||||
|
for (let name in actions) {
|
||||||
|
let action = actions[name];
|
||||||
|
this._view.setAction(name, action[0].bind(action[1]));
|
||||||
|
}
|
||||||
|
|
||||||
let keys = (config.keys || []).concat(DEFAULT_KEYBINDINGS);
|
let keys = (config.keys || []).concat(DEFAULT_KEYBINDINGS);
|
||||||
keys.forEach(function(aKey) {
|
keys.forEach(function(aKey) {
|
||||||
|
|
@ -296,6 +318,7 @@ SourceEditor.prototype = {
|
||||||
*/
|
*/
|
||||||
_onOrionLoad: function SE__onOrionLoad()
|
_onOrionLoad: function SE__onOrionLoad()
|
||||||
{
|
{
|
||||||
|
this.ui.onReady();
|
||||||
if (this._onReadyCallback) {
|
if (this._onReadyCallback) {
|
||||||
this._onReadyCallback(this);
|
this._onReadyCallback(this);
|
||||||
this._onReadyCallback = null;
|
this._onReadyCallback = null;
|
||||||
|
|
@ -883,6 +906,9 @@ SourceEditor.prototype = {
|
||||||
this._onOrionSelection = null;
|
this._onOrionSelection = null;
|
||||||
|
|
||||||
this._view.destroy();
|
this._view.destroy();
|
||||||
|
this.ui.destroy();
|
||||||
|
this.ui = null;
|
||||||
|
|
||||||
this.parentElement.removeChild(this._iframe);
|
this.parentElement.removeChild(this._iframe);
|
||||||
this.parentElement = null;
|
this.parentElement = null;
|
||||||
this._iframeWindow = null;
|
this._iframeWindow = null;
|
||||||
|
|
@ -896,5 +922,6 @@ SourceEditor.prototype = {
|
||||||
this._view = null;
|
this._view = null;
|
||||||
this._model = null;
|
this._model = null;
|
||||||
this._config = null;
|
this._config = null;
|
||||||
|
this._lastFind = null;
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,47 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<!-- ***** BEGIN LICENSE BLOCK *****
|
||||||
|
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
-
|
||||||
|
- The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
- 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
- the License. You may obtain a copy of the License at
|
||||||
|
- http://www.mozilla.org/MPL/
|
||||||
|
-
|
||||||
|
- Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
- for the specific language governing rights and limitations under the
|
||||||
|
- License.
|
||||||
|
-
|
||||||
|
- The Original Code is Source Editor.
|
||||||
|
-
|
||||||
|
- The Initial Developer of the Original Code is
|
||||||
|
- The Mozilla Foundation.
|
||||||
|
- Portions created by the Initial Developer are Copyright (C) 2012
|
||||||
|
- the Initial Developer. All Rights Reserved.
|
||||||
|
-
|
||||||
|
- Contributor(s):
|
||||||
|
- Mihai Sucan <mihai.sucan@gmail.com> (original author)
|
||||||
|
-
|
||||||
|
- Alternatively, the contents of this file may be used under the terms of
|
||||||
|
- either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
- in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
- of those above. If you wish to allow use of your version of this file only
|
||||||
|
- under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
- use your version of this file under the terms of the MPL, indicate your
|
||||||
|
- decision by deleting the provisions above and replace them with the notice
|
||||||
|
- and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
- the provisions above, a recipient may use your version of this file under
|
||||||
|
- the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
-
|
||||||
|
- ***** END LICENSE BLOCK ***** -->
|
||||||
|
|
||||||
|
<overlay id="sourceEditorOverlay"
|
||||||
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||||
|
<commandset id="sourceEditorCommands">
|
||||||
|
<command id="cmd_find" oncommand="goDoCommand('cmd_find')"/>
|
||||||
|
<command id="cmd_findAgain" oncommand="goDoCommand('cmd_findAgain')" disabled="true"/>
|
||||||
|
<command id="cmd_findPrevious" oncommand="goDoCommand('cmd_findPrevious')" disabled="true"/>
|
||||||
|
<command id="cmd_gotoLine" oncommand="goDoCommand('cmd_gotoLine')"/>
|
||||||
|
</commandset>
|
||||||
|
</overlay>
|
||||||
|
|
@ -44,9 +44,23 @@ const Ci = Components.interfaces;
|
||||||
|
|
||||||
Cu.import("resource://gre/modules/Services.jsm");
|
Cu.import("resource://gre/modules/Services.jsm");
|
||||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||||
|
Cu.import("resource:///modules/source-editor-ui.jsm");
|
||||||
|
|
||||||
const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
|
const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default key bindings in the textarea editor.
|
||||||
|
*/
|
||||||
|
const DEFAULT_KEYBINDINGS = [
|
||||||
|
{
|
||||||
|
_action: "_doTab",
|
||||||
|
keyCode: Ci.nsIDOMKeyEvent.DOM_VK_TAB,
|
||||||
|
shiftKey: false,
|
||||||
|
accelKey: false,
|
||||||
|
altKey: false,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
var EXPORTED_SYMBOLS = ["SourceEditor"];
|
var EXPORTED_SYMBOLS = ["SourceEditor"];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -69,6 +83,8 @@ function SourceEditor() {
|
||||||
|
|
||||||
this._listeners = {};
|
this._listeners = {};
|
||||||
this._lastSelection = {};
|
this._lastSelection = {};
|
||||||
|
|
||||||
|
this.ui = new SourceEditorUI(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
SourceEditor.prototype = {
|
SourceEditor.prototype = {
|
||||||
|
|
@ -80,6 +96,13 @@ SourceEditor.prototype = {
|
||||||
_expandTab: null,
|
_expandTab: null,
|
||||||
_tabSize: null,
|
_tabSize: null,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The Source Editor user interface manager.
|
||||||
|
* @type object
|
||||||
|
* An instance of the SourceEditorUI.
|
||||||
|
*/
|
||||||
|
ui: null,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The editor container element.
|
* The editor container element.
|
||||||
* @type nsIDOMElement
|
* @type nsIDOMElement
|
||||||
|
|
@ -136,7 +159,7 @@ SourceEditor.prototype = {
|
||||||
this._textbox.readOnly = aConfig.readOnly;
|
this._textbox.readOnly = aConfig.readOnly;
|
||||||
|
|
||||||
// Make sure that the SourceEditor Selection events are fired properly.
|
// Make sure that the SourceEditor Selection events are fired properly.
|
||||||
// Also make sure that the Tab key inserts spaces when expandTab is true.
|
// Also make sure that the configured keyboard bindings work.
|
||||||
this._textbox.addEventListener("select", this._onSelect.bind(this), false);
|
this._textbox.addEventListener("select", this._onSelect.bind(this), false);
|
||||||
this._textbox.addEventListener("keypress", this._onKeyPress.bind(this), false);
|
this._textbox.addEventListener("keypress", this._onKeyPress.bind(this), false);
|
||||||
this._textbox.addEventListener("keyup", this._onSelect.bind(this), false);
|
this._textbox.addEventListener("keyup", this._onSelect.bind(this), false);
|
||||||
|
|
@ -161,29 +184,61 @@ SourceEditor.prototype = {
|
||||||
|
|
||||||
this._config = aConfig;
|
this._config = aConfig;
|
||||||
|
|
||||||
|
for each (let key in DEFAULT_KEYBINDINGS) {
|
||||||
|
for (let prop in key) {
|
||||||
|
if (prop == "accelKey") {
|
||||||
|
let newProp = Services.appinfo.OS == "Darwin" ? "metaKey" : "ctrlKey";
|
||||||
|
key[newProp] = key[prop];
|
||||||
|
delete key[prop];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.ui.init();
|
||||||
|
this.ui.onReady();
|
||||||
|
|
||||||
if (aCallback) {
|
if (aCallback) {
|
||||||
aCallback(this);
|
aCallback(this);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The textbox keypress event handler allows users to indent code using the
|
* The textbox keypress event handler calls the configured action for keyboard
|
||||||
* Tab key.
|
* event.
|
||||||
*
|
*
|
||||||
* @private
|
* @private
|
||||||
* @param nsIDOMEvent aEvent
|
* @param nsIDOMEvent aEvent
|
||||||
* The DOM object for the event.
|
* The DOM object for the event.
|
||||||
|
* @see DEFAULT_KEYBINDINGS
|
||||||
*/
|
*/
|
||||||
_onKeyPress: function SE__onKeyPress(aEvent)
|
_onKeyPress: function SE__onKeyPress(aEvent)
|
||||||
{
|
{
|
||||||
if (aEvent.keyCode != aEvent.DOM_VK_TAB || aEvent.shiftKey ||
|
for each (let key in DEFAULT_KEYBINDINGS) {
|
||||||
aEvent.metaKey || aEvent.ctrlKey || aEvent.altKey) {
|
let matched = true;
|
||||||
return;
|
for (let prop in key) {
|
||||||
|
if (prop.charAt(0) != "_" && aEvent[prop] !== key[prop]) {
|
||||||
|
matched = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (matched) {
|
||||||
|
let context = key._context ? this[key._context] : this;
|
||||||
|
context[key._action].call(context);
|
||||||
|
aEvent.preventDefault();
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
|
||||||
aEvent.preventDefault();
|
/**
|
||||||
|
* The Tab keypress event handler. This allows the user to indent the code
|
||||||
let caret = this.getCaretOffset();
|
* with spaces, when expandTab is true.
|
||||||
|
*/
|
||||||
|
_doTab: function SE__doTab()
|
||||||
|
{
|
||||||
|
let selection = this.getSelection();
|
||||||
|
let caret = selection.start;
|
||||||
let indent = "\t";
|
let indent = "\t";
|
||||||
|
|
||||||
if (this._expandTab) {
|
if (this._expandTab) {
|
||||||
|
|
@ -201,8 +256,8 @@ SourceEditor.prototype = {
|
||||||
indent = (new Array(spaces + 1)).join(" ");
|
indent = (new Array(spaces + 1)).join(" ");
|
||||||
}
|
}
|
||||||
|
|
||||||
this.setText(indent, caret, caret);
|
this.setText(indent, selection.start, selection.end);
|
||||||
this.setCaretOffset(caret + indent.length);
|
this.setCaretOffset(selection.start + indent.length);
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -616,8 +671,8 @@ SourceEditor.prototype = {
|
||||||
aColumn = aColumn || 0;
|
aColumn = aColumn || 0;
|
||||||
|
|
||||||
let text = this._textbox.value;
|
let text = this._textbox.value;
|
||||||
let i = 0, n = text.length, c0, c1;
|
let i = -1, n = text.length, c0, c1;
|
||||||
let line = 0, col = 0;
|
let line = 0, col = -1;
|
||||||
while (i < n) {
|
while (i < n) {
|
||||||
c1 = text.charAt(i++);
|
c1 = text.charAt(i++);
|
||||||
if (line < aLine && (c1 == "\r" || (c0 != "\r" && c1 == "\n"))) {
|
if (line < aLine && (c1 == "\r" || (c0 != "\r" && c1 == "\n"))) {
|
||||||
|
|
@ -709,6 +764,10 @@ SourceEditor.prototype = {
|
||||||
}
|
}
|
||||||
|
|
||||||
this._editor.removeEditActionListener(this._editActionListener);
|
this._editor.removeEditActionListener(this._editActionListener);
|
||||||
|
|
||||||
|
this.ui.destroy();
|
||||||
|
this.ui = null;
|
||||||
|
|
||||||
this.parentElement.removeChild(this._textbox);
|
this.parentElement.removeChild(this._textbox);
|
||||||
this.parentElement = null;
|
this.parentElement = null;
|
||||||
this._editor = null;
|
this._editor = null;
|
||||||
|
|
@ -717,6 +776,7 @@ SourceEditor.prototype = {
|
||||||
this._listeners = null;
|
this._listeners = null;
|
||||||
this._lastSelection = null;
|
this._lastSelection = null;
|
||||||
this._editActionListener = null;
|
this._editActionListener = null;
|
||||||
|
this._lastFind = null;
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,288 @@
|
||||||
|
/* vim:set ts=2 sw=2 sts=2 et tw=80:
|
||||||
|
* ***** BEGIN LICENSE BLOCK *****
|
||||||
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
*
|
||||||
|
* The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
* http://www.mozilla.org/MPL/
|
||||||
|
*
|
||||||
|
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
* for the specific language governing rights and limitations under the
|
||||||
|
* License.
|
||||||
|
*
|
||||||
|
* The Original Code is the Source Editor component.
|
||||||
|
*
|
||||||
|
* The Initial Developer of the Original Code is
|
||||||
|
* The Mozilla Foundation.
|
||||||
|
* Portions created by the Initial Developer are Copyright (C) 2011
|
||||||
|
* the Initial Developer. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Contributor(s):
|
||||||
|
* Mihai Sucan <mihai.sucan@gmail.com> (original author)
|
||||||
|
*
|
||||||
|
* Alternatively, the contents of this file may be used under the terms of
|
||||||
|
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
* of those above. If you wish to allow use of your version of this file only
|
||||||
|
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
* use your version of this file under the terms of the MPL, indicate your
|
||||||
|
* decision by deleting the provisions above and replace them with the notice
|
||||||
|
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
* the provisions above, a recipient may use your version of this file under
|
||||||
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
*
|
||||||
|
* ***** END LICENSE BLOCK *****/
|
||||||
|
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
const Cu = Components.utils;
|
||||||
|
|
||||||
|
Cu.import("resource://gre/modules/Services.jsm");
|
||||||
|
|
||||||
|
var EXPORTED_SYMBOLS = ["SourceEditorUI"];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The Source Editor component user interface.
|
||||||
|
*/
|
||||||
|
function SourceEditorUI(aEditor)
|
||||||
|
{
|
||||||
|
this.editor = aEditor;
|
||||||
|
}
|
||||||
|
|
||||||
|
SourceEditorUI.prototype = {
|
||||||
|
/**
|
||||||
|
* Initialize the user interface. This is called by the SourceEditor.init()
|
||||||
|
* method.
|
||||||
|
*/
|
||||||
|
init: function SEU_init()
|
||||||
|
{
|
||||||
|
this._ownerWindow = this.editor.parentElement.ownerDocument.defaultView;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The UI onReady function is executed once the Source Editor completes
|
||||||
|
* initialization and it is ready for usage. Currently this code sets up the
|
||||||
|
* nsIController.
|
||||||
|
*/
|
||||||
|
onReady: function SEU_onReady()
|
||||||
|
{
|
||||||
|
if (this._ownerWindow.controllers) {
|
||||||
|
this._controller = new SourceEditorController(this.editor);
|
||||||
|
this._ownerWindow.controllers.insertControllerAt(0, this._controller);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The "go to line" command UI. This displays a prompt that allows the user to
|
||||||
|
* input the line number to jump to.
|
||||||
|
*/
|
||||||
|
gotoLine: function SEU_gotoLine()
|
||||||
|
{
|
||||||
|
let oldLine = this.editor.getCaretPosition ?
|
||||||
|
this.editor.getCaretPosition().line : null;
|
||||||
|
let newLine = {value: oldLine !== null ? oldLine + 1 : ""};
|
||||||
|
|
||||||
|
let result = Services.prompt.prompt(this._ownerWindow,
|
||||||
|
SourceEditorUI.strings.GetStringFromName("gotoLineCmd.promptTitle"),
|
||||||
|
SourceEditorUI.strings.GetStringFromName("gotoLineCmd.promptMessage"),
|
||||||
|
newLine, null, {});
|
||||||
|
|
||||||
|
newLine.value = parseInt(newLine.value);
|
||||||
|
if (result && !isNaN(newLine.value) && --newLine.value != oldLine) {
|
||||||
|
if (this.editor.getLineCount) {
|
||||||
|
let lines = this.editor.getLineCount() - 1;
|
||||||
|
this.editor.setCaretPosition(Math.max(0, Math.min(lines, newLine.value)));
|
||||||
|
} else {
|
||||||
|
this.editor.setCaretPosition(Math.max(0, newLine.value));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The "find" command UI. This displays a prompt that allows the user to input
|
||||||
|
* the string to search for in the code. By default the current selection is
|
||||||
|
* used as a search string, or the last search string.
|
||||||
|
*/
|
||||||
|
find: function SEU_find()
|
||||||
|
{
|
||||||
|
let str = {value: this.editor.getSelectedText()};
|
||||||
|
if (!str.value && this.editor.lastFind) {
|
||||||
|
str.value = this.editor.lastFind.str;
|
||||||
|
}
|
||||||
|
|
||||||
|
let result = Services.prompt.prompt(this._ownerWindow,
|
||||||
|
SourceEditorUI.strings.GetStringFromName("findCmd.promptTitle"),
|
||||||
|
SourceEditorUI.strings.GetStringFromName("findCmd.promptMessage"),
|
||||||
|
str, null, {});
|
||||||
|
|
||||||
|
if (result && str.value) {
|
||||||
|
let start = this.editor.getSelection().end;
|
||||||
|
let pos = this.editor.find(str.value, {ignoreCase: true, start: start});
|
||||||
|
if (pos == -1) {
|
||||||
|
this.editor.find(str.value, {ignoreCase: true});
|
||||||
|
}
|
||||||
|
this._onFind();
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find the next occurrence of the last search string.
|
||||||
|
*/
|
||||||
|
findNext: function SEU_findNext()
|
||||||
|
{
|
||||||
|
let lastFind = this.editor.lastFind;
|
||||||
|
if (lastFind) {
|
||||||
|
this.editor.findNext(true);
|
||||||
|
this._onFind();
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find the previous occurrence of the last search string.
|
||||||
|
*/
|
||||||
|
findPrevious: function SEU_findPrevious()
|
||||||
|
{
|
||||||
|
let lastFind = this.editor.lastFind;
|
||||||
|
if (lastFind) {
|
||||||
|
this.editor.findPrevious(true);
|
||||||
|
this._onFind();
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This executed after each find/findNext/findPrevious operation.
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
_onFind: function SEU__onFind()
|
||||||
|
{
|
||||||
|
let lastFind = this.editor.lastFind;
|
||||||
|
if (lastFind && lastFind.index > -1) {
|
||||||
|
this.editor.setSelection(lastFind.index, lastFind.index + lastFind.str.length);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this._ownerWindow.goUpdateCommand) {
|
||||||
|
this._ownerWindow.goUpdateCommand("cmd_findAgain");
|
||||||
|
this._ownerWindow.goUpdateCommand("cmd_findPrevious");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Destroy the SourceEditorUI instance. This is called by the
|
||||||
|
* SourceEditor.destroy() method.
|
||||||
|
*/
|
||||||
|
destroy: function SEU_destroy()
|
||||||
|
{
|
||||||
|
this._ownerWindow = null;
|
||||||
|
this.editor = null;
|
||||||
|
this._controller = null;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The Source Editor nsIController implements features that need to be available
|
||||||
|
* from XUL commands.
|
||||||
|
*
|
||||||
|
* @constructor
|
||||||
|
* @param object aEditor
|
||||||
|
* SourceEditor object instance for which the controller is instanced.
|
||||||
|
*/
|
||||||
|
function SourceEditorController(aEditor)
|
||||||
|
{
|
||||||
|
this._editor = aEditor;
|
||||||
|
}
|
||||||
|
|
||||||
|
SourceEditorController.prototype = {
|
||||||
|
/**
|
||||||
|
* Check if a command is supported by the controller.
|
||||||
|
*
|
||||||
|
* @param string aCommand
|
||||||
|
* The command name you want to check support for.
|
||||||
|
* @return boolean
|
||||||
|
* True if the command is supported, false otherwise.
|
||||||
|
*/
|
||||||
|
supportsCommand: function SEC_supportsCommand(aCommand)
|
||||||
|
{
|
||||||
|
let result;
|
||||||
|
|
||||||
|
switch (aCommand) {
|
||||||
|
case "cmd_find":
|
||||||
|
case "cmd_findAgain":
|
||||||
|
case "cmd_findPrevious":
|
||||||
|
case "cmd_gotoLine":
|
||||||
|
result = true;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
result = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if a command is enabled or not.
|
||||||
|
*
|
||||||
|
* @param string aCommand
|
||||||
|
* The command name you want to check if it is enabled or not.
|
||||||
|
* @return boolean
|
||||||
|
* True if the command is enabled, false otherwise.
|
||||||
|
*/
|
||||||
|
isCommandEnabled: function SEC_isCommandEnabled(aCommand)
|
||||||
|
{
|
||||||
|
let result;
|
||||||
|
|
||||||
|
switch (aCommand) {
|
||||||
|
case "cmd_find":
|
||||||
|
case "cmd_gotoLine":
|
||||||
|
result = true;
|
||||||
|
break;
|
||||||
|
case "cmd_findAgain":
|
||||||
|
case "cmd_findPrevious":
|
||||||
|
result = this._editor.lastFind && this._editor.lastFind.lastFound != -1;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
result = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Perform a command.
|
||||||
|
*
|
||||||
|
* @param string aCommand
|
||||||
|
* The command name you want to execute.
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
doCommand: function SEC_doCommand(aCommand)
|
||||||
|
{
|
||||||
|
switch (aCommand) {
|
||||||
|
case "cmd_find":
|
||||||
|
this._editor.ui.find();
|
||||||
|
break;
|
||||||
|
case "cmd_findAgain":
|
||||||
|
this._editor.ui.findNext();
|
||||||
|
break;
|
||||||
|
case "cmd_findPrevious":
|
||||||
|
this._editor.ui.findPrevious();
|
||||||
|
break;
|
||||||
|
case "cmd_gotoLine":
|
||||||
|
this._editor.ui.gotoLine();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
onEvent: function() { }
|
||||||
|
};
|
||||||
|
|
@ -41,12 +41,18 @@
|
||||||
const Cu = Components.utils;
|
const Cu = Components.utils;
|
||||||
|
|
||||||
Cu.import("resource://gre/modules/Services.jsm");
|
Cu.import("resource://gre/modules/Services.jsm");
|
||||||
|
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||||
|
Cu.import("resource:///modules/source-editor-ui.jsm");
|
||||||
|
|
||||||
const PREF_EDITOR_COMPONENT = "devtools.editor.component";
|
const PREF_EDITOR_COMPONENT = "devtools.editor.component";
|
||||||
|
const SOURCEEDITOR_L10N = "chrome://browser/locale/devtools/sourceeditor.properties";
|
||||||
|
|
||||||
var component = Services.prefs.getCharPref(PREF_EDITOR_COMPONENT);
|
var component = Services.prefs.getCharPref(PREF_EDITOR_COMPONENT);
|
||||||
var obj = {};
|
var obj = {};
|
||||||
try {
|
try {
|
||||||
|
if (component == "ui") {
|
||||||
|
throw new Error("The UI editor component is not available.");
|
||||||
|
}
|
||||||
Cu.import("resource:///modules/source-editor-" + component + ".jsm", obj);
|
Cu.import("resource:///modules/source-editor-" + component + ".jsm", obj);
|
||||||
} catch (ex) {
|
} catch (ex) {
|
||||||
Cu.reportError(ex);
|
Cu.reportError(ex);
|
||||||
|
|
@ -66,6 +72,10 @@ var EXPORTED_SYMBOLS = ["SourceEditor"];
|
||||||
|
|
||||||
// Add the constants used by all SourceEditors.
|
// Add the constants used by all SourceEditors.
|
||||||
|
|
||||||
|
XPCOMUtils.defineLazyGetter(SourceEditorUI, "strings", function() {
|
||||||
|
return Services.strings.createBundle(SOURCEEDITOR_L10N);
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Known SourceEditor preferences.
|
* Known SourceEditor preferences.
|
||||||
*/
|
*/
|
||||||
|
|
@ -142,3 +152,161 @@ SourceEditor.EVENTS = {
|
||||||
SELECTION: "Selection",
|
SELECTION: "Selection",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extend a destination object with properties from a source object.
|
||||||
|
*
|
||||||
|
* @param object aDestination
|
||||||
|
* @param object aSource
|
||||||
|
*/
|
||||||
|
function extend(aDestination, aSource)
|
||||||
|
{
|
||||||
|
for (let name in aSource) {
|
||||||
|
if (!aDestination.hasOwnProperty(name)) {
|
||||||
|
aDestination[name] = aSource[name];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add methods common to all components.
|
||||||
|
*/
|
||||||
|
extend(SourceEditor.prototype, {
|
||||||
|
_lastFind: null,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find a string in the editor.
|
||||||
|
*
|
||||||
|
* @param string aString
|
||||||
|
* The string you want to search for. If |aString| is not given the
|
||||||
|
* currently selected text is used.
|
||||||
|
* @param object [aOptions]
|
||||||
|
* Optional find options:
|
||||||
|
* - start: (integer) offset to start searching from. Default: 0 if
|
||||||
|
* backwards is false. If backwards is true then start = text.length.
|
||||||
|
* - ignoreCase: (boolean) tells if you want the search to be case
|
||||||
|
* insensitive or not. Default: false.
|
||||||
|
* - backwards: (boolean) tells if you want the search to go backwards
|
||||||
|
* from the given |start| offset. Default: false.
|
||||||
|
* @return integer
|
||||||
|
* The offset where the string was found.
|
||||||
|
*/
|
||||||
|
find: function SE_find(aString, aOptions)
|
||||||
|
{
|
||||||
|
if (typeof(aString) != "string") {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
aOptions = aOptions || {};
|
||||||
|
|
||||||
|
let str = aOptions.ignoreCase ? aString.toLowerCase() : aString;
|
||||||
|
|
||||||
|
let text = this.getText();
|
||||||
|
if (aOptions.ignoreCase) {
|
||||||
|
text = text.toLowerCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
let index = aOptions.backwards ?
|
||||||
|
text.lastIndexOf(str, aOptions.start) :
|
||||||
|
text.indexOf(str, aOptions.start);
|
||||||
|
|
||||||
|
let lastFoundIndex = index;
|
||||||
|
if (index == -1 && this.lastFind && this.lastFind.index > -1 &&
|
||||||
|
this.lastFind.str === aString &&
|
||||||
|
this.lastFind.ignoreCase === !!aOptions.ignoreCase) {
|
||||||
|
lastFoundIndex = this.lastFind.index;
|
||||||
|
}
|
||||||
|
|
||||||
|
this._lastFind = {
|
||||||
|
str: aString,
|
||||||
|
index: index,
|
||||||
|
lastFound: lastFoundIndex,
|
||||||
|
ignoreCase: !!aOptions.ignoreCase,
|
||||||
|
};
|
||||||
|
|
||||||
|
return index;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find the next occurrence of the last search operation.
|
||||||
|
*
|
||||||
|
* @param boolean aWrap
|
||||||
|
* Tells if you want to restart the search from the beginning of the
|
||||||
|
* document if the string is not found.
|
||||||
|
* @return integer
|
||||||
|
* The offset where the string was found.
|
||||||
|
*/
|
||||||
|
findNext: function SE_findNext(aWrap)
|
||||||
|
{
|
||||||
|
if (!this.lastFind && this.lastFind.lastFound == -1) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
let options = {
|
||||||
|
start: this.lastFind.lastFound + this.lastFind.str.length,
|
||||||
|
ignoreCase: this.lastFind.ignoreCase,
|
||||||
|
};
|
||||||
|
|
||||||
|
let index = this.find(this.lastFind.str, options);
|
||||||
|
if (index == -1 && aWrap) {
|
||||||
|
options.start = 0;
|
||||||
|
index = this.find(this.lastFind.str, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
return index;
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find the previous occurrence of the last search operation.
|
||||||
|
*
|
||||||
|
* @param boolean aWrap
|
||||||
|
* Tells if you want to restart the search from the end of the
|
||||||
|
* document if the string is not found.
|
||||||
|
* @return integer
|
||||||
|
* The offset where the string was found.
|
||||||
|
*/
|
||||||
|
findPrevious: function SE_findPrevious(aWrap)
|
||||||
|
{
|
||||||
|
if (!this.lastFind && this.lastFind.lastFound == -1) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
let options = {
|
||||||
|
start: this.lastFind.lastFound - this.lastFind.str.length,
|
||||||
|
ignoreCase: this.lastFind.ignoreCase,
|
||||||
|
backwards: true,
|
||||||
|
};
|
||||||
|
|
||||||
|
let index;
|
||||||
|
if (options.start > 0) {
|
||||||
|
index = this.find(this.lastFind.str, options);
|
||||||
|
} else {
|
||||||
|
index = this._lastFind.index = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (index == -1 && aWrap) {
|
||||||
|
options.start = this.getCharCount() - 1;
|
||||||
|
index = this.find(this.lastFind.str, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
return index;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve the last find operation result. This object holds the following
|
||||||
|
* properties:
|
||||||
|
* - str: the last search string.
|
||||||
|
* - index: stores the result of the most recent find operation. This is the
|
||||||
|
* index in the text where |str| was found or -1 otherwise.
|
||||||
|
* - lastFound: tracks the index where |str| was last found, throughout
|
||||||
|
* multiple find operations. This can be -1 if |str| was never found in the
|
||||||
|
* document.
|
||||||
|
* - ignoreCase: tells if the search was case insensitive or not.
|
||||||
|
* @type object
|
||||||
|
*/
|
||||||
|
Object.defineProperty(SourceEditor.prototype, "lastFind", {
|
||||||
|
get: function() { return this._lastFind; },
|
||||||
|
enumerable: true,
|
||||||
|
configurable: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,7 @@ _BROWSER_TEST_FILES = \
|
||||||
browser_bug684546_reset_undo.js \
|
browser_bug684546_reset_undo.js \
|
||||||
browser_bug695035_middle_click_paste.js \
|
browser_bug695035_middle_click_paste.js \
|
||||||
browser_bug687160_line_api.js \
|
browser_bug687160_line_api.js \
|
||||||
|
browser_bug650345_find.js \
|
||||||
head.js \
|
head.js \
|
||||||
|
|
||||||
libs:: $(_BROWSER_TEST_FILES)
|
libs:: $(_BROWSER_TEST_FILES)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,147 @@
|
||||||
|
/* vim: set ts=2 et sw=2 tw=80: */
|
||||||
|
/* Any copyright is dedicated to the Public Domain.
|
||||||
|
http://creativecommons.org/publicdomain/zero/1.0/ */
|
||||||
|
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
Cu.import("resource:///modules/source-editor.jsm");
|
||||||
|
|
||||||
|
let testWin;
|
||||||
|
let editor;
|
||||||
|
|
||||||
|
function test()
|
||||||
|
{
|
||||||
|
waitForExplicitFinish();
|
||||||
|
|
||||||
|
const windowUrl = "data:text/xml,<?xml version='1.0'?>" +
|
||||||
|
"<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'" +
|
||||||
|
" title='test for bug 650345' width='600' height='500'><hbox flex='1'/></window>";
|
||||||
|
const windowFeatures = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
|
||||||
|
|
||||||
|
testWin = Services.ww.openWindow(null, windowUrl, "_blank", windowFeatures, null);
|
||||||
|
testWin.addEventListener("load", function onWindowLoad() {
|
||||||
|
testWin.removeEventListener("load", onWindowLoad, false);
|
||||||
|
waitForFocus(initEditor, testWin);
|
||||||
|
}, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
function initEditor()
|
||||||
|
{
|
||||||
|
let hbox = testWin.document.querySelector("hbox");
|
||||||
|
editor = new SourceEditor();
|
||||||
|
editor.init(hbox, {}, editorLoaded);
|
||||||
|
}
|
||||||
|
|
||||||
|
function editorLoaded()
|
||||||
|
{
|
||||||
|
editor.focus();
|
||||||
|
|
||||||
|
let text = "foobar bug650345\nBug650345 bazbaz\nfoobar omg\ntest";
|
||||||
|
editor.setText(text);
|
||||||
|
|
||||||
|
let needle = "foobar";
|
||||||
|
is(editor.find(), -1, "find() works");
|
||||||
|
ok(!editor.lastFind, "no editor.lastFind yet");
|
||||||
|
|
||||||
|
is(editor.find(needle), 0, "find('" + needle + "') works");
|
||||||
|
is(editor.lastFind.str, needle, "lastFind.str is correct");
|
||||||
|
is(editor.lastFind.index, 0, "lastFind.index is correct");
|
||||||
|
is(editor.lastFind.lastFound, 0, "lastFind.lastFound is correct");
|
||||||
|
is(editor.lastFind.ignoreCase, false, "lastFind.ignoreCase is correct");
|
||||||
|
|
||||||
|
let newIndex = text.indexOf(needle, needle.length);
|
||||||
|
is(editor.findNext(), newIndex, "findNext() works");
|
||||||
|
is(editor.lastFind.str, needle, "lastFind.str is correct");
|
||||||
|
is(editor.lastFind.index, newIndex, "lastFind.index is correct");
|
||||||
|
is(editor.lastFind.lastFound, newIndex, "lastFind.lastFound is correct");
|
||||||
|
is(editor.lastFind.ignoreCase, false, "lastFind.ignoreCase is correct");
|
||||||
|
|
||||||
|
is(editor.findNext(), -1, "findNext() works again");
|
||||||
|
is(editor.lastFind.index, -1, "lastFind.index is correct");
|
||||||
|
is(editor.lastFind.lastFound, newIndex, "lastFind.lastFound is correct");
|
||||||
|
|
||||||
|
is(editor.findPrevious(), 0, "findPrevious() works");
|
||||||
|
is(editor.lastFind.index, 0, "lastFind.index is correct");
|
||||||
|
is(editor.lastFind.lastFound, 0, "lastFind.lastFound is correct");
|
||||||
|
|
||||||
|
is(editor.findPrevious(), -1, "findPrevious() works again");
|
||||||
|
is(editor.lastFind.index, -1, "lastFind.index is correct");
|
||||||
|
is(editor.lastFind.lastFound, 0, "lastFind.lastFound is correct");
|
||||||
|
|
||||||
|
is(editor.findNext(), newIndex, "findNext() works");
|
||||||
|
is(editor.lastFind.index, newIndex, "lastFind.index is correct");
|
||||||
|
is(editor.lastFind.lastFound, newIndex, "lastFind.lastFound is correct");
|
||||||
|
|
||||||
|
is(editor.findNext(true), 0, "findNext(true) works");
|
||||||
|
is(editor.lastFind.index, 0, "lastFind.index is correct");
|
||||||
|
is(editor.lastFind.lastFound, 0, "lastFind.lastFound is correct");
|
||||||
|
|
||||||
|
is(editor.findNext(true), newIndex, "findNext(true) works again");
|
||||||
|
is(editor.lastFind.index, newIndex, "lastFind.index is correct");
|
||||||
|
is(editor.lastFind.lastFound, newIndex, "lastFind.lastFound is correct");
|
||||||
|
|
||||||
|
is(editor.findPrevious(true), 0, "findPrevious(true) works");
|
||||||
|
is(editor.lastFind.index, 0, "lastFind.index is correct");
|
||||||
|
is(editor.lastFind.lastFound, 0, "lastFind.lastFound is correct");
|
||||||
|
|
||||||
|
is(editor.findPrevious(true), newIndex, "findPrevious(true) works again");
|
||||||
|
is(editor.lastFind.index, newIndex, "lastFind.index is correct");
|
||||||
|
is(editor.lastFind.lastFound, newIndex, "lastFind.lastFound is correct");
|
||||||
|
|
||||||
|
needle = "error";
|
||||||
|
is(editor.find(needle), -1, "find('" + needle + "') works");
|
||||||
|
is(editor.lastFind.str, needle, "lastFind.str is correct");
|
||||||
|
is(editor.lastFind.index, -1, "lastFind.index is correct");
|
||||||
|
is(editor.lastFind.lastFound, -1, "lastFind.lastFound is correct");
|
||||||
|
is(editor.lastFind.ignoreCase, false, "lastFind.ignoreCase is correct");
|
||||||
|
|
||||||
|
is(editor.findNext(), -1, "findNext() works");
|
||||||
|
is(editor.lastFind.str, needle, "lastFind.str is correct");
|
||||||
|
is(editor.lastFind.index, -1, "lastFind.index is correct");
|
||||||
|
is(editor.lastFind.lastFound, -1, "lastFind.lastFound is correct");
|
||||||
|
is(editor.findNext(true), -1, "findNext(true) works");
|
||||||
|
|
||||||
|
is(editor.findPrevious(), -1, "findPrevious() works");
|
||||||
|
is(editor.findPrevious(true), -1, "findPrevious(true) works");
|
||||||
|
|
||||||
|
needle = "bug650345";
|
||||||
|
newIndex = text.indexOf(needle);
|
||||||
|
|
||||||
|
is(editor.find(needle), newIndex, "find('" + needle + "') works");
|
||||||
|
is(editor.findNext(), -1, "findNext() works");
|
||||||
|
is(editor.findNext(true), newIndex, "findNext(true) works");
|
||||||
|
is(editor.findPrevious(), -1, "findPrevious() works");
|
||||||
|
is(editor.findPrevious(true), newIndex, "findPrevious(true) works");
|
||||||
|
is(editor.lastFind.index, newIndex, "lastFind.index is correct");
|
||||||
|
is(editor.lastFind.lastFound, newIndex, "lastFind.lastFound is correct");
|
||||||
|
|
||||||
|
is(editor.find(needle, {ignoreCase: 1}), newIndex,
|
||||||
|
"find('" + needle + "', {ignoreCase: 1}) works");
|
||||||
|
is(editor.lastFind.ignoreCase, true, "lastFind.ignoreCase is correct");
|
||||||
|
|
||||||
|
let newIndex2 = text.toLowerCase().indexOf(needle, newIndex + needle.length);
|
||||||
|
is(editor.findNext(), newIndex2, "findNext() works");
|
||||||
|
is(editor.findNext(), -1, "findNext() works");
|
||||||
|
is(editor.lastFind.index, -1, "lastFind.index is correct");
|
||||||
|
is(editor.lastFind.lastFound, newIndex2, "lastFind.lastFound is correct");
|
||||||
|
|
||||||
|
is(editor.findNext(true), newIndex, "findNext(true) works");
|
||||||
|
|
||||||
|
is(editor.findPrevious(), -1, "findPrevious() works");
|
||||||
|
is(editor.findPrevious(true), newIndex2, "findPrevious(true) works");
|
||||||
|
is(editor.findPrevious(), newIndex, "findPrevious() works again");
|
||||||
|
|
||||||
|
needle = "foobar";
|
||||||
|
newIndex = text.indexOf(needle, 2);
|
||||||
|
is(editor.find(needle, {start: 2}), newIndex,
|
||||||
|
"find('" + needle + "', {start:2}) works");
|
||||||
|
is(editor.findNext(), -1, "findNext() works");
|
||||||
|
is(editor.findNext(true), 0, "findNext(true) works");
|
||||||
|
|
||||||
|
editor.destroy();
|
||||||
|
|
||||||
|
testWin.close();
|
||||||
|
testWin = editor = null;
|
||||||
|
|
||||||
|
waitForFocus(finish, window);
|
||||||
|
}
|
||||||
|
|
@ -92,19 +92,17 @@ function runSelectionTests()
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
|
InspectorUI.INSPECTOR_NOTIFICATIONS.OPENED, false);
|
||||||
|
|
||||||
executeSoon(function() {
|
executeSoon(function() {
|
||||||
Services.obs.addObserver(performTestComparisons,
|
InspectorUI.highlighter.addListener("nodeselected", performTestComparisons);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
EventUtils.synthesizeMouse(h1, 2, 2, {type: "mousemove"}, content);
|
EventUtils.synthesizeMouse(h1, 2, 2, {type: "mousemove"}, content);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function performTestComparisons(evt)
|
function performTestComparisons(evt)
|
||||||
{
|
{
|
||||||
Services.obs.removeObserver(performTestComparisons,
|
InspectorUI.highlighter.removeListener("nodeselected", performTestComparisons);
|
||||||
InspectorUI.INSPECTOR_NOTIFICATIONS.HIGHLIGHTING, false);
|
|
||||||
|
|
||||||
InspectorUI.stopInspecting();
|
InspectorUI.stopInspecting();
|
||||||
ok(InspectorUI.highlighter.isHighlighting, "highlighter is highlighting");
|
is(InspectorUI.highlighter.node, h1, "node selected");
|
||||||
is(InspectorUI.selection, h1, "selection matches node");
|
is(InspectorUI.selection, h1, "selection matches node");
|
||||||
|
|
||||||
HUDService.activateHUDForContext(gBrowser.selectedTab);
|
HUDService.activateHUDForContext(gBrowser.selectedTab);
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,10 @@
|
||||||
; Package file for the Firefox build.
|
; Package file for the Firefox build.
|
||||||
;
|
;
|
||||||
|
; Packaging manifest is used to copy files from dist/bin
|
||||||
|
; to the staging directory.
|
||||||
|
; Some other files are built in the staging directory directly,
|
||||||
|
; so they will be implicitly packaged too.
|
||||||
|
;
|
||||||
; File format:
|
; File format:
|
||||||
;
|
;
|
||||||
; [] designates a toplevel component. Example: [xpcom]
|
; [] designates a toplevel component. Example: [xpcom]
|
||||||
|
|
@ -501,36 +506,29 @@
|
||||||
|
|
||||||
; [Personal Security Manager]
|
; [Personal Security Manager]
|
||||||
;
|
;
|
||||||
@BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
|
; NSS libraries are signed in the staging directory,
|
||||||
@BINPATH@/components/pipboot.xpt
|
; meaning their .chk files are created there directly.
|
||||||
@BINPATH@/components/pipnss.xpt
|
;
|
||||||
@BINPATH@/components/pippki.xpt
|
@BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
|
||||||
@BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
|
@BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
|
||||||
|
@BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
|
||||||
|
#ifndef NSS_DISABLE_DBM
|
||||||
|
@BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
|
||||||
|
#endif
|
||||||
@BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
|
@BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
|
||||||
@BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
|
@BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
|
||||||
@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
|
@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
|
||||||
@BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
|
|
||||||
@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
|
@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
|
||||||
#ifndef CROSS_COMPILE
|
|
||||||
@BINPATH@/@DLL_PREFIX@freebl3.chk
|
|
||||||
@BINPATH@/@DLL_PREFIX@softokn3.chk
|
|
||||||
#endif
|
|
||||||
#ifndef NSS_DISABLE_DBM
|
|
||||||
@BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
|
|
||||||
#ifndef CROSS_COMPILE
|
|
||||||
@BINPATH@/@DLL_PREFIX@nssdbm3.chk
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
@BINPATH@/chrome/pippki@JAREXT@
|
@BINPATH@/chrome/pippki@JAREXT@
|
||||||
@BINPATH@/chrome/pippki.manifest
|
@BINPATH@/chrome/pippki.manifest
|
||||||
|
@BINPATH@/components/pipboot.xpt
|
||||||
|
@BINPATH@/components/pipnss.xpt
|
||||||
|
@BINPATH@/components/pippki.xpt
|
||||||
|
|
||||||
; for Solaris SPARC
|
; for Solaris SPARC
|
||||||
#ifdef SOLARIS
|
#ifdef SOLARIS
|
||||||
bin/libfreebl_32fpu_3.chk
|
|
||||||
bin/libfreebl_32fpu_3.so
|
bin/libfreebl_32fpu_3.so
|
||||||
bin/libfreebl_32int_3.chk
|
|
||||||
bin/libfreebl_32int_3.so
|
bin/libfreebl_32int_3.so
|
||||||
bin/libfreebl_32int64_3.chk
|
|
||||||
bin/libfreebl_32int64_3.so
|
bin/libfreebl_32int64_3.so
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -67,6 +67,26 @@
|
||||||
<!ENTITY selectAllCmd.key "A">
|
<!ENTITY selectAllCmd.key "A">
|
||||||
<!ENTITY selectAllCmd.accesskey "A">
|
<!ENTITY selectAllCmd.accesskey "A">
|
||||||
|
|
||||||
|
<!ENTITY findCmd.label "Find…">
|
||||||
|
<!ENTITY findCmd.key "F">
|
||||||
|
<!ENTITY findCmd.accesskey "F">
|
||||||
|
|
||||||
|
<!ENTITY findAgainCmd.label "Find Again…">
|
||||||
|
<!-- LOCALIZATION NOTE (findAgainCmd.key): This key is used only on Macs.
|
||||||
|
- Windows and Linux builds use the F3 key which is not localizable on purpose.
|
||||||
|
-->
|
||||||
|
<!ENTITY findAgainCmd.key "G">
|
||||||
|
<!ENTITY findAgainCmd.accesskey "g">
|
||||||
|
<!-- LOCALIZATION NOTE (findPreviousCmd.key): This key is used only on Macs.
|
||||||
|
- Windows and Linux builds use the Shift-F3 key which is not localizable on
|
||||||
|
- purpose.
|
||||||
|
-->
|
||||||
|
<!ENTITY findPreviousCmd.key "G">
|
||||||
|
|
||||||
|
<!ENTITY gotoLineCmd.label "Jump to line…">
|
||||||
|
<!ENTITY gotoLineCmd.key "J">
|
||||||
|
<!ENTITY gotoLineCmd.accesskey "J">
|
||||||
|
|
||||||
<!ENTITY run.label "Run">
|
<!ENTITY run.label "Run">
|
||||||
<!ENTITY run.accesskey "R">
|
<!ENTITY run.accesskey "R">
|
||||||
<!ENTITY run.key "r">
|
<!ENTITY run.key "r">
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,30 @@
|
||||||
|
# LOCALIZATION NOTE These strings are used inside the Source Editor component.
|
||||||
|
# This component is used whenever source code is displayed for the purpose of
|
||||||
|
# being edited, inside the Firefox developer tools - current examples are the
|
||||||
|
# Scratchpad and the Style Editor tools.
|
||||||
|
|
||||||
|
# LOCALIZATION NOTE The correct localization of this file might be to keep it
|
||||||
|
# in English, or another language commonly spoken among web developers.
|
||||||
|
# You want to make that choice consistent across the developer tools.
|
||||||
|
# A good criteria is the language in which you'd find the best documentation
|
||||||
|
# on web development on the web.
|
||||||
|
|
||||||
|
# LOCALIZATION NOTE (findCmd.promptTitle): This is the dialog title used
|
||||||
|
# when the user wants to search for a string in the code. You can
|
||||||
|
# access this feature by pressing Ctrl-F on Windows/Linux or Cmd-F on Mac.
|
||||||
|
findCmd.promptTitle=Find…
|
||||||
|
|
||||||
|
# LOCALIZATION NOTE (gotoLineCmd.promptMessage): This is the message shown when
|
||||||
|
# the user wants to search for a string in the code. You can
|
||||||
|
# access this feature by pressing Ctrl-F on Windows/Linux or Cmd-F on Mac.
|
||||||
|
findCmd.promptMessage=Search for:
|
||||||
|
|
||||||
|
# LOCALIZATION NOTE (gotoLineCmd.promptTitle): This is the dialog title used
|
||||||
|
# when the user wants to jump to a specific line number in the code. You can
|
||||||
|
# access this feature by pressing Ctrl-J on Windows/Linux or Cmd-J on Mac.
|
||||||
|
gotoLineCmd.promptTitle=Go to line…
|
||||||
|
|
||||||
|
# LOCALIZATION NOTE (gotoLineCmd.promptMessage): This is the message shown when
|
||||||
|
# the user wants to jump to a specific line number in the code. You can
|
||||||
|
# access this feature by pressing Ctrl-J on Windows/Linux or Cmd-J on Mac.
|
||||||
|
gotoLineCmd.promptMessage=Jump to line number:
|
||||||
|
|
@ -27,6 +27,7 @@
|
||||||
locale/browser/devtools/styleinspector.properties (%chrome/browser/devtools/styleinspector.properties)
|
locale/browser/devtools/styleinspector.properties (%chrome/browser/devtools/styleinspector.properties)
|
||||||
locale/browser/devtools/styleinspector.dtd (%chrome/browser/devtools/styleinspector.dtd)
|
locale/browser/devtools/styleinspector.dtd (%chrome/browser/devtools/styleinspector.dtd)
|
||||||
locale/browser/devtools/webConsole.dtd (%chrome/browser/devtools/webConsole.dtd)
|
locale/browser/devtools/webConsole.dtd (%chrome/browser/devtools/webConsole.dtd)
|
||||||
|
locale/browser/devtools/sourceeditor.properties (%chrome/browser/devtools/sourceeditor.properties)
|
||||||
locale/browser/openLocation.dtd (%chrome/browser/openLocation.dtd)
|
locale/browser/openLocation.dtd (%chrome/browser/openLocation.dtd)
|
||||||
locale/browser/openLocation.properties (%chrome/browser/openLocation.properties)
|
locale/browser/openLocation.properties (%chrome/browser/openLocation.properties)
|
||||||
* locale/browser/pageInfo.dtd (%chrome/browser/pageInfo.dtd)
|
* locale/browser/pageInfo.dtd (%chrome/browser/pageInfo.dtd)
|
||||||
|
|
|
||||||
|
|
@ -5539,7 +5539,7 @@ mjit::Compiler::jsop_setprop(PropertyName *name, bool popGuaranteed)
|
||||||
ScriptAnalysis::NameAccess access =
|
ScriptAnalysis::NameAccess access =
|
||||||
analysis->resolveNameAccess(cx, ATOM_TO_JSID(name), true);
|
analysis->resolveNameAccess(cx, ATOM_TO_JSID(name), true);
|
||||||
if (access.nesting) {
|
if (access.nesting) {
|
||||||
/* Use a SavedReg so it isn't clobbered by sync or the stub call. */
|
/* Use a SavedReg so it isn't clobbered by the stub call. */
|
||||||
RegisterID nameReg = frame.allocReg(Registers::SavedRegs).reg();
|
RegisterID nameReg = frame.allocReg(Registers::SavedRegs).reg();
|
||||||
Address address = frame.loadNameAddress(access, nameReg);
|
Address address = frame.loadNameAddress(access, nameReg);
|
||||||
|
|
||||||
|
|
@ -5586,9 +5586,9 @@ mjit::Compiler::jsop_setprop(PropertyName *name, bool popGuaranteed)
|
||||||
if (!isObject)
|
if (!isObject)
|
||||||
notObject = frame.testObject(Assembler::NotEqual, lhs);
|
notObject = frame.testObject(Assembler::NotEqual, lhs);
|
||||||
#ifdef JSGC_INCREMENTAL_MJ
|
#ifdef JSGC_INCREMENTAL_MJ
|
||||||
|
frame.pinReg(reg);
|
||||||
if (cx->compartment->needsBarrier() && propertyTypes->needsBarrier(cx)) {
|
if (cx->compartment->needsBarrier() && propertyTypes->needsBarrier(cx)) {
|
||||||
/* Write barrier. */
|
/* Write barrier. */
|
||||||
frame.pinReg(reg);
|
|
||||||
Jump j = masm.testGCThing(Address(reg, JSObject::getFixedSlotOffset(slot)));
|
Jump j = masm.testGCThing(Address(reg, JSObject::getFixedSlotOffset(slot)));
|
||||||
stubcc.linkExit(j, Uses(0));
|
stubcc.linkExit(j, Uses(0));
|
||||||
stubcc.leave();
|
stubcc.leave();
|
||||||
|
|
@ -5596,8 +5596,8 @@ mjit::Compiler::jsop_setprop(PropertyName *name, bool popGuaranteed)
|
||||||
reg, Registers::ArgReg1);
|
reg, Registers::ArgReg1);
|
||||||
OOL_STUBCALL(stubs::GCThingWriteBarrier, REJOIN_NONE);
|
OOL_STUBCALL(stubs::GCThingWriteBarrier, REJOIN_NONE);
|
||||||
stubcc.rejoin(Changes(0));
|
stubcc.rejoin(Changes(0));
|
||||||
frame.unpinReg(reg);
|
|
||||||
}
|
}
|
||||||
|
frame.unpinReg(reg);
|
||||||
#endif
|
#endif
|
||||||
if (!isObject) {
|
if (!isObject) {
|
||||||
stubcc.linkExit(notObject.get(), Uses(2));
|
stubcc.linkExit(notObject.get(), Uses(2));
|
||||||
|
|
|
||||||
|
|
@ -1188,26 +1188,17 @@ mjit::Compiler::jsop_setelem_dense()
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The sync call below can potentially clobber key.reg() and slotsReg.
|
* The sync call below can potentially clobber key.reg() and slotsReg.
|
||||||
* We pin key.reg() to avoid it being clobbered. If |hoisted| is true,
|
* So we save and restore them. Additionally, the WriteBarrier stub can
|
||||||
* we can also pin slotsReg. If not, then slotsReg is owned by the
|
* clobber both registers. The rejoin call will restore key.reg() but
|
||||||
* compiler and we save in manually to VMFrame::scratch.
|
* not slotsReg. So we restore it again after the stub call.
|
||||||
*
|
|
||||||
* Additionally, the WriteBarrier stub can clobber both registers. The
|
|
||||||
* rejoin call will restore key.reg() but not slotsReg. So we save
|
|
||||||
* slotsReg in the frame and restore it after the stub call.
|
|
||||||
*/
|
*/
|
||||||
stubcc.masm.storePtr(slotsReg, FrameAddress(offsetof(VMFrame, scratch)));
|
stubcc.masm.storePtr(slotsReg, FrameAddress(offsetof(VMFrame, scratch)));
|
||||||
if (hoisted)
|
|
||||||
frame.pinReg(slotsReg);
|
|
||||||
if (!key.isConstant())
|
if (!key.isConstant())
|
||||||
frame.pinReg(key.reg());
|
stubcc.masm.push(key.reg());
|
||||||
frame.sync(stubcc.masm, Uses(3));
|
frame.sync(stubcc.masm, Uses(3));
|
||||||
if (!key.isConstant())
|
if (!key.isConstant())
|
||||||
frame.unpinReg(key.reg());
|
stubcc.masm.pop(key.reg());
|
||||||
if (hoisted)
|
stubcc.masm.loadPtr(FrameAddress(offsetof(VMFrame, scratch)), slotsReg);
|
||||||
frame.unpinReg(slotsReg);
|
|
||||||
else
|
|
||||||
stubcc.masm.loadPtr(FrameAddress(offsetof(VMFrame, scratch)), slotsReg);
|
|
||||||
|
|
||||||
if (key.isConstant())
|
if (key.isConstant())
|
||||||
stubcc.masm.lea(Address(slotsReg, key.index() * sizeof(Value)), Registers::ArgReg1);
|
stubcc.masm.lea(Address(slotsReg, key.index() * sizeof(Value)), Registers::ArgReg1);
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ using namespace js;
|
||||||
using namespace js::mjit;
|
using namespace js::mjit;
|
||||||
|
|
||||||
ImmutableSync::ImmutableSync()
|
ImmutableSync::ImmutableSync()
|
||||||
: cx(NULL), entries(NULL), frame(NULL), avail(Registers::TempRegs), generation(0)
|
: cx(NULL), entries(NULL), frame(NULL), avail(Registers::AvailRegs), generation(0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -71,7 +71,7 @@ ImmutableSync::init(JSContext *cx, const FrameState &frame, uint32_t nentries)
|
||||||
void
|
void
|
||||||
ImmutableSync::reset(Assembler *masm, Registers avail, FrameEntry *top, FrameEntry *bottom)
|
ImmutableSync::reset(Assembler *masm, Registers avail, FrameEntry *top, FrameEntry *bottom)
|
||||||
{
|
{
|
||||||
this->avail = avail & Registers::TempRegs;
|
this->avail = avail;
|
||||||
this->masm = masm;
|
this->masm = masm;
|
||||||
this->top = top;
|
this->top = top;
|
||||||
this->bottom = bottom;
|
this->bottom = bottom;
|
||||||
|
|
@ -91,7 +91,7 @@ ImmutableSync::doAllocReg()
|
||||||
/* Find something to evict. */
|
/* Find something to evict. */
|
||||||
for (uint32_t i = 0; i < Registers::TotalRegisters; i++) {
|
for (uint32_t i = 0; i < Registers::TotalRegisters; i++) {
|
||||||
RegisterID reg = RegisterID(i);
|
RegisterID reg = RegisterID(i);
|
||||||
if (!(Registers::maskReg(reg) & Registers::TempRegs))
|
if (!(Registers::maskReg(reg) & Registers::AvailRegs))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (frame->regstate(reg).isPinned())
|
if (frame->regstate(reg).isPinned())
|
||||||
|
|
@ -151,14 +151,13 @@ ImmutableSync::allocReg()
|
||||||
{
|
{
|
||||||
RegisterID reg = doAllocReg();
|
RegisterID reg = doAllocReg();
|
||||||
JS_ASSERT(!frame->regstate(reg).isPinned());
|
JS_ASSERT(!frame->regstate(reg).isPinned());
|
||||||
JS_ASSERT(!Registers::isSaved(reg));
|
|
||||||
return reg;
|
return reg;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ImmutableSync::freeReg(JSC::MacroAssembler::RegisterID reg)
|
ImmutableSync::freeReg(JSC::MacroAssembler::RegisterID reg)
|
||||||
{
|
{
|
||||||
if (!frame->regstate(reg).isPinned() && !Registers::isSaved(reg))
|
if (!frame->regstate(reg).isPinned())
|
||||||
avail.putReg(reg);
|
avail.putReg(reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -573,10 +573,6 @@ struct Registers {
|
||||||
return freeMask == other.freeMask;
|
return freeMask == other.freeMask;
|
||||||
}
|
}
|
||||||
|
|
||||||
Registers operator &(const Registers &other) {
|
|
||||||
return Registers(freeMask & other.freeMask);
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t freeMask;
|
uint32_t freeMask;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,7 @@ import android.view.ViewGroup;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.text.TextWatcher;
|
import android.text.TextWatcher;
|
||||||
|
import android.text.TextUtils;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
|
|
||||||
import org.json.JSONArray;
|
import org.json.JSONArray;
|
||||||
|
|
@ -187,7 +188,8 @@ public class GeckoPreferences
|
||||||
|
|
||||||
String text1 = input1.getText().toString();
|
String text1 = input1.getText().toString();
|
||||||
String text2 = input2.getText().toString();
|
String text2 = input2.getText().toString();
|
||||||
dialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(text1.equals(text2));
|
boolean disabled = TextUtils.isEmpty(text1) || TextUtils.isEmpty(text2) || !text1.equals(text2);
|
||||||
|
dialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(!disabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
|
public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
|
||||||
|
|
@ -230,8 +232,8 @@ public class GeckoPreferences
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
dialog = builder.create();
|
dialog = builder.create();
|
||||||
dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
|
dialog.setOnShowListener(new DialogInterface.OnShowListener() {
|
||||||
public void onDismiss(DialogInterface dialog) {
|
public void onShow(DialogInterface dialog) {
|
||||||
input1.setText("");
|
input1.setText("");
|
||||||
input2.setText("");
|
input2.setText("");
|
||||||
input1.requestFocus();
|
input1.requestFocus();
|
||||||
|
|
|
||||||
|
|
@ -135,13 +135,6 @@
|
||||||
</implementation>
|
</implementation>
|
||||||
</binding>
|
</binding>
|
||||||
|
|
||||||
<binding id="select-button" extends="xul:box">
|
|
||||||
<content>
|
|
||||||
<svg:svg width="11px" version="1.1" xmlns="http://www.w3.org/2000/svg" style="position: absolute; top: -moz-calc(50% - 2px); left: 4px;">
|
|
||||||
<svg:polyline points="1 1 5 6 9 1" stroke="#414141" stroke-width="2" stroke-linecap="round" fill="transparent" stroke-linejoin="round"/>
|
|
||||||
</svg:svg>
|
|
||||||
</content>
|
|
||||||
</binding>
|
|
||||||
|
|
||||||
<binding id="textbox" extends="chrome://global/content/bindings/textbox.xml#textbox">
|
<binding id="textbox" extends="chrome://global/content/bindings/textbox.xml#textbox">
|
||||||
<handlers>
|
<handlers>
|
||||||
|
|
|
||||||
|
|
@ -2683,7 +2683,7 @@ var FormAssistant = {
|
||||||
handleClick: function(aTarget) {
|
handleClick: function(aTarget) {
|
||||||
let target = aTarget;
|
let target = aTarget;
|
||||||
while (target) {
|
while (target) {
|
||||||
if (this._isSelectElement(target)) {
|
if (this._isSelectElement(target) && !target.disabled) {
|
||||||
target.focus();
|
target.focus();
|
||||||
let list = this.getListForElement(target);
|
let list = this.getListForElement(target);
|
||||||
this.show(list, target);
|
this.show(list, target);
|
||||||
|
|
|
||||||
|
|
@ -231,22 +231,20 @@ input[type="checkbox"] {
|
||||||
padding: 2px 1px 2px 1px;
|
padding: 2px 1px 2px 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
select > input[type="button"] {
|
select > button {
|
||||||
border-width: 0px !important;
|
border-width: 0px !important;
|
||||||
margin: 0px !important;
|
margin: 0px !important;
|
||||||
padding: 0px !important;
|
padding: 0px !important;
|
||||||
-moz-border-radius: 0;
|
-moz-border-radius: 0;
|
||||||
color: #414141;
|
color: #414141;
|
||||||
|
|
||||||
background-size: 100% 90%;
|
background-size: auto auto, 100% 90%;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
background-image: -moz-radial-gradient(bottom left, #bbbbbb 40%, #f5f5f5) !important;
|
background-image: url("chrome://browser/skin/images/dropmarker.svg"),
|
||||||
background-position: -15px center !important;
|
-moz-radial-gradient(bottom left, #bbbbbb 40%, #f5f5f5) !important;
|
||||||
|
background-position: -moz-calc(50% + 1px) center, -15px center !important;
|
||||||
background-repeat: no-repeat !important;
|
background-repeat: no-repeat !important;
|
||||||
|
|
||||||
/* Use to position an svg arrow on <select> element */
|
|
||||||
-moz-binding: url("chrome://browser/content/bindings.xml#select-button");
|
|
||||||
position: relative !important;
|
|
||||||
font-size: inherit;
|
font-size: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -330,7 +328,7 @@ input[type="checkbox"][disabled]:hover:active {
|
||||||
border:1px solid rgba(125,125,125,0.4) !important;
|
border:1px solid rgba(125,125,125,0.4) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
select[disabled] > input[type="button"] {
|
select[disabled] > button {
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
padding: 1px 7px 1px 7px;
|
padding: 1px 7px 1px 7px;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -231,22 +231,20 @@ input[type="checkbox"] {
|
||||||
padding: 2px 1px 2px 1px;
|
padding: 2px 1px 2px 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
select > input[type="button"] {
|
select > button {
|
||||||
border-width: 0px !important;
|
border-width: 0px !important;
|
||||||
margin: 0px !important;
|
margin: 0px !important;
|
||||||
padding: 0px !important;
|
padding: 0px !important;
|
||||||
-moz-border-radius: 0;
|
-moz-border-radius: 0;
|
||||||
color: #414141;
|
color: #414141;
|
||||||
|
|
||||||
background-size: 100% 90%;
|
background-size: auto auto, 100% 90%;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
background-image: -moz-radial-gradient(bottom left, #bbbbbb 40%, #f5f5f5) !important;
|
background-image: url("chrome://browser/skin/images/dropmarker.svg"),
|
||||||
background-position: -15px center !important;
|
-moz-radial-gradient(bottom left, #bbbbbb 40%, #f5f5f5) !important;
|
||||||
|
background-position: -moz-calc(50% + 1px) center, -15px center !important;
|
||||||
background-repeat: no-repeat !important;
|
background-repeat: no-repeat !important;
|
||||||
|
|
||||||
/* Use to position an svg arrow on <select> element */
|
|
||||||
-moz-binding: url("chrome://browser/content/bindings.xml#select-button");
|
|
||||||
position: relative !important;
|
|
||||||
font-size: inherit;
|
font-size: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -330,7 +328,7 @@ input[type="checkbox"][disabled]:hover:active {
|
||||||
border:1px solid rgba(125,125,125,0.4) !important;
|
border:1px solid rgba(125,125,125,0.4) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
select[disabled] > input[type="button"] {
|
select[disabled] > button {
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
padding: 1px 7px 1px 7px;
|
padding: 1px 7px 1px 7px;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
|
||||||
|
<svg width="10px" height="7px" version="1.1" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<polyline points="1 1 5 6 9 1" stroke="#414141" stroke-width="2" stroke-linecap="round" fill="transparent" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
После Ширина: | Высота: | Размер: 246 B |
|
|
@ -22,6 +22,7 @@ chrome.jar:
|
||||||
skin/images/arrowleft-16.png (images/arrowleft-16.png)
|
skin/images/arrowleft-16.png (images/arrowleft-16.png)
|
||||||
skin/images/arrowright-16.png (images/arrowright-16.png)
|
skin/images/arrowright-16.png (images/arrowright-16.png)
|
||||||
skin/images/arrowdown-16.png (images/arrowdown-16.png)
|
skin/images/arrowdown-16.png (images/arrowdown-16.png)
|
||||||
|
skin/images/dropmarker.svg (images/dropmarker.svg)
|
||||||
skin/images/popup-selected-item-hdpi.png (images/popup-selected-item-hdpi.png)
|
skin/images/popup-selected-item-hdpi.png (images/popup-selected-item-hdpi.png)
|
||||||
skin/images/errorpage-warning.png (images/errorpage-warning.png)
|
skin/images/errorpage-warning.png (images/errorpage-warning.png)
|
||||||
skin/images/errorpage-warning.png (images/errorpage-warning.png)
|
skin/images/errorpage-warning.png (images/errorpage-warning.png)
|
||||||
|
|
@ -68,6 +69,7 @@ chrome.jar:
|
||||||
skin/gingerbread/images/arrowleft-16.png (gingerbread/images/arrowleft-16.png)
|
skin/gingerbread/images/arrowleft-16.png (gingerbread/images/arrowleft-16.png)
|
||||||
skin/gingerbread/images/arrowright-16.png (gingerbread/images/arrowright-16.png)
|
skin/gingerbread/images/arrowright-16.png (gingerbread/images/arrowright-16.png)
|
||||||
skin/gingerbread/images/arrowdown-16.png (gingerbread/images/arrowdown-16.png)
|
skin/gingerbread/images/arrowdown-16.png (gingerbread/images/arrowdown-16.png)
|
||||||
|
skin/gingerbread/images/dropmarker.svg (images/dropmarker.svg)
|
||||||
skin/gingerbread/images/popup-selected-item-hdpi.png (gingerbread/images/popup-selected-item-hdpi.png)
|
skin/gingerbread/images/popup-selected-item-hdpi.png (gingerbread/images/popup-selected-item-hdpi.png)
|
||||||
skin/gingerbread/images/throbber.png (gingerbread/images/throbber.png)
|
skin/gingerbread/images/throbber.png (gingerbread/images/throbber.png)
|
||||||
skin/gingerbread/images/alert-addons-30.png (gingerbread/images/alert-addons-30.png)
|
skin/gingerbread/images/alert-addons-30.png (gingerbread/images/alert-addons-30.png)
|
||||||
|
|
@ -111,6 +113,7 @@ chrome.jar:
|
||||||
skin/honeycomb/images/arrowleft-16.png (honeycomb/images/arrowleft-16.png)
|
skin/honeycomb/images/arrowleft-16.png (honeycomb/images/arrowleft-16.png)
|
||||||
skin/honeycomb/images/arrowright-16.png (honeycomb/images/arrowright-16.png)
|
skin/honeycomb/images/arrowright-16.png (honeycomb/images/arrowright-16.png)
|
||||||
skin/honeycomb/images/arrowdown-16.png (honeycomb/images/arrowdown-16.png)
|
skin/honeycomb/images/arrowdown-16.png (honeycomb/images/arrowdown-16.png)
|
||||||
|
skin/honeycomb/images/dropmarker.svg (images/dropmarker.svg)
|
||||||
skin/honeycomb/images/popup-selected-item-hdpi.png (honeycomb/images/popup-selected-item-hdpi.png)
|
skin/honeycomb/images/popup-selected-item-hdpi.png (honeycomb/images/popup-selected-item-hdpi.png)
|
||||||
skin/honeycomb/images/throbber.png (honeycomb/images/throbber.png)
|
skin/honeycomb/images/throbber.png (honeycomb/images/throbber.png)
|
||||||
skin/honeycomb/images/alert-addons-30.png (honeycomb/images/alert-addons-30.png)
|
skin/honeycomb/images/alert-addons-30.png (honeycomb/images/alert-addons-30.png)
|
||||||
|
|
|
||||||
|
|
@ -231,7 +231,7 @@ input[type="checkbox"] {
|
||||||
padding: 2px 1px 2px 1px;
|
padding: 2px 1px 2px 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
select > input[type="button"] {
|
select > button {
|
||||||
border-width: 0px !important;
|
border-width: 0px !important;
|
||||||
margin: 0px !important;
|
margin: 0px !important;
|
||||||
padding: 0px !important;
|
padding: 0px !important;
|
||||||
|
|
@ -330,7 +330,7 @@ input[type="checkbox"][disabled]:hover:active {
|
||||||
border:1px solid rgba(125,125,125,0.4) !important;
|
border:1px solid rgba(125,125,125,0.4) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
select[disabled] > input[type="button"] {
|
select[disabled] > button {
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
padding: 1px 7px 1px 7px;
|
padding: 1px 7px 1px 7px;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -231,7 +231,7 @@ input[type="checkbox"] {
|
||||||
padding: 2px 1px 2px 1px;
|
padding: 2px 1px 2px 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
select > input[type="button"] {
|
select > button {
|
||||||
border-width: 0px !important;
|
border-width: 0px !important;
|
||||||
margin: 0px !important;
|
margin: 0px !important;
|
||||||
padding: 0px !important;
|
padding: 0px !important;
|
||||||
|
|
@ -330,7 +330,7 @@ input[type="checkbox"][disabled]:hover:active {
|
||||||
border:1px solid rgba(125,125,125,0.4) !important;
|
border:1px solid rgba(125,125,125,0.4) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
select[disabled] > input[type="button"] {
|
select[disabled] > button {
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
padding: 1px 7px 1px 7px;
|
padding: 1px 7px 1px 7px;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
{
|
{
|
||||||
"talos_zip": "http://build.mozilla.org/talos/zips/talos.bug714116.zip"
|
"talos_zip": "http://build.mozilla.org/talos/zips/talos.bug718795.d93f2b21985c.zip"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче