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 69b2698 Theoretically works Still need path routing
69b2698 is described below
commit 69b26982d3785a5523da31889cc4bae9e61fcab8
Author: Harbs <[email protected]>
AuthorDate: Sun Jan 26 13:38:56 2020 +0200
Theoretically works
Still need path routing
---
.../org/apache/royale/routing/ComponentRoute.as | 6 +-
.../org/apache/royale/routing/ParameterRoute.as | 1 +
.../royale/org/apache/royale/routing/RouteState.as | 8 ++
.../org/apache/royale/routing/RouteToComponent.as | 86 +++++++++++++++++
.../org/apache/royale/routing/RouteToParameters.as | 106 ++++++++++++++-------
.../org/apache/royale/routing/RouteToState.as | 13 ++-
.../royale/org/apache/royale/routing/Router.as | 6 +-
.../org/apache/royale/routing/SetRouteTitle.as | 27 +++++-
8 files changed, 212 insertions(+), 41 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/ComponentRoute.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/ComponentRoute.as
index ee317ef..8957d62 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/ComponentRoute.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/ComponentRoute.as
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.routing
{
- import org.apache.royale.core.IUIBase;
+ import org.apache.royale.core.IParent;
/**
* ComponentRoutes are declared in RouteToComponent beads.
* This maps a base name of a route path to a component class.
@@ -40,6 +40,8 @@ package org.apache.royale.routing
/**
* The parent to add the component to. (Defaults to the strand of the
router.)
*/
- public var parent:IUIBase;
+ public var parent:IParent;
+
+ public var title:String;
}
}
\ No newline at end of file
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/ParameterRoute.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/ParameterRoute.as
index 0184a28..14d1dbb 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/ParameterRoute.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/ParameterRoute.as
@@ -32,6 +32,7 @@ package org.apache.royale.routing
* Parameter key to use
*/
public var key:String;
+ public var title:String;
/**
* Function to call if the parameter exists. (The value is supplied as an
argument.)
*/
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteState.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteState.as
index cf6190a..e1355dc 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteState.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteState.as
@@ -29,5 +29,13 @@ package org.apache.royale.routing
public var parameters:Object;
public var path:String;
public var title:String;
+ public function getBaseName():String
+ {
+ var lastdelim:int = path.lastIndexOf("/");
+ if(lastdelim != -1)
+ return path.slice(lastdelim+1);
+
+ return path;
+ }
}
}
\ No newline at end of file
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteToComponent.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteToComponent.as
index 9f18310..cdf53bb 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteToComponent.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteToComponent.as
@@ -19,6 +19,10 @@
package org.apache.royale.routing
{
import org.apache.royale.core.Bead;
+ import org.apache.royale.core.IStrand;
+ import org.apache.royale.events.ValueEvent;
+ import org.apache.royale.core.IParent;
+ import org.apache.royale.core.IChild;
[DefaultProperty("routes")]
/**
* RouteToComponent is a bead designed for Router
@@ -32,5 +36,87 @@ package org.apache.royale.routing
}
public var routes:Array;
+
+ /**
+ * @royaleignorecoercion org.apache.royale.routing.Router
+ */
+ private function get host():Router{
+ return _strand as Router
+ }
+ override public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ listenOnStrand("hashNeeded",hashNeeded);
+ listenOnStrand("hashReceived",hashReceived);
+ listenOnStrand("stateChange",stateChanged)
+ }
+ private function hashNeeded(ev:ValueEvent):void
+ {
+ var hash:String = ev.value;
+ var trailing:String = "";
+ var delim:String = ""
+ if(hash.indexOf("?") != -1)
+ delim = "?"
+
+ else if(hash.indexOf("#") != -1)
+ delim = "#"
+ if(delim)
+ {
+ trailing = hash.slice(hash.indexOf(delim));
+ hash = hash.slice(0,hash.indexOf(delim));
+ }
+ // no bead added the path yet
+ if(!hash)
+ {
+ hash = host.routeState.path;
+ }
+
+ ev.value = hash + trailing;
+
+ }
+
+ private function hashReceived(ev:ValueEvent):void
+ {
+ var hash:String = ev.value;
+ var trailing:String = "";
+ // if we have parameters, we don't care if we also have an anchor
+ var delim:String = ""
+ var index:int = hash.indexOf("?")
+ if(index == -1)
+ index = hash.indexOf("#");
+
+ if(index != -1)
+ hash = hash.slice(0,index);
+
+ host.routeState.path = hash;
+ }
+
+ /**
+ * @royaleignorecoercion org.apache.royale.core.IParent
+ */
+ private function stateChanged():void
+ {
+ // apply routes
+ if(routes)
+ {
+ var baseName:String = host.routeState.getBaseName();
+
+ for(var i:int=0;i<routes.length;i++){
+ var route:ComponentRoute = routes[i];
+ if(route.baseName == baseName)
+ {
+ var parent:IParent = route.parent || host.host as IParent;
+ while(parent.numElements > 0)
+ parent.removeElement(parent.getElementAt(0));
+
+ var comp:IChild = new route.component();
+ parent.addElement(comp);
+ if(route.title)
+ host.routeState.title = route.title;
+ }
+ }
+ }
+ }
+
}
}
\ No newline at end of file
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteToParameters.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteToParameters.as
index f9a9072..bb64ad7 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteToParameters.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/RouteToParameters.as
@@ -29,6 +29,12 @@ package org.apache.royale.routing
{
}
+ /**
+ * @royaleignorecoercion org.apache.royale.routing.Router
+ */
+ private function get host():Router{
+ return _strand as Router
+ }
override public function set strand(value:IStrand):void
{
_strand = value;
@@ -38,52 +44,86 @@ package org.apache.royale.routing
}
private function hashNeeded(ev:ValueEvent):void
{
+ var hash:String = ev.value;
+ var paramStr:String = buildParameterString();
+ var trailing:String = "";
+ var index:int = hash.indexOf("#");
+ if(index != -1)
+ {
+ trailing = hash.slice(index);
+ hash = hash.slice(0,index);
+ }
+ ev.value = hash + paramStr + trailing;
}
private function hashReceived(ev:ValueEvent):void
{
-
+ var hash:String = ev.value;
+ var index:int = hash.indexOf("?");
+ if(index == -1)//no params
+ return;
+ hash = hash.slice(index + 1);
+ index = hash.indexOf("#");
+ if(index != -1)
+ {
+ hash = hash.slice(0,index);
+ }
+ host.routeState.parameters = parseParameters(hash);
}
private function stateChanged():void
{
-
+ var params:Object = host.routeState.parameters;
+ // apply routes
+ if(routes)
+ {
+ for(var i:int=0;i<routes.length;i++){
+ var route:ParameterRoute = routes[i];
+ if(route.key in params)
+ {
+ route.callback(params[route.key]);
+ if(route.title)
+ host.routeState.title = route.title;
+ }
+ }
+ }
}
public var routes:Array;
- // private function buildParameterString():String{
- // var retVal:String = "";
- // if(_routeState.parameters){
- // retVal += "?";
- // for(var x:String in _routeState.parameters){
- // retVal += x;
- // if(_routeState.parameters[x] != undefined){
- // retVal += "=" + encodeURIComponent(_routeState.parameters[x]);
- // retVal += "&";
- // }
- // }
- // //remove trailing &
- // retVal = retVal.slice(0, -1);
- // }
+ private function buildParameterString():String{
+ var retVal:String = "";
+ var state:RouteState = host.routeState;
+ if(state.parameters){
+ retVal += "?";
+ for(var x:String in state.parameters){
+ retVal += x;
+ if(state.parameters[x] != undefined){
+ retVal += "=" + encodeURIComponent(state.parameters[x]);
+ retVal += "&";
+ }
+ }
+ //remove trailing &
+ retVal = retVal.slice(0, -1);
+ }
- // return retVal;
- // }
+ return retVal;
+ }
- // private function parseParameters(query:String):Object
- // {
- // var urlVars:Object;
- // if(query){
- // var vars:Array = query.split("&");
- // if(vars.length){
- // urlVars = {};
- // }
- // for (var i:int=0;i<vars.length;i++) {
- // var pair:Array = vars[i].split("=");
- // urlVars[pair[0]] = pair[1] == undefined ? undefined :
decodeURIComponent(pair[1]);
- // }
- // }
- // return urlVars;
- // }
+ private function parseParameters(query:String):Object
+ {
+ var urlVars:Object;
+ if(query){
+ var vars:Array = query.split("&");
+ if(vars.length){
+ urlVars = {};
+ }
+ for (var i:int=0;i<vars.length;i++) {
+ var pair:Array = vars[i].split("=");
+ urlVars[pair[0]] = pair[1] == undefined ? undefined :
decodeURIComponent(pair[1]);
+ }
+ }
+ return urlVars;
+ }
}
}
\ No newline at end of file
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 4d1df1d..069dccf 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
@@ -88,7 +88,18 @@ package org.apache.royale.routing
}
private function hashReceived(ev:ValueEvent):void
{
- var hash
+ var hash:String = ev.value;
+ var trailing:String = "";
+ // if we have parameters, we don't care if we also have an anchor
+ var delim:String = ""
+ var index:int = hash.indexOf("?")
+ if(index == -1)
+ index = hash.indexOf("#");
+
+ if(index != -1)
+ hash = hash.slice(0,index);
+
+ host.routeState.path = hash;
}
private var settingState:Boolean;
/**
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 b819215..003ea33 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
@@ -31,6 +31,7 @@ package org.apache.royale.routing
import org.apache.royale.core.IUIBase;
import org.apache.royale.core.IMXMLDocument;
import org.apache.royale.utils.MXMLDataInterpreter;
+ import org.apache.royale.utils.sendStrandEvent;
[DefaultProperty("beads")]
/**
* Dispatched when the state is changed.
@@ -180,10 +181,7 @@ package org.apache.royale.routing
{
hash += ev.value;
window.history.pushState(stateEv.value,_routeState.title,hash);
- }
- if(_routeState.title)
- {
- document.title = _routeState.title;
+ sendStrandEvent(this,"stateSet");
}
}
}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/SetRouteTitle.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/SetRouteTitle.as
index 4b86e42..5320973 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/SetRouteTitle.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/routing/SetRouteTitle.as
@@ -20,6 +20,7 @@ package org.apache.royale.routing
{
import org.apache.royale.core.Bead;
import org.apache.royale.core.IStrand;
+ import org.apache.royale.events.ValueEvent;
public class SetRouteTitle extends Bead
{
@@ -27,6 +28,12 @@ package org.apache.royale.routing
{
}
+ /**
+ * @royaleignorecoercion org.apache.royale.routing.Router
+ */
+ private function get host():Router{
+ return _strand as Router
+ }
override public function set strand(value:IStrand):void
{
@@ -34,8 +41,13 @@ package org.apache.royale.routing
{
initialTitle = document.title;
}
+ listenOnStrand("stateSet",handleStateSet);
+ listenOnStrand("hashReceived",hashReceived);
+ }
+ private function hashReceived(ev:ValueEvent):void
+ {
+ setTitle();
}
-
private var initialTitle:String;
private function setTitle():void
{
@@ -49,5 +61,18 @@ package org.apache.royale.routing
}
}
+ private function handleStateSet():void
+ {
+ COMPILE::JS
+ {
+ if(host.routeState.title)
+ {
+ document.title = host.routeState.title;
+ }
+
+ }
+
+ }
+
}
}
\ No newline at end of file