Attachment 224044 Details for Bug 394401 – Patch for 1.5 maintenance branch

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

[patch] Patch for 1.5 maintenance branch

bug-394401.patch (text/plain), 2.29 KB, created by Ivan Furnadjiev

on 2012-11-28 06:39:27 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2012-11-28 06:39:27 EST

Size: 2.29 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.rap.rwt/js/qx/client/History.js b/bundles/org.eclipse.rap.rwt/js/qx/client/History.js
>index d2f5fdf..bd60e72 100644
>--- a/bundles/org.eclipse.rap.rwt/js/qx/client/History.js
>+++ b/bundles/org.eclipse.rap.rwt/js/qx/client/History.js
>@@ -245,9 +245,7 @@
> 
>       this._timer.addEventListener( "interval", function( e ) {
>         var newHash = this.__getState();
>-        // RAP [if] Ignore all non application states
>-        //if (newHash != this._state) {
>-        if( newHash != this._state && this._titles[ newHash ] != null ) {
>+        if( newHash != this._state ) {
>           this.__onHistoryLoad(newHash);
>         }
>       }, this );
>diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/BrowserHistoryTest.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/BrowserHistoryTest.js
>index f6b3304..6a67594 100644
>--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/BrowserHistoryTest.js
>+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/BrowserHistoryTest.js
>@@ -52,6 +52,36 @@
>       assertEquals( "text1", browserHistory._titles[ "id1" ] );
>     },
> 
>+    testSendNavigatedWithUnknownEntry : [
>+      function() {
>+        var browserHistory = this._createBrowserHistoryByProtocol();
>+        org.eclipse.rwt.protocol.Processor.processOperation( {
>+          "target" : "bh",
>+          "action" : "call",
>+          "method" : "add",
>+          "properties" : {
>+            "entries" : [ [ "id1", "text1" ], [ "id2", "text2" ] ]
>+          }
>+        } );
>+        org.eclipse.rwt.protocol.Processor.processOperation( {
>+          "target" : "bh",
>+          "action" : "listen",
>+          "properties" : {
>+            "navigation" : true
>+          }
>+        } );
>+        org.eclipse.rwt.test.fixture.TestUtil.store( browserHistory );
>+        org.eclipse.rwt.test.fixture.TestUtil.delayTest( 200 );
>+      },
>+      function( browserHistory) {
>+        browserHistory.__getState = function() { return "id3"; };
>+        org.eclipse.rwt.test.fixture.TestUtil.forceInterval( browserHistory._timer );
>+
>+        var msg = org.eclipse.rwt.test.fixture.TestUtil.getMessage();
>+        assertTrue( msg.indexOf( "org.eclipse.rwt.events.historyNavigated.entryId=id3" ) != -1 );
>+      }
>+    ],
>+
>     /////////
>     // Helper
>

Flags:

ivan: review?

Actions: View | Diff

Attachments on bug 394401: 223612 | 224044