You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pi...@apache.org on 2017/03/26 13:37:47 UTC
flex-tourjs git commit: Fix namespaces for TourJS
Repository: flex-tourjs
Updated Branches:
refs/heads/develop 1fcc45dd6 -> 6aaba46cf
Fix namespaces for TourJS
Project: http://git-wip-us.apache.org/repos/asf/flex-tourjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-tourjs/commit/6aaba46c
Tree: http://git-wip-us.apache.org/repos/asf/flex-tourjs/tree/6aaba46c
Diff: http://git-wip-us.apache.org/repos/asf/flex-tourjs/diff/6aaba46c
Branch: refs/heads/develop
Commit: 6aaba46cffef5a7a3d3c699c1ef426de6ce93ae5
Parents: 1fcc45d
Author: piotrz <pi...@apache.org>
Authored: Sun Mar 26 15:37:44 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Sun Mar 26 15:37:44 2017 +0200
----------------------------------------------------------------------
TourJS/src/main/flex/TourJS.mxml | 7 ++-----
TourJS/src/main/flex/TourJSMainView.mxml | 27 ++++++++++++---------------
2 files changed, 14 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-tourjs/blob/6aaba46c/TourJS/src/main/flex/TourJS.mxml
----------------------------------------------------------------------
diff --git a/TourJS/src/main/flex/TourJS.mxml b/TourJS/src/main/flex/TourJS.mxml
index c49ed32..63db665 100644
--- a/TourJS/src/main/flex/TourJS.mxml
+++ b/TourJS/src/main/flex/TourJS.mxml
@@ -19,11 +19,8 @@ limitations under the License.
-->
<js:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:local="*"
- xmlns:js="library://ns.apache.org/flexjs/basic"
- xmlns:models="models.*"
- xmlns:controllers="controllers.*"
- width="900" height="500"
- >
+ xmlns:js="library://ns.apache.org/flexjs/basic"
+ width="900" height="500">
<js:valuesImpl>
<js:SimpleCSSValuesImpl />
</js:valuesImpl>
http://git-wip-us.apache.org/repos/asf/flex-tourjs/blob/6aaba46c/TourJS/src/main/flex/TourJSMainView.mxml
----------------------------------------------------------------------
diff --git a/TourJS/src/main/flex/TourJSMainView.mxml b/TourJS/src/main/flex/TourJSMainView.mxml
index b08261c..749b671 100644
--- a/TourJS/src/main/flex/TourJSMainView.mxml
+++ b/TourJS/src/main/flex/TourJSMainView.mxml
@@ -17,19 +17,16 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-<js:HView xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:js="library://ns.apache.org/flexjs/express"
- xmlns:basic="library://ns.apache.org/flexjs/basic"
- width="100%" height="100%"
- initComplete="loadInitialData()">
+<express:HView xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
+ xmlns:express="org.apache.flex.express.*"
+ width="100%" height="100%"
+ initComplete="loadInitialData()">
<fx:Script>
<![CDATA[
import org.apache.flex.collections.HierarchicalData;
import org.apache.flex.collections.converters.JSONItemConverter;
- import org.apache.flex.html.beads.ContainerView;
- import org.apache.flex.core.UIBase;
- import org.apache.flex.html.SubAppLoader;
-
+
[Bindable]
private var tempExampleNames = [];
@@ -135,13 +132,13 @@ limitations under the License.
}
</fx:Style>
- <js:beads>
+ <express:beads>
<js:HTTPService id="service" />
<js:HTTPService id="codeLoader" />
- </js:beads>
+ </express:beads>
<js:Panel title="Component Explorer" width="25%" height="100%" className="Explorer">
- <basic:Tree id="contentTree" width="100%"
+ <js:Tree id="contentTree" width="100%"
height="100%"
labelField="title"
className="ExplorerTree"
@@ -150,7 +147,7 @@ limitations under the License.
<js:VContainer width="74%" height="100%">
<js:Panel id="topPanel" title="Example" width="100%" height="50%" className="RunningExample">
- <basic:SubAppLoader id="exampleApp" width="100%" height="100%" />
+ <js:SubAppLoader id="exampleApp" width="100%" height="100%" />
</js:Panel>
<js:VContainer width="100%" height="50%">
@@ -159,10 +156,10 @@ limitations under the License.
<js:beads>
<js:ScrollingViewport />
</js:beads>
- <js:MXMLViewer id="codeArea" width="100%"/>
+ <express:MXMLViewer id="codeArea" width="100%"/>
</js:Container>
</js:VContainer>
</js:VContainer>
-</js:HView>
+</express:HView>