wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 785186 - Use the context menu in the markup panel. r=jwalker

Browse Source
This commit is contained in:
Dave Camp 2012-08-24 17:54:09 -07:00
parent 16a410967c
commit 09cb409e4b
3 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/devtools/highlighter/highlighter.jsm
View File

@ -455,6 +455,10 @@ Highlighter.prototype = {
let nodeInfobar = this.chromeDoc.createElement("hbox");
nodeInfobar.id = "highlighter-nodeinfobar";
nodeInfobar.addEventListener("mousedown", function(aEvent) {
this.emitEvent("nodeselected");
}.bind(this), true);
let arrowBoxTop = this.chromeDoc.createElement("box");
arrowBoxTop.className = "highlighter-nodeinfobar-arrow";
arrowBoxTop.id = "highlighter-nodeinfobar-arrow-top";

39
browser/devtools/highlighter/inspector.jsm
View File

@ -258,6 +258,7 @@ Inspector.prototype = {
this._markupFrame = doc.createElement("iframe");
this._markupFrame.setAttribute("flex", "1");
this._markupFrame.setAttribute("tooltip", "aHTMLTooltip");
this._markupFrame.setAttribute("context", "inspector-node-popup");
// This is needed to enable tooltips inside the iframe document.
this._boundMarkupFrameLoad = function Inspector_initMarkupPanel_onload() {
@ -1203,13 +1204,31 @@ InspectorUI.prototype = {
}
},
/**
* Return the currently-selected node for the purposes of the
* context menu. This is usually the highlighter selection, unless
* the markup panel has a selected node that can't be highlighted
* (such as a text node). This will be fixed once the highlighter/inspector
* is confortable with non-element nodes being the current selection.
* See bug 785180.
*/
_contextSelection: function IUI__contextSelection()
{
let inspector = this.currentInspector;
if (inspector.markup) {
return inspector.markup.selected;
}
return this.selection;
},
/**
* Copy the innerHTML of the selected Node to the clipboard. Called via the
* Inspector:CopyInner command.
*/
copyInnerHTML: function IUI_copyInnerHTML()
{
clipboardHelper.copyString(this.selection.innerHTML, this.selection.ownerDocument);
let selection = this._contextSelection();
clipboardHelper.copyString(selection.innerHTML, selection.ownerDocument);
},
/**
@ -1218,7 +1237,8 @@ InspectorUI.prototype = {
*/
copyOuterHTML: function IUI_copyOuterHTML()
{
clipboardHelper.copyString(this.selection.outerHTML, this.selection.ownerDocument);
let selection = this._contextSelection();
clipboardHelper.copyString(selection.outerHTML, selection.ownerDocument);
},
/**
@ -1226,7 +1246,7 @@ InspectorUI.prototype = {
*/
deleteNode: function IUI_deleteNode()
{
let selection = this.selection;
let selection = this._contextSelection();
let root = selection.ownerDocument.documentElement;
if (selection === root) {
@ -1236,8 +1256,17 @@ InspectorUI.prototype = {
let parent = selection.parentNode;
// remove the node from content
parent.removeChild(selection);
// If the markup panel is active, use the markup panel to delete
// the node, making this an undoable action.
let markup = this.currentInspector.markup;
if (markup) {
markup.deleteNode(selection);
} else {
// remove the node from content
parent.removeChild(selection);
}
// Otherwise, just delete the node.
this.breadcrumbs.invalidateHierarchy();
// select the parent node in the highlighter and breadcrumbs

12
browser/devtools/markupview/MarkupView.jsm
View File

@ -4,16 +4,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/**
* Followup bugs to be filed:
* - Drag and drop should be implemented.
* - Node menu should be implemented.
* - editableField could be moved to a shared location.
* - I'm willing to consider that judicious use of DOMTemplater could make this
* code easier to maintain.
* - ScrollIntoViewIfNeeded seems jumpy, that should be fixed.
*/
const Cc = Components.classes;
const Cu = Components.utils;
const Ci = Components.interfaces;
@ -69,8 +59,6 @@ function MarkupView(aInspector, aFrame)
this._boundFocus = this._onFocus.bind(this);
this._frame.addEventListener("focus", this._boundFocus, false);
this._onSelect();
}
MarkupView.prototype = {