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/09/23 06:09:06 UTC
[royale-asjs] branch develop updated (8410373 -> 6f36834)
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 8410373 New HTTPService Blog example
new dff5dd5 set source from constructor
new 1eef8d7 use ICollectionView support
new e36b086 need typename so 'type' selector applies
new 6f36834 on JS, pre-load the CSS file
The 4 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:
.../royale/html/supportClasses/ComboBoxList.as | 1 +
.../org/apache/royale/utils/UIModuleUtils.as | 53 ++++++++++++++++------
.../MXRoyale/src/main/resources/defaults.css | 5 ++
.../main/royale/mx/collections/ArrayCollection.as | 4 +-
4 files changed, 46 insertions(+), 17 deletions(-)
[royale-asjs] 01/04: set source from constructor
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 dff5dd59742fa65cdf06d81e7d5225f77d9fb8da
Author: Alex Harui <ah...@apache.org>
AuthorDate: Fri Sep 21 15:21:13 2018 -0700
set source from constructor
---
.../MXRoyale/src/main/royale/mx/collections/ArrayCollection.as | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/collections/ArrayCollection.as b/frameworks/projects/MXRoyale/src/main/royale/mx/collections/ArrayCollection.as
index 14892e5..1b9e543 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/collections/ArrayCollection.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/collections/ArrayCollection.as
@@ -97,9 +97,9 @@ public class ArrayCollection extends ListCollectionView //implements IExternaliz
*/
public function ArrayCollection(source:Array = null)
{
- /*super();
+ super();
- this.source = source;*/
+ this.source = source;
}
//--------------------------------------------------------------------------
[royale-asjs] 04/04: on JS, pre-load the CSS file
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 6f3683413e4223516cf16f80078ea36ba2a6aa2b
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sat Sep 22 23:08:44 2018 -0700
on JS, pre-load the CSS file
---
.../org/apache/royale/utils/UIModuleUtils.as | 53 ++++++++++++++++------
1 file changed, 38 insertions(+), 15 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/utils/UIModuleUtils.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/utils/UIModuleUtils.as
index 760f42d..12970a1 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/utils/UIModuleUtils.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/utils/UIModuleUtils.as
@@ -114,6 +114,9 @@ package org.apache.royale.utils
COMPILE::JS
private var jsDepsLoader:WrappedHTMLElement;
+ COMPILE::JS
+ private var jsCSSLoader:HTMLLinkElement;
+
/**
* @private
* @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement
@@ -145,6 +148,10 @@ package org.apache.royale.utils
jsLoader.onload = loadHandler;
document.body.appendChild(jsLoader);
}
+
+ jsCSSLoader = document.createElement('link') as HTMLLinkElement;
+ jsCSSLoader.onload = actuallyLoadModule;
+ document.head.appendChild(jsCSSLoader);
}
}
@@ -177,22 +184,38 @@ package org.apache.royale.utils
(host as DisplayObjectContainer).addChild(swfLoader);
}
}
-
COMPILE::JS {
- if (!goog.DEBUG)
- jsLoader.setAttribute("src", modulePath ? modulePath + "/" + moduleName + ".js" :
- moduleName + ".js");
- else
- {
- // js-debug module loading requires that the __deps.js file has been tweaked
- // so that the path to the module class is correct and that any
- // framework js files have been copied into the same tree structure as
- // the main apps framework js files
- window["goog"]["ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING"] = true;
- jsDepsLoader.setAttribute("src", modulePath ? modulePath + "/" + moduleName + "__deps.js" :
- moduleName + "__deps.js");
- }
- }
+ loadCSS(modulePath ? modulePath + "/" + moduleName + ".css" :
+ moduleName + ".css");
+ }
+ }
+
+ COMPILE::JS
+ protected function loadCSS(href:String):void
+ {
+ jsCSSLoader.id = href;
+ jsCSSLoader.rel = "stylesheet";
+ jsCSSLoader.type = "text/css";
+ jsCSSLoader.media = "all";
+ jsCSSLoader.href = href;
+ }
+
+ COMPILE::JS
+ protected function actuallyLoadModule():void
+ {
+ if (!goog.DEBUG)
+ jsLoader.setAttribute("src", modulePath ? modulePath + "/" + moduleName + ".js" :
+ moduleName + ".js");
+ else
+ {
+ // js-debug module loading requires that the __deps.js file has been tweaked
+ // so that the path to the module class is correct and that any
+ // framework js files have been copied into the same tree structure as
+ // the main apps framework js files
+ window["goog"]["ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING"] = true;
+ jsDepsLoader.setAttribute("src", modulePath ? modulePath + "/" + moduleName + "__deps.js" :
+ moduleName + "__deps.js");
+ }
}
private var moduleInstance:IUIBase;
[royale-asjs] 03/04: need typename so 'type' selector applies
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 e36b08670ceb111eae3deed550bd27eb38d05d07
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sat Sep 22 23:08:28 2018 -0700
need typename so 'type' selector applies
---
.../main/royale/org/apache/royale/html/supportClasses/ComboBoxList.as | 1 +
1 file changed, 1 insertion(+)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ComboBoxList.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ComboBoxList.as
index 0dca32c..27eccae 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ComboBoxList.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ComboBoxList.as
@@ -57,6 +57,7 @@ package org.apache.royale.html.supportClasses
public function ComboBoxList()
{
super();
+ typeNames += " ComboBoxList";
}
}
}
[royale-asjs] 02/04: use ICollectionView support
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 1eef8d7b94c7e576d8ff56fbf2616dddd6cc6611
Author: Alex Harui <ah...@apache.org>
AuthorDate: Fri Sep 21 15:21:45 2018 -0700
use ICollectionView support
---
frameworks/projects/MXRoyale/src/main/resources/defaults.css | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/frameworks/projects/MXRoyale/src/main/resources/defaults.css b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
index 5431454..90617f0 100644
--- a/frameworks/projects/MXRoyale/src/main/resources/defaults.css
+++ b/frameworks/projects/MXRoyale/src/main/resources/defaults.css
@@ -53,6 +53,11 @@ Basic|MenuItemRenderer
margin-top: 4px;
}
+Basic|ComboBoxList
+{
+ IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForCollectionView");
+}
+
Button
{
IBeadModel: ClassReference("org.apache.royale.html.beads.models.ImageAndTextModel");