You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2020/01/26 18:09:29 UTC
[royale-asjs] branch feature/router updated: added to manifest
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/router
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/router by this push:
new 3e31a69 added to manifest
3e31a69 is described below
commit 3e31a6924e011bfb62ca2c9510770988097fbd48
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Jan 26 20:09:10 2020 +0200
added to manifest
---
.../Basic/src/main/resources/basic-manifest.xml | 7 +++++
.../org/apache/royale/routing/RouteToState.as | 4 +--
.../royale/org/apache/royale/routing/Router.as | 32 ----------------------
3 files changed, 9 insertions(+), 34 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index 3c30bed..4fd27c9 100644
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@ -273,6 +273,13 @@
<component id="ModalDisplay" class="org.apache.royale.html.beads.plugin.ModalDisplay"/>
<component id="ModalOverlay" class="org.apache.royale.html.beads.plugin.ModalOverlay"/>
+ <component id="ComponentRoute" class="org.apache.royale.routing.ComponentRoute"/>
+ <component id="LinkInterceptor" class="org.apache.royale.routing.LinkInterceptor"/>
+ <component id="ParameterRoute" class="org.apache.royale.routing.ParameterRoute"/>
+ <component id="RouteToComponent" class="org.apache.royale.routing.RouteToComponent"/>
+ <component id="RouteToParameters" class="org.apache.royale.routing.RouteToParameters"/>
+ <component id="RouteToState" class="org.apache.royale.routing.RouteToState"/>
+ <component id="SetRouteTitle" class="org.apache.royale.routing.SetRouteTitle"/>
<component id="Router" class="org.apache.royale.routing.Router"/>
</componentPackage>
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteToState.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteToState.as
index 069dccf..df4ef7c 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteToState.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteToState.as
@@ -22,8 +22,8 @@ package org.apache.royale.routing
import org.apache.royale.core.IStrand;
import org.apache.royale.events.ValueEvent;
import org.apache.royale.core.IStatesObject;
- import org.apache.royale.textLayout.debug.assert;
import org.apache.royale.utils.callLater;
+ import org.apache.royale.debugging.assert;
public class RouteToState extends Bead
{
@@ -37,7 +37,7 @@ package org.apache.royale.routing
private function get host():Router{
return _strand as Router
}
-
+
override public function set strand(value:IStrand):void
{
_strand = value;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/Router.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/Router.as
index 003ea33..55b0881 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/Router.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/Router.as
@@ -18,17 +18,13 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.routing
{
- import org.apache.royale.core.DispatcherBead;
import org.apache.royale.core.IStrand;
- import org.apache.royale.debugging.assert;
- import org.apache.royale.core.IStatesObject;
import org.apache.royale.events.Event;
import org.apache.royale.core.IInitialViewApplication;
import org.apache.royale.core.Strand;
import org.apache.royale.core.IBead;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.ValueEvent;
- import org.apache.royale.core.IUIBase;
import org.apache.royale.core.IMXMLDocument;
import org.apache.royale.utils.MXMLDataInterpreter;
import org.apache.royale.utils.sendStrandEvent;
@@ -121,32 +117,9 @@ package org.apache.royale.routing
hash = hash.slice(index+1);
var ev:ValueEvent = new ValueEvent("hashReceived",hash);
dispatchEvent(ev);
- // var splitParts:Array = hash.split("?");
- // var path:String =
- // var paths:Array = hash.split("/");
- // var statePart:String = paths.pop();
- // var splitParts:Array = statePart.split("?");
- // statePart = splitParts[0];
- // _routeState = new RouteState(statePart,document.title);
- // _routeState.path = paths;
- // _routeState.parameters = parseParameters(splitParts[1]);
}
}
- // private function buildHash():String
- // {
-
- // var hash:String = "#!";
- // if(_routeState.path && routeState.path.length){
- // hash += (_routeState.path.join("/") + "/");
- // }
- // if(_routeState.state){
- // hash += _routeState.state;
- // }
- // hash+= buildParameterString();
- // return hash;
- // }
-
private var _routeState:RouteState;
public function get routeState():RouteState
@@ -195,11 +168,6 @@ package org.apache.royale.routing
public function renderState():void
{
setState();
- // if(syncState)
- // {
- // assert(_strand is IStatesObject,"syncState can only be used on IStatesObjects");
- // (_strand as IStatesObject).currentState = _routeState.state;
- // }
dispatchEvent(new Event("stateChange"));
}