Attachment 229470 Details for Bug 405210 – Potential patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Potential patch

file_405210.txt (text/plain), 4.61 KB, created by Bogdan Gheorghe

on 2013-04-08 17:40:25 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Bogdan Gheorghe

Created: 2013-04-08 17:40:25 EDT

Size: 4.61 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/textView.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/textView.js
>index 867f18e..6c57c35 100644
>--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/textView.js
>+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/textView.js
>@@ -1851,6 +1851,50 @@
> 			return this.dispatchEvent(lineStyleEvent);
> 		},
> 		/**
>+		 * @class This is the event sent for all keyboard events.
>+		 * 
>+		 * See: 
>+		 * {@link orion.editor.TextView} 
>+		 * {@link orion.editor.TextView#event:onKeyDown} 
>+		 * {@link orion.editor.TextView#event:onKeyPress} 
>+		 * {@link orion.editor.TextView#event:onKeyUp} 
>+		 * 
>+		 * @name orion.editor.KeyEvent
>+		 * 
>+		 * @property {String} type The type of event.
>+		 * @property {DOMEvent} event The key DOM event.
>+		 * @property {Boolean} defaultPrevented Determines whether the user agent context menu should be shown. It is shown by default.
>+		 * @property {Function} preventDefault If called prevents the user agent context menu from showing.
>+		 */
>+		/**
>+		 * This event is sent for key down events.
>+		 *
>+		 * @event
>+		 * @param {orion.editor.KeyEvent} keyEvent the event
>+		 */
>+		onKeyDown: function(keyEvent) {
>+			return this.dispatchEvent(keyEvent);
>+		},
>+		/**
>+		 * This event is sent for key press events. Key press events are only sent
>+		 * for printable characters.
>+		 *
>+		 * @event
>+		 * @param {orion.editor.KeyEvent} keyEvent the event
>+		 */
>+		onKeyPress: function(keyEvent) {
>+			return this.dispatchEvent(keyEvent);
>+		},
>+		/**
>+		 * This event is sent for key up events.
>+		 *
>+		 * @event
>+		 * @param {orion.editor.KeyEvent} keyEvent the event
>+		 */
>+		onKeyUp: function(keyEvent) {
>+			return this.dispatchEvent(keyEvent);
>+		},
>+		/**
> 		 * @class This is the event sent when the text in the model has changed.
> 		 * 
> 		 * See: 
>@@ -2753,6 +2797,22 @@
> 			}
> 		},
> 		_handleKeyDown: function (e) {
>+			if (this.isListening("KeyDown")) { //$NON-NLS-0$
>+				var keyEvent = this._createKeyEvent("KeyDown", e); //$NON-NLS-0$
>+				this.onKeyDown(keyEvent); //$NON-NLS-0$
>+				if (keyEvent.defaultPrevented) {
>+					/*
>+					* Feature in Firefox. Keypress events still happen even if the keydown event
>+					* was prevented. The fix is to remember that keydown was prevented and prevent
>+					* the keypress ourselves.
>+					*/
>+					if (util.isFirefox) {
>+						this._keyDownPrevented = true;
>+					}
>+					e.preventDefault();
>+					return;
>+				}
>+			}
> 			var modifier = false;
> 			switch (e.keyCode) {
> 				case 16: /* Shift */
>@@ -2820,6 +2880,19 @@
> 		},
> 		_handleKeyPress: function (e) {
> 			/*
>+			* Feature in Firefox. Keypress events still happen even if the keydown event
>+			* was prevented. The fix is to remember that keydown was prevented and prevent
>+			* the keypress ourselves.
>+			*/
>+			if (this._keyDownPrevented) { 
>+				if (e.preventDefault) {
>+					e.preventDefault(); 
>+					e.stopPropagation(); 
>+				} 
>+				this._keyDownPrevented = undefined;
>+				return;
>+			}
>+			/*
> 			* Feature in Embedded WebKit. Embedded WekKit on Mac runs in compatibility mode and
> 			* generates key press events for these Unicode values (Function keys). This does not
> 			* happen in Safari or Chrome. The fix is to ignore these key events.
>@@ -2852,6 +2925,14 @@
> 					}
> 				}
> 			}
>+			if (this.isListening("KeyPress")) { //$NON-NLS-0$
>+				var keyEvent = this._createKeyEvent("KeyPress", e); //$NON-NLS-0$
>+				this.onKeyPress(keyEvent); //$NON-NLS-0$
>+				if (keyEvent.defaultPrevented) {
>+					e.preventDefault();
>+					return;
>+				}
>+			}
> 			var ignore = false;
> 			if (util.isMac) {
> 				if (e.ctrlKey || e.metaKey) { ignore = true; }
>@@ -2874,6 +2955,14 @@
> 			}
> 		},
> 		_handleKeyUp: function (e) {
>+			if (this.isListening("KeyUp")) { //$NON-NLS-0$
>+				var keyEvent = this._createKeyEvent("KeyUp", e); //$NON-NLS-0$
>+				this.onKeyUp(keyEvent); //$NON-NLS-0$
>+				if (keyEvent.defaultPrevented) {
>+					e.preventDefault();
>+					return;
>+				}
>+			}
> 			var ctrlKey = util.isMac ? e.metaKey : e.ctrlKey;
> 			if (!ctrlKey) {
> 				this._setLinksVisible(false);
>@@ -3092,6 +3181,15 @@
> 			}
> 			return false;
> 		},
>+		_createKeyEvent: function(type, e) {
>+			return {
>+				type: type,
>+				event: e,
>+				preventDefault: function() {
>+					this.defaultPrevented = true;
>+				}
>+			};
>+		},
> 		_createMouseEvent: function(type, e) {
> 			var pt = this.convert({x: e.clientX, y: e.clientY}, "page", "document"); //$NON-NLS-1$ //$NON-NLS-0$
> 			return {

Actions: View

Attachments on bug 405210: 229470