Attachment 237129 Details for Bug 420875 – fix

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

[patch] fix

opera.patch (text/plain), 2.76 KB, created by Silenio Quarti

on 2013-11-01 10:34:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Silenio Quarti

Created: 2013-11-01 10:34:00 EDT

Size: 2.76 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.core/web/orion/util.js b/bundles/org.eclipse.orion.client.core/web/orion/util.js
>index eb07f6a..6e9f95f 100644
>--- a/bundles/org.eclipse.orion.client.core/web/orion/util.js
>+++ b/bundles/org.eclipse.orion.client.core/web/orion/util.js
>@@ -15,7 +15,7 @@
> 	var userAgent = navigator.userAgent;
> 	var isIE = (userAgent.indexOf("MSIE") !== -1 || userAgent.indexOf("Trident") !== -1) ? document.documentMode : undefined; //$NON-NLS-1$ //$NON-NLS-0$
> 	var isFirefox = parseFloat(userAgent.split("Firefox/")[1] || userAgent.split("Minefield/")[1]) || undefined; //$NON-NLS-1$ //$NON-NLS-0$
>-	var isOpera = userAgent.indexOf("Opera") !== -1; //$NON-NLS-0$
>+	var isOpera = userAgent.indexOf("Opera") !== -1 ? parseFloat(userAgent.split("Version/")[1]) : undefined; //$NON-NLS-0$
> 	var isChrome = parseFloat(userAgent.split("Chrome/")[1]) || undefined; //$NON-NLS-0$
> 	var isSafari = userAgent.indexOf("Safari") !== -1 && !isChrome; //$NON-NLS-0$
> 	var isWebkit = parseFloat(userAgent.split("WebKit/")[1]) || undefined; //$NON-NLS-0$
>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 30a9560..25f5557 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
>@@ -3062,10 +3062,10 @@
> 			* execute the actions from the keypress handler.
> 			* Note: This only happens on the Mac and Linux (Firefox 3.6).
> 			*
>-			* Feature in Opera.  Opera sends keypress events even for non-printable
>+			* Feature in Opera < 12.16.  Opera sends keypress events even for non-printable
> 			* keys.  The fix is to handle actions in keypress instead of keydown.
> 			*/
>-			if (((util.isMac || util.isLinux) && util.isFirefox < 4) || util.isOpera) {
>+			if (((util.isMac || util.isLinux) && util.isFirefox < 4) || util.isOpera < 12.16) {
> 				this._keyDownEvent = e;
> 				return true;
> 			}
>@@ -3108,7 +3108,7 @@
> 					return false;
> 				}
> 			}
>-			if (((util.isMac || util.isLinux) && util.isFirefox < 4) || util.isOpera) {
>+			if (((util.isMac || util.isLinux) && util.isFirefox < 4) || util.isOpera < 12.16) {
> 				if (this._doAction(this._keyDownEvent)) {
> 					if (e.preventDefault) { e.preventDefault(); }
> 					return false;
>@@ -3215,7 +3215,7 @@
> 				}, 0);
> 			}
> 			if (this._clickCount === 1) {
>-				result = this._setSelectionTo(e.clientX, e.clientY, e.shiftKey, !util.isOpera && this._hasFocus && this.isListening("DragStart")); //$NON-NLS-0$
>+				result = this._setSelectionTo(e.clientX, e.clientY, e.shiftKey, (!util.isOpera || util.isOpera >= 12.16) && this._hasFocus && this.isListening("DragStart")); //$NON-NLS-0$
> 				if (result) { this._setGrab(target); }
> 			} else {
> 				/*

Actions: View | Diff

Attachments on bug 420875: 237129