microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-07 17:44:05 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Mac: Doubleclick sometimes ends up selecting the span (fixes #3726)

Browse Source
This commit is contained in:
Benjamin Pasero
2016-03-04 17:39:40 +01:00
parent 735d2de23b
commit 7c803f78da
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vs/editor/browser/controller/mouseTarget.ts
View File

@@ -269,6 +269,14 @@ export class MouseTargetFactory {
} else if (hitTestResult.hitTarget) {
t = hitTestResult.hitTarget;
path = this.getClassNamePathTo(t, this.viewHelper.viewDomNode);
// TODO@Alex: try again with this different target, but guard against recursion.
// Is it a cursor ?
var lineNumberAttribute = t.hasAttribute && t.hasAttribute('lineNumber') ? t.getAttribute('lineNumber') : null;
var columnAttribute = t.hasAttribute && t.hasAttribute('column') ? t.getAttribute('column') : null;
if (lineNumberAttribute && columnAttribute) {
return this.createMouseTargetFromViewCursor(t, parseInt(lineNumberAttribute, 10), parseInt(columnAttribute, 10), mouseColumn);
}
}
}
@@ -376,6 +384,7 @@ export class MouseTargetFactory {
// Chrome always hits a TEXT_NODE, while Edge sometimes hits a token span
let startContainer = range.startContainer;
let hitTarget: HTMLElement;
if (startContainer.nodeType === startContainer.TEXT_NODE) {
// startContainer is expected to be the token text
@@ -389,6 +398,8 @@ export class MouseTargetFactory {
position: this.viewHelper.getPositionFromDOMInfo(<HTMLElement>parent1, range.startOffset),
hitTarget: null
};
} else {
hitTarget = <HTMLElement>startContainer.parentNode;
}
} else if (startContainer.nodeType === startContainer.ELEMENT_NODE) {
// startContainer is expected to be the token span
@@ -401,12 +412,14 @@ export class MouseTargetFactory {
position: this.viewHelper.getPositionFromDOMInfo(<HTMLElement>startContainer, (<HTMLElement>startContainer).textContent.length),
hitTarget: null
};
} else {
hitTarget = <HTMLElement>startContainer;
}
}
return {
position: null,
hitTarget: <HTMLElement>range.startContainer.parentNode
hitTarget: hitTarget
};
}