proxmox-mirrors/mirror_xterm.js
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_xterm.js synced 2025-10-04 19:18:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #409 from sourcelair/issue-#405-firefox-paste

Browse Source 
Fix linux firefox paste
This commit is contained in:
Paris Kasidiaris 2016-12-14 10:38:30 +00:00 committed by GitHub
commit fb4d263211
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/handlers/Clipboard.ts
View File

@ -7,13 +7,6 @@
import { ITerminal } from '../Interfaces'; import { ITerminal } from '../Interfaces';
// We are extending the ClipboardEvent interface, since TypeScript has not declared the
// clientX and clientY properties that we use.
interface IClipboardEvent extends ClipboardEvent {
clientX: number;
clientY: number;
}
interface IWindow extends Window { interface IWindow extends Window {
clipboardData?: { clipboardData?: {
getData(format: string): string; getData(format: string): string;
@ -49,7 +42,7 @@ export function prepareTextForClipboard(text: string): string {
* Binds copy functionality to the given terminal. * Binds copy functionality to the given terminal.
* @param {ClipboardEvent} ev The original copy event to be handled * @param {ClipboardEvent} ev The original copy event to be handled
*/ */
export function copyHandler(ev: IClipboardEvent, term: ITerminal) { export function copyHandler(ev: ClipboardEvent, term: ITerminal) {
// We cast `window` to `any` type, because TypeScript has not declared the `clipboardData` // We cast `window` to `any` type, because TypeScript has not declared the `clipboardData`
// property that we use below for Internet Explorer. // property that we use below for Internet Explorer.
let copiedText = window.getSelection().toString(), let copiedText = window.getSelection().toString(),
@ -69,7 +62,7 @@ export function copyHandler(ev: IClipboardEvent, term: ITerminal) {
* @param {ClipboardEvent} ev The original paste event to be handled * @param {ClipboardEvent} ev The original paste event to be handled
* @param {Terminal} term The terminal on which to apply the handled paste event * @param {Terminal} term The terminal on which to apply the handled paste event
*/ */
export function pasteHandler(ev: IClipboardEvent, term: ITerminal) { export function pasteHandler(ev: ClipboardEvent, term: ITerminal) {
ev.stopPropagation(); ev.stopPropagation();
let text: string; let text: string;
@ -103,10 +96,10 @@ export function pasteHandler(ev: IClipboardEvent, term: ITerminal) {
* area, then bring the terminal's input below the cursor, in order to * area, then bring the terminal's input below the cursor, in order to
* trigger the event on the textarea and allow-right click paste, without * trigger the event on the textarea and allow-right click paste, without
* caring about disappearing selection. * caring about disappearing selection.
* @param {ClipboardEvent} ev The original paste event to be handled * @param {MouseEvent} ev The original right click event to be handled
* @param {Terminal} term The terminal on which to apply the handled paste event * @param {Terminal} term The terminal on which to apply the handled paste event
*/ */
export function rightClickHandler(ev: IClipboardEvent, term: ITerminal) { export function rightClickHandler(ev: MouseEvent, term: ITerminal) {
let s = document.getSelection(), let s = document.getSelection(),
selectedText = prepareTextForClipboard(s.toString()), selectedText = prepareTextForClipboard(s.toString()),
clickIsOnSelection = false, clickIsOnSelection = false,

3
src/xterm.js
View File

@ -433,6 +433,9 @@ Terminal.prototype.initGlobal = function() {
on(this.textarea, 'paste', function (ev) { on(this.textarea, 'paste', function (ev) {
pasteHandler.call(this, ev, term); pasteHandler.call(this, ev, term);
}); });
on(this.element, 'paste', function (ev) {
pasteHandler.call(this, ev, term);
});
function rightClickHandlerWrapper (ev) { function rightClickHandlerWrapper (ev) {
rightClickHandler.call(this, ev, term); rightClickHandler.call(this, ev, term);