You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2017/02/02 21:42:59 UTC
[1/2] git commit: [flex-asjs] [refs/heads/develop] - Simple
implementation of "modules" - loads .html or .swf files depending on
platform.
Repository: flex-asjs
Updated Branches:
refs/heads/develop 6d75211e8 -> 05b4fa42f
Simple implementation of "modules" - loads .html or .swf files depending on platform.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f7f57511
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f7f57511
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f7f57511
Branch: refs/heads/develop
Commit: f7f575118f575f297d970c530610e08123477010
Parents: 75da13b
Author: Peter Ent <pe...@apache.org>
Authored: Thu Feb 2 16:41:59 2017 -0500
Committer: Peter Ent <pe...@apache.org>
Committed: Thu Feb 2 16:41:59 2017 -0500
----------------------------------------------------------------------
.../projects/HTML/src/main/flex/HTMLClasses.as | 2 +
.../main/flex/org/apache/flex/html/Module.as | 137 +++++++++++++++++++
.../HTML/src/main/resources/basic-manifest.xml | 2 +
3 files changed, 141 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f7f57511/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/HTMLClasses.as b/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
index ee5f4aa..4451835 100644
--- a/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
+++ b/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
@@ -214,6 +214,8 @@ internal class HTMLClasses
import org.apache.flex.html.beads.VRuleView; VRuleView;
import org.apache.flex.html.beads.MultilineTextFieldView; MultilineTextFieldView;
}
+
+ import org.apache.flex.html.Module; Module;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f7f57511/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Module.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Module.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Module.as
new file mode 100644
index 0000000..6f1603a
--- /dev/null
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Module.as
@@ -0,0 +1,137 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.html
+{
+ import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.UIBase;
+ import org.apache.flex.utils.PointUtils;
+ import org.apache.flex.geom.Point;
+ import org.apache.flex.events.Event;
+
+ COMPILE::SWF
+ {
+ import flash.display.Loader;
+ import flash.display.DisplayObjectContainer;
+ import flash.system.LoaderContext;
+ import flash.system.ApplicationDomain;
+ import flash.net.URLRequest;
+ import flash.events.Event;
+ }
+
+ COMPILE::JS
+ {
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
+
+ /**
+ * The Module class can load Flash or HTML content into a space within an application. Use Module to
+ * identify where the application should appear, then use its loadContent() function to load the
+ * application dynamically.
+ *
+ * @toplevel
+ * @see org.apache.flex.html.beads.layout
+ * @see org.apache.flex.html.supportClasses.ScrollingViewport
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class Module extends UIBase
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function Module()
+ {
+ super();
+ }
+
+ COMPILE::SWF
+ private var swfLoader:Loader;
+
+ COMPILE::JS
+ private var htmlLoader:WrappedHTMLElement;
+
+ /**
+ * @private
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ */
+ private function createLoader():void
+ {
+ COMPILE::SWF {
+ if (swfLoader != null) {
+ $displayObjectContainer.removeChild(swfLoader);
+ }
+
+ swfLoader = new Loader();
+ swfLoader.x = 0;
+ swfLoader.y = 0;
+ }
+
+ COMPILE::JS {
+ var origin:Point = new Point(0,0);
+ var xlated:Point = PointUtils.localToGlobal(origin, parent);
+
+ if (htmlLoader == null) {
+ htmlLoader = document.createElement('iframe') as WrappedHTMLElement;
+ htmlLoader["width"] = String(this.width);
+ htmlLoader["height"] = String(this.height);
+ htmlLoader.style.position = "absolute";
+ htmlLoader.style.left = String(xlated.x) + "px";
+ htmlLoader.style.top = String(xlated.y) + "px";
+ htmlLoader.style.backgroundColor = String("white");
+ htmlLoader.style.border = "none";
+ document.body.appendChild(htmlLoader);
+ }
+ }
+ }
+
+ /**
+ * Specifies the URL to load, depending on the runtime platform. Pass null for
+ * whichever URL is not being used.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function loadContent(swfURL:String, htmlURL:String):void
+ {
+ createLoader();
+
+ COMPILE::SWF {
+ var url:URLRequest = new URLRequest(swfURL);
+ var loaderContext:LoaderContext = new LoaderContext(false, ApplicationDomain.currentDomain, null);
+ swfLoader.load(url, loaderContext);
+ if (swfLoader.parent == null) {
+ $displayObjectContainer.addChild(swfLoader);
+ }
+ }
+
+ COMPILE::JS {
+ htmlLoader.setAttribute("src", htmlURL);
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f7f57511/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/resources/basic-manifest.xml b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
index d344ef4..cc10645 100644
--- a/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
@@ -138,6 +138,8 @@
<component id="OneFlexibleChildVerticalLayout" class="org.apache.flex.html.beads.layouts.OneFlexibleChildVerticalLayout"/>
<component id="OneFlexibleChildHorizontalLayout" class="org.apache.flex.html.beads.layouts.OneFlexibleChildHorizontalLayout"/>
<component id="MXMLBeadView" class="org.apache.flex.html.MXMLBeadView"/>
+
+ <component id="Module" class="org.apache.flex.html.Module" />
<component id="Border" class="org.apache.flex.html.supportClasses.Border"/>
[2/2] git commit: [flex-asjs] [refs/heads/develop] - Merge branch
'Modules' into develop
Posted by pe...@apache.org.
Merge branch 'Modules' into develop
* Modules:
Simple implementation of "modules" - loads .html or .swf files depending on platform.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/05b4fa42
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/05b4fa42
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/05b4fa42
Branch: refs/heads/develop
Commit: 05b4fa42fc8bb88c625794834a6a6cb967270c7a
Parents: 6d75211 f7f5751
Author: Peter Ent <pe...@apache.org>
Authored: Thu Feb 2 16:42:45 2017 -0500
Committer: Peter Ent <pe...@apache.org>
Committed: Thu Feb 2 16:42:45 2017 -0500
----------------------------------------------------------------------
.../projects/HTML/src/main/flex/HTMLClasses.as | 2 +
.../main/flex/org/apache/flex/html/Module.as | 137 +++++++++++++++++++
.../HTML/src/main/resources/basic-manifest.xml | 2 +
3 files changed, 141 insertions(+)
----------------------------------------------------------------------