Attachment 151962 Details for Bug 294635 – Proposed patch

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

[patch] Proposed patch

Bug-294635.patch (text/plain), 3.27 KB, created by Ivan Furnadjiev

on 2009-11-11 14:22:06 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2009-11-11 14:22:06 EST

Size: 3.27 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt.q07
>Index: js/org/eclipse/swt/browser/Browser.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/swt/browser/Browser.js,v
>retrieving revision 1.4
>diff -u -r1.4 Browser.js
>--- js/org/eclipse/swt/browser/Browser.js	13 Oct 2009 15:00:00 -0000	1.4
>+++ js/org/eclipse/swt/browser/Browser.js	11 Nov 2009 19:16:15 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2008 Innoopract Informationssysteme GmbH.
>+ * Copyright (c) 2007, 2009 Innoopract Informationssysteme GmbH.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     Innoopract Informationssysteme GmbH - initial API and implementation
>+ *     EclipseSource - ongoing development
>  ******************************************************************************/
> 
> qx.Class.define( "org.eclipse.swt.browser.Browser", {
>@@ -14,30 +15,55 @@
>   
>   construct : function() {
>     this.base( arguments );
>-    // TODO [rh] preliminary workaround to make Browser accessible by tab
>-    this.setTabIndex( 1 );
>     this.setAppearance( "browser" );
>-    this.addEventListener( "load", this._onLoad, this );
>+    this.addEventListener( "focus", this._onFocusIn, this );
>+    this.addEventListener( "blur", this._onFocusOut, this );
>+    this.__onBlockerMouseDown
>+      = qx.lang.Function.bind( this._onBlockerMouseDown, this );
>   },
>   
>   destruct : function() {
>-    this.removeEventListener( "load", this._onLoad, this );
>+    this.removeEventListener( "focus", this._onFocusIn, this );
>+    this.removeEventListener( "blur", this._onFocusOut, this );
>+    qx.html.EventRegistration.removeEventListener( this.getBlockerNode(),
>+                                                   "mousedown",
>+                                                   this.__onBlockerMouseDown );
>   },  
> 
>   members : {
>     
>-    _onLoad : function( evt ) {
>+    _applyElement : function( value, old ) {
>+      this.base( arguments, value, old );
>+      qx.html.EventRegistration.addEventListener( this.getBlockerNode(),
>+                                                  "mousedown",
>+                                                  this.__onBlockerMouseDown );
>+    },
>+    
>+    _beforeAppear : function() {
>+      this.base( arguments );
>+      qx.ui.embed.IframeManager.getInstance().remove( this );
>+    },
>+    
>+    _onFocusIn : function( evt ) {
>       this.release();
>     },
>     
>+    _onFocusOut : function( evt ) {
>+      this.block();
>+    },
>+    
>+    _onBlockerMouseDown : function( evt ) {
>+      this.focus();
>+    },
>+    
>     execute : function( script ) {
>       var result = true;
>       try {
>         if( qx.core.Variant.isSet( "qx.client", "mshtml" ) ) {
>           this.getContentWindow().execScript( script , "JScript" );
>         } else {
>-          this.getContentWindow().eval( script );                    
>-        }        
>+          this.getContentWindow().eval( script );
>+        }
>       } catch( e ) {
>         result = false;
>       }

Actions: View | Diff

Attachments on bug 294635: 151962