You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/02/02 22:56:28 UTC

[royale-asjs] branch develop updated (77d84ac -> ab4b08d)

This is an automated email from the ASF dual-hosted git repository.

aharui pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.


    from 77d84ac  Merge branch 'feature/royalesite' into develop
     new c25e23d  add RoyaleSite
     new ab4b08d  try HashBang

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml             | 2 ++
 .../royale/ASDoc/src/main/royale/HashAnchorStringItemRenderer.as     | 2 +-
 frameworks/build.xml                                                 | 5 +++++
 frameworks/projects/pom.xml                                          | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
aharui@apache.org.

[royale-asjs] 02/02: try HashBang

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit ab4b08dd41d6c852029888bbdcd1c445c0f65e51
Author: Alex Harui <ah...@apache.org>
AuthorDate: Fri Feb 2 14:56:19 2018 -0800

    try HashBang
---
 examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml              | 2 ++
 examples/royale/ASDoc/src/main/royale/HashAnchorStringItemRenderer.as | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml b/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml
index 0b7f84d..9c82fc3 100644
--- a/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml
+++ b/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml
@@ -72,6 +72,8 @@ limitations under the License.
             private function updateView():void
             {
             	var hash:String = router.hash;
+            	if (hash.substr(0,2) == "#!")
+            	  hash = hash.substring(2);
             	if (hash.charAt(0) == "#")
             	  hash = hash.substring(1);
             	if (!hash)
diff --git a/examples/royale/ASDoc/src/main/royale/HashAnchorStringItemRenderer.as b/examples/royale/ASDoc/src/main/royale/HashAnchorStringItemRenderer.as
index 274c215..6f6dc19 100644
--- a/examples/royale/ASDoc/src/main/royale/HashAnchorStringItemRenderer.as
+++ b/examples/royale/ASDoc/src/main/royale/HashAnchorStringItemRenderer.as
@@ -58,7 +58,7 @@ import  org.apache.royale.html.supportClasses.StringItemRenderer;
             	var href:String = data.href;
             	if (!href) // assume package name
             		href = value;
-                this.element.innerHTML = "<a href='#" + href + "' class='HashAnchorAnchor'>" + value + "</a>";
+                this.element.innerHTML = "<a href='#!" + href + "' class='HashAnchorAnchor'>" + value + "</a>";
             }
 		}
 

-- 
To stop receiving notification emails like this one, please contact
aharui@apache.org.

[royale-asjs] 01/02: add RoyaleSite

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit c25e23d3d41881e5335fbcb32ac6d89102d39f1d
Author: Alex Harui <ah...@apache.org>
AuthorDate: Fri Feb 2 14:55:59 2018 -0800

    add RoyaleSite
---
 frameworks/build.xml        | 5 +++++
 frameworks/projects/pom.xml | 1 +
 2 files changed, 6 insertions(+)

diff --git a/frameworks/build.xml b/frameworks/build.xml
index ccb5c78..e58c9dc 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -136,6 +136,7 @@
 		<antcall target="MaterialDesignLite"/>
 		<antcall target="FontAwesome"/>
 		<antcall target="Express"/>
+        <antcall target="RoyaleSite"/>
     </target>
     
     <target name="fonts">
@@ -189,6 +190,7 @@
         <ant dir="${basedir}/projects/XML" target="clean"/>
         <ant dir="${basedir}/projects/Text" target="clean"/>
         <ant dir="${basedir}/projects/TLF" target="clean"/>
+        <ant dir="${basedir}/projects/RoyaleSite" target="clean"/>
         <ant dir="${basedir}/fontsrc" target="clean"/>
 
         <!-- delete the FlashBuilder executable directories -->
@@ -321,6 +323,9 @@
     <target name="TLF" description="Clean build of TLF.swc">
         <ant dir="${basedir}/projects/TLF"/>
     </target>
+    <target name="RoyaleSite" description="Clean build of RoyaleSite.swc">
+        <ant dir="${basedir}/projects/RoyaleSite"/>
+    </target>
 
     <target name="create-config" depends="playerglobal-setswfversion" description="Copy the config template and inject version numbers">
         <copy file="${basedir}/${configname}-config-template.xml" tofile="${basedir}/${configname}-config.xml" overwrite="true">
diff --git a/frameworks/projects/pom.xml b/frameworks/projects/pom.xml
index b8ec485..8437123 100644
--- a/frameworks/projects/pom.xml
+++ b/frameworks/projects/pom.xml
@@ -59,6 +59,7 @@
     <module>XML</module>
     <module>Text</module>
     <module>TLF</module>
+    <module>RoyaleSite</module>
   </modules>
 
   <profiles>

-- 
To stop receiving notification emails like this one, please contact
aharui@apache.org.