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/23 00:15:00 UTC
[royale-asjs] branch develop updated (b5d6b0a -> 4d298a1)
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 b5d6b0a get rid of GCC warnings on this class
new ed0a0b4 create a PopUpList that encapsulates the styles needed for floating over the view
new 7a631d3 should use typeNames instead of className. ClassName can be swapped out by the user
new 6c9e27a ant build for MDLDynamicTabsExample
new cf255ee switch to PopUpList and clean up
new 9af2ca4 turn off default theme
new 2815145 move some more visual styles to theme
new 4d298a1 MDL shoudld turn off default layout
The 7 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:
.../ASDoc/src/main/royale/ASDocMainView.mxml | 19 +++++++-------
.../ASDoc/src/main/royale/models/ASDocModel.as | 2 +-
.../build.xml | 4 +--
.../src/main/config/compile-app-config.xml | 4 +++
.../Basic/src/main/resources/basic-manifest.xml | 1 +
.../projects/Basic/src/main/resources/defaults.css | 10 +++++---
.../org/apache/royale/core/DataContainerBase.as | 12 ---------
.../main/royale/org/apache/royale/core/UIBase.as | 30 ++++++++++++++++++++--
.../main/royale/org/apache/royale/html/Alert.as | 2 +-
.../royale/org/apache/royale/html/CSSCheckBox.as | 1 -
.../main/royale/org/apache/royale/html/CheckBox.as | 1 -
.../main/royale/org/apache/royale/html/ComboBox.as | 2 +-
.../royale/org/apache/royale/html/ControlBar.as | 2 +-
.../main/royale/org/apache/royale/html/DataGrid.as | 2 +-
.../org/apache/royale/html/DataGridButtonBar.as | 2 +-
.../royale/html/DataGridButtonBarTextButton.as | 3 +--
.../royale/org/apache/royale/html/DateField.as | 2 +-
.../main/royale/org/apache/royale/html/HTMLText.as | 1 -
.../main/royale/org/apache/royale/html/Image.as | 1 -
.../main/royale/org/apache/royale/html/Label.as | 1 -
.../src/main/royale/org/apache/royale/html/List.as | 16 +-----------
.../main/royale/org/apache/royale/html/Panel.as | 2 +-
.../html/{DataGridButtonBar.as => PopUpList.as} | 24 +++++++++--------
.../royale/org/apache/royale/html/RangeStepper.as | 2 +-
.../royale/org/apache/royale/html/SimpleAlert.as | 2 +-
.../royale/org/apache/royale/html/SimpleList.as | 2 +-
.../main/royale/org/apache/royale/html/Slider.as | 3 +--
.../main/royale/org/apache/royale/html/Spinner.as | 2 +-
.../main/royale/org/apache/royale/html/Table.as | 2 +-
.../royale/org/apache/royale/html/TableCell.as | 2 +-
.../royale/org/apache/royale/html/TableHeader.as | 2 +-
.../main/royale/org/apache/royale/html/TableRow.as | 2 +-
.../main/royale/org/apache/royale/html/TextArea.as | 1 -
.../royale/org/apache/royale/html/TextButton.as | 1 -
.../royale/org/apache/royale/html/TextInput.as | 1 -
.../main/royale/org/apache/royale/html/TitleBar.as | 2 +-
.../main/royale/org/apache/royale/html/ToolTip.as | 3 +--
.../src/main/royale/org/apache/royale/html/Tree.as | 2 +-
.../main/royale/org/apache/royale/html/TreeGrid.as | 2 +-
.../royale/org/apache/royale/express/MXMLViewer.as | 1 -
.../src/main/resources/defaults.css | 7 +++++
.../royale/org/apache/royale/mobile/DatePicker.as | 2 +-
.../royale/org/apache/royale/mobile/ManagerBase.as | 2 +-
.../org/apache/royale/mobile/StackedViewManager.as | 2 +-
.../org/apache/royale/mobile/TabbedViewManager.as | 2 +-
.../apache/royale/mobile/chrome/NavigationBar.as | 2 +-
.../org/apache/royale/mobile/chrome/TabBar.as | 2 +-
.../org/apache/royale/mobile/chrome/ToolBar.as | 2 +-
frameworks/themes/Basic/basic.css | 12 +++++++++
49 files changed, 113 insertions(+), 96 deletions(-)
copy examples/royale/{DebuggingExample => MDLDynamicTabsExample}/build.xml (95%)
copy examples/royale/{RoyaleTeamPage_MDL => MDLDynamicTabsExample}/src/main/config/compile-app-config.xml (93%)
copy frameworks/projects/Basic/src/main/royale/org/apache/royale/html/{DataGridButtonBar.as => PopUpList.as} (79%)
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 07/07: MDL shoudld turn off default layout
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 4d298a160aa388eb6306c6f0f80a3269ca240b40
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Feb 22 16:14:36 2018 -0800
MDL shoudld turn off default layout
---
.../projects/MaterialDesignLite/src/main/resources/defaults.css | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
index 1c64ef6..db5bf35 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
@@ -19,6 +19,7 @@
@namespace "library://ns.apache.org/royale/mdl";
+@namespace basic "library://ns.apache.org/royale/basic";
/* Rules for sizing the icon. */
.material-icons.md-18 { font-size: 18px; }
@@ -163,6 +164,12 @@ DropDownList
IItemRenderer: ClassReference("org.apache.royale.mdl.itemRenderers.DropDownListItemRenderer");
}
+basic|View
+{
+ IBeadLayout: ClassReference(null);
+}
+
+
@media -royale-swf
{
CheckBox
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 04/07: switch to PopUpList and clean up
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 cf255ee0defb1f62908ee8a09fbd0f88f53277ca
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Feb 22 16:13:04 2018 -0800
switch to PopUpList and clean up
---
.../royale/ASDoc/src/main/royale/ASDocMainView.mxml | 19 ++++++++++---------
.../royale/ASDoc/src/main/royale/models/ASDocModel.as | 2 +-
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml b/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml
index 9c1c986..8ec6394 100644
--- a/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml
+++ b/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml
@@ -30,7 +30,7 @@ limitations under the License.
import org.apache.royale.core.ClassFactory;
import org.apache.royale.events.Event;
import org.apache.royale.events.DetailEvent;
- import org.apache.royale.html.List;
+ import org.apache.royale.html.PopUpList;
import org.apache.royale.utils.PointUtils;
private function packagesReadyHandler(event:Event):void
@@ -39,6 +39,9 @@ limitations under the License.
updateView();
}
+ /**
+ * @royalesuppresspublicvarwarning
+ */
public var currentPackage:String;
private function packageChangedHandler():void
@@ -53,6 +56,9 @@ limitations under the License.
dispatchEvent(new Event("packageChanged"));
}
+ /**
+ * @royalesuppresspublicvarwarning
+ */
public var currentClass:String;
private function classChangedHandler():void
@@ -140,7 +146,7 @@ limitations under the License.
}
}
- private var popUpList:List;
+ private var popUpList:PopUpList;
private var max_results:int = 200;
private var too_many:Array = [ "Too many search results" ];
@@ -148,18 +154,13 @@ limitations under the License.
{
if (!popUpList)
{
- popUpList = new List();
+ popUpList = new PopUpList();
popUpList.itemRenderer = new ClassFactory(ClassPickerHashAnchorStringItemRenderer);
popUpList.dataProvider = too_many;
addElement(popUpList);
- COMPILE::JS
- {
- popUpList.positioner.style.position = "absolute";
- popUpList.positioner.style.backgroundColor = "#fff";
- }
var pt:Point = new Point(searchTI.x, searchTI.y);
pt.y += searchTI.height;
- //pt = PointUtils.localToGlobal(pt, titleGroup); // probably need this after we fix x,y
+ pt = PointUtils.localToGlobal(pt, titleGroup);
popUpList.x = pt.x;
popUpList.y = pt.y;
popUpList.width = searchTI.width;
diff --git a/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as b/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as
index 0e8bbd3..4e6a818 100644
--- a/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as
+++ b/examples/royale/ASDoc/src/main/royale/models/ASDocModel.as
@@ -200,7 +200,7 @@ package models
private var _attributesMap:Object;
/**
- * @flexjsignorecoercion ASDocClass
+ * @royaleignorecoercion ASDocClass
*/
private function completeClassHandler(event:Event):void
{
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 01/07: create a PopUpList that encapsulates the
styles needed for floating over the view
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 ed0a0b4e919a44b82e3923d5feea25a00afa2492
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Feb 22 14:13:17 2018 -0800
create a PopUpList that encapsulates the styles needed for floating over the view
---
.../Basic/src/main/resources/basic-manifest.xml | 1 +
.../projects/Basic/src/main/resources/defaults.css | 6 +++
.../royale/org/apache/royale/html/PopUpList.as | 53 ++++++++++++++++++++++
3 files changed, 60 insertions(+)
diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index e21c769..fb4429d 100644
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@ -43,6 +43,7 @@
<component id="HTMLText" class="org.apache.royale.html.HTMLText"/>
<component id="DataContainer" class="org.apache.royale.html.DataContainer"/>
<component id="List" class="org.apache.royale.html.List"/>
+ <component id="PopUpList" class="org.apache.royale.html.PopUpList"/>
<component id="SimpleList" class="org.apache.royale.html.SimpleList"/>
<component id="CheckBox" class="org.apache.royale.html.CheckBox"/>
<component id="CSSCheckBox" class="org.apache.royale.html.CSSCheckBox"/>
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css
index 51b8c36..92354b6 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -560,6 +560,12 @@ Panel .TitleBar
background-color: #FFFFFF;
}
+PopUpList
+{
+ position: absolute;
+ background-color: #fff;
+}
+
SimpleList
{
IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/PopUpList.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/PopUpList.as
new file mode 100644
index 0000000..102ab5e
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/PopUpList.as
@@ -0,0 +1,53 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.royale.html
+{
+ import org.apache.royale.core.IRollOverModel;
+ import org.apache.royale.core.ISelectionModel;
+
+ COMPILE::JS
+ {
+ import org.apache.royale.core.WrappedHTMLElement;
+ }
+
+ /**
+ * The PopUpList class is a List that can be popped up or floated over the view.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ public class PopUpList extends List
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ public function PopUpList()
+ {
+ super();
+ typeNames += " PopUpList";
+ }
+ }
+}
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 05/07: turn off default theme
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 9af2ca42ca8c474ff430e84c3f6a09de32c56f9b
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Feb 22 16:13:43 2018 -0800
turn off default theme
---
.../MDLDynamicTabsExample/src/main/config/compile-app-config.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/examples/royale/MDLDynamicTabsExample/src/main/config/compile-app-config.xml b/examples/royale/MDLDynamicTabsExample/src/main/config/compile-app-config.xml
index 7baec50..949a021 100644
--- a/examples/royale/MDLDynamicTabsExample/src/main/config/compile-app-config.xml
+++ b/examples/royale/MDLDynamicTabsExample/src/main/config/compile-app-config.xml
@@ -17,5 +17,9 @@
-->
<royale-config>
+ <compiler>
+ <theme>
+ </theme>
+ </compiler>
<html-template>../resources/mdl-js-index-template.html</html-template>
</royale-config>
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 06/07: move some more visual styles to theme
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 2815145b962c783353b66d6ce4f42155019612a6
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Feb 22 16:14:19 2018 -0800
move some more visual styles to theme
---
frameworks/projects/Basic/src/main/resources/defaults.css | 4 ----
frameworks/themes/Basic/basic.css | 12 ++++++++++++
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css
index 92354b6..886252b 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -152,9 +152,6 @@ DataContainer
IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");
IViewport: ClassReference("org.apache.royale.html.supportClasses.Viewport");
IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
- border-style: solid;
- border-color: #222222;
- border-width: 1px;
}
/* ASJS */
@@ -416,7 +413,6 @@ List
IItemRenderer: ClassReference("org.apache.royale.html.supportClasses.StringItemRenderer");
IViewport: ClassReference("org.apache.royale.html.supportClasses.ScrollingViewport");
IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
- border: 1px solid #222222;
}
.DynamicList
diff --git a/frameworks/themes/Basic/basic.css b/frameworks/themes/Basic/basic.css
index 5b5d3ee..b292b26 100644
--- a/frameworks/themes/Basic/basic.css
+++ b/frameworks/themes/Basic/basic.css
@@ -25,12 +25,24 @@ CheckBox
font-family: sans-serif;
}
+DataContainer
+{
+ border-style: solid;
+ border-color: #222222;
+ border-width: 1px;
+}
+
Label
{
font-size: 12px;
font-family: sans-serif;
}
+List
+{
+ border: 1px solid #222222;
+}
+
RadioButton
{
font-size: 12px;
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 02/07: should use typeNames instead of className.
ClassName can be swapped out by the user
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 7a631d39f7642f930a703d4cf2540996df9b3458
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Feb 22 15:23:21 2018 -0800
should use typeNames instead of className. ClassName can be swapped out by the user
---
.../org/apache/royale/core/DataContainerBase.as | 12 ---------
.../main/royale/org/apache/royale/core/UIBase.as | 30 ++++++++++++++++++++--
.../main/royale/org/apache/royale/html/Alert.as | 2 +-
.../royale/org/apache/royale/html/CSSCheckBox.as | 1 -
.../main/royale/org/apache/royale/html/CheckBox.as | 1 -
.../main/royale/org/apache/royale/html/ComboBox.as | 2 +-
.../royale/org/apache/royale/html/ControlBar.as | 2 +-
.../main/royale/org/apache/royale/html/DataGrid.as | 2 +-
.../org/apache/royale/html/DataGridButtonBar.as | 2 +-
.../royale/html/DataGridButtonBarTextButton.as | 3 +--
.../royale/org/apache/royale/html/DateField.as | 2 +-
.../main/royale/org/apache/royale/html/HTMLText.as | 1 -
.../main/royale/org/apache/royale/html/Image.as | 1 -
.../main/royale/org/apache/royale/html/Label.as | 1 -
.../src/main/royale/org/apache/royale/html/List.as | 16 +-----------
.../main/royale/org/apache/royale/html/Panel.as | 2 +-
.../royale/org/apache/royale/html/RangeStepper.as | 2 +-
.../royale/org/apache/royale/html/SimpleAlert.as | 2 +-
.../royale/org/apache/royale/html/SimpleList.as | 2 +-
.../main/royale/org/apache/royale/html/Slider.as | 3 +--
.../main/royale/org/apache/royale/html/Spinner.as | 2 +-
.../main/royale/org/apache/royale/html/Table.as | 2 +-
.../royale/org/apache/royale/html/TableCell.as | 2 +-
.../royale/org/apache/royale/html/TableHeader.as | 2 +-
.../main/royale/org/apache/royale/html/TableRow.as | 2 +-
.../main/royale/org/apache/royale/html/TextArea.as | 1 -
.../royale/org/apache/royale/html/TextButton.as | 1 -
.../royale/org/apache/royale/html/TextInput.as | 1 -
.../main/royale/org/apache/royale/html/TitleBar.as | 2 +-
.../main/royale/org/apache/royale/html/ToolTip.as | 3 +--
.../src/main/royale/org/apache/royale/html/Tree.as | 2 +-
.../main/royale/org/apache/royale/html/TreeGrid.as | 2 +-
.../royale/org/apache/royale/express/MXMLViewer.as | 1 -
.../royale/org/apache/royale/mobile/DatePicker.as | 2 +-
.../royale/org/apache/royale/mobile/ManagerBase.as | 2 +-
.../org/apache/royale/mobile/StackedViewManager.as | 2 +-
.../org/apache/royale/mobile/TabbedViewManager.as | 2 +-
.../apache/royale/mobile/chrome/NavigationBar.as | 2 +-
.../org/apache/royale/mobile/chrome/TabBar.as | 2 +-
.../org/apache/royale/mobile/chrome/ToolBar.as | 2 +-
40 files changed, 57 insertions(+), 69 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/DataContainerBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/DataContainerBase.as
index b3e2464..f421e0a 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/DataContainerBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/DataContainerBase.as
@@ -67,18 +67,6 @@ package org.apache.royale.core
* UIBase
*/
- /**
- * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement
- */
- COMPILE::JS
- override protected function createElement():WrappedHTMLElement
- {
- super.createElement();
- className = 'DataContainer';
-
- return element;
- }
-
private var _DCinitialized:Boolean;
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
index 21ad9d9..66f06f9 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
@@ -677,15 +677,21 @@ package org.apache.royale.core
style.left = value;
}
+ /**
+ * @royaleignorecoercion HTMLElement
+ */
COMPILE::JS
public function set x(value:Number):void
{
//positioner.style.position = 'absolute';
+ if (positioner.parentNode != positioner.offsetParent)
+ value += (positioner.parentNode as HTMLElement).offsetLeft;
positioner.style.left = value.toString() + 'px';
}
/**
* @royaleignorecoercion String
+ * @royaleignorecoercion HTMLElement
*/
COMPILE::JS
public function get x():Number
@@ -693,7 +699,11 @@ package org.apache.royale.core
var strpixels:String = positioner.style.left as String;
var pixels:Number = parseFloat(strpixels);
if (isNaN(pixels))
+ {
pixels = positioner.offsetLeft;
+ if (positioner.parentNode != positioner.offsetParent)
+ pixels -= (positioner.parentNode as HTMLElement).offsetLeft;
+ }
return pixels;
}
@@ -704,6 +714,7 @@ package org.apache.royale.core
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.0
+ * @royaleignorecoercion HTMLElement
*/
public function setX(value:Number):void
{
@@ -714,6 +725,8 @@ package org.apache.royale.core
COMPILE::JS
{
//positioner.style.position = 'absolute';
+ if (positioner.parentNode != positioner.offsetParent)
+ value += (positioner.parentNode as HTMLElement).offsetLeft;
positioner.style.left = value.toString() + 'px';
}
}
@@ -733,15 +746,21 @@ package org.apache.royale.core
style.top = value;
}
+ /**
+ * @royaleignorecoercion HTMLElement
+ */
COMPILE::JS
public function set y(value:Number):void
{
//positioner.style.position = 'absolute';
+ if (positioner.parentNode != positioner.offsetParent)
+ value += (positioner.parentNode as HTMLElement).offsetTop;
positioner.style.top = value.toString() + 'px';
}
/**
* @royaleignorecoercion String
+ * @royaleignorecoercion HTMLElement
*/
COMPILE::JS
public function get y():Number
@@ -749,7 +768,11 @@ package org.apache.royale.core
var strpixels:String = positioner.style.top as String;
var pixels:Number = parseFloat(strpixels);
if (isNaN(pixels))
+ {
pixels = positioner.offsetTop;
+ if (positioner.parentNode != positioner.offsetParent)
+ pixels -= (positioner.parentNode as HTMLElement).offsetTop;
+ }
return pixels;
}
@@ -760,6 +783,7 @@ package org.apache.royale.core
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.0
+ * @royaleignorecoercion HTMLElement
*/
public function setY(value:Number):void
{
@@ -770,6 +794,8 @@ package org.apache.royale.core
COMPILE::JS
{
//positioner.style.position = 'absolute';
+ if (positioner.parentNode != positioner.offsetParent)
+ value += (positioner.parentNode as HTMLElement).offsetTop;
positioner.style.top = value.toString() + 'px';
}
}
@@ -1325,8 +1351,8 @@ package org.apache.royale.core
COMPILE::JS
{
- if (!_className && typeNames)
- setClassName(typeNames);
+ if (typeNames)
+ setClassName((_className ? _className + " " : "") + typeNames);
if (style)
ValuesManager.valuesImpl.applyStyles(this, style);
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Alert.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Alert.as
index 70764c5..69469e9 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Alert.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Alert.as
@@ -94,7 +94,7 @@ package org.apache.royale.html
{
super();
- className = "Alert";
+ typeNames = "Alert";
}
// note: only passing parent to this function as I don't see a way to identify
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/CSSCheckBox.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/CSSCheckBox.as
index fc2f9f4..3dc955d 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/CSSCheckBox.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/CSSCheckBox.as
@@ -182,7 +182,6 @@ package org.apache.royale.html
_icon.element.royale_wrapper = this;
_styleDiv.royale_wrapper = this;
- className = 'CSSCheckBox';
typeNames = 'CSSCheckBox';
return element;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/CheckBox.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/CheckBox.as
index 5007c08..b870e0a 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/CheckBox.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/CheckBox.as
@@ -163,7 +163,6 @@ package org.apache.royale.html
//positioner.style.position = 'relative';
_icon.element.royale_wrapper = this;
- className = 'CheckBox';
typeNames = 'CheckBox, CheckBoxIcon';
return element;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ComboBox.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ComboBox.as
index 292af3e..5326bab 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ComboBox.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ComboBox.as
@@ -56,7 +56,7 @@ package org.apache.royale.html
{
super();
- className = "ComboBox";
+ typeNames = "ComboBox";
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ControlBar.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ControlBar.as
index f3f065c..550b868 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ControlBar.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ControlBar.as
@@ -63,7 +63,7 @@ package org.apache.royale.html
{
super();
- className = "ControlBar";
+ typeNames = "ControlBar";
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGrid.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGrid.as
index 8e4ee9f..189ddc6 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGrid.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGrid.as
@@ -59,7 +59,7 @@ package org.apache.royale.html
{
super();
- className = "DataGrid";
+ typeNames = "DataGrid";
// set a reasonable default size
width = 200;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGridButtonBar.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGridButtonBar.as
index 102ed73..e959518 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGridButtonBar.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGridButtonBar.as
@@ -45,7 +45,7 @@ package org.apache.royale.html
public function DataGridButtonBar()
{
super();
- className = "DataGridButtonBar";
+ typeNames = "DataGridButtonBar";
}
}
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGridButtonBarTextButton.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGridButtonBarTextButton.as
index 4a3bf0e..083ed92 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGridButtonBarTextButton.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataGridButtonBarTextButton.as
@@ -47,8 +47,7 @@ package org.apache.royale.html
public function DataGridButtonBarTextButton()
{
super();
- typeNames = "";
- className = "DataGridButtonBarTextButton";
+ typeNames += " DataGridButtonBarTextButton";
}
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DateField.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DateField.as
index fd83e35..1bcdd54 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DateField.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DateField.as
@@ -56,7 +56,7 @@ package org.apache.royale.html
{
super();
- className = "DateField";
+ typeNames = "DateField";
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/HTMLText.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/HTMLText.as
index ae94292..de6ce46 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/HTMLText.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/HTMLText.as
@@ -109,7 +109,6 @@ package org.apache.royale.html
{
addElementToWrapper(this,'span');
- className = "HTMLText";
typeNames = "HTMLText";
return element;
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Image.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Image.as
index cdb9f1a..db88e41 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Image.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Image.as
@@ -57,7 +57,6 @@ package org.apache.royale.html
override protected function createElement():WrappedHTMLElement
{
addElementToWrapper(this,'img');
- element.className = 'Image';
typeNames = 'Image';
return element;
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Label.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Label.as
index 7502e21..bb36430 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Label.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Label.as
@@ -181,7 +181,6 @@ package org.apache.royale.html
element.style.whiteSpace = "nowrap";
- className = "Label";
typeNames = "Label";
return element;
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/List.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/List.as
index 0a2b4d2..f84e064 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/List.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/List.as
@@ -77,6 +77,7 @@ package org.apache.royale.html
public function List()
{
super();
+ typeNames += " List";
}
/**
@@ -151,20 +152,5 @@ package org.apache.royale.html
ISelectionModel(model).selectedItem = value;
}
- /*
- * UIBase
- */
-
- /**
- * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement
- */
- COMPILE::JS
- override protected function createElement():WrappedHTMLElement
- {
- super.createElement();
- className = 'List';
-
- return element;
- }
}
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Panel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Panel.as
index 29d3769..f046d8f 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Panel.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Panel.as
@@ -66,7 +66,7 @@ package org.apache.royale.html
{
super();
- className = "Panel";
+ typeNames = "Panel";
}
public function $addElement(c:IChild, dispatchEvent:Boolean = true):void
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/RangeStepper.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/RangeStepper.as
index 517d470..db207d1 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/RangeStepper.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/RangeStepper.as
@@ -44,7 +44,7 @@ package org.apache.royale.html
{
super();
- className = "RangeStepper";
+ typeNames = "RangeStepper";
setWidthAndHeight(40, 60, true);
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/SimpleAlert.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/SimpleAlert.as
index 60a4096..9ac9d94 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/SimpleAlert.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/SimpleAlert.as
@@ -55,7 +55,7 @@ package org.apache.royale.html
{
super();
- className = "SimpleAlert";
+ typeNames = "SimpleAlert";
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/SimpleList.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/SimpleList.as
index c74bdc5..17d92f9 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/SimpleList.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/SimpleList.as
@@ -62,7 +62,7 @@ package org.apache.royale.html
(element as HTMLSelectElement).size = 5;
goog.events.listen(element, 'change',
changeHandler);
- className = 'SimpleList';
+ typeNames = 'SimpleList';
return element;
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Slider.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Slider.as
index bd4bc11..9e5f691 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Slider.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Slider.as
@@ -59,7 +59,7 @@ package org.apache.royale.html
{
super();
- className = "Slider";
+ typeNames = "Slider";
IRangeModel(model).value = 0;
IRangeModel(model).minimum = 0;
@@ -167,7 +167,6 @@ package org.apache.royale.html
// just to give it some default values
element.style.width = '100px';
element.style.height = '30px';
- className = 'Slider';
return element;
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Spinner.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Spinner.as
index ea26591..4aa4199 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Spinner.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Spinner.as
@@ -58,7 +58,7 @@ package org.apache.royale.html
{
super();
- className = "Spinner";
+ typeNames = "Spinner";
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Table.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Table.as
index 06d4d5d..e2b0eee 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Table.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Table.as
@@ -48,7 +48,7 @@ package org.apache.royale.html
{
super();
- className = "Table";
+ typeNames = "Table";
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TableCell.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TableCell.as
index cc9b809..7a42cdc 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TableCell.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TableCell.as
@@ -49,7 +49,7 @@ package org.apache.royale.html
{
super();
- className = "TableCell";
+ typeNames = "TableCell";
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TableHeader.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TableHeader.as
index 2cd6dd3..ee4037b 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TableHeader.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TableHeader.as
@@ -48,7 +48,7 @@ package org.apache.royale.html
{
super();
- className = "TableHeader";
+ typeNames = "TableHeader";
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TableRow.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TableRow.as
index a9a4256..4aaa70a 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TableRow.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TableRow.as
@@ -50,7 +50,7 @@ package org.apache.royale.html
{
super();
- className = "TableRow";
+ typeNames = "TableRow";
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextArea.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextArea.as
index a6d7c03..a6cb98c 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextArea.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextArea.as
@@ -155,7 +155,6 @@ package org.apache.royale.html
{
addElementToWrapper(this,'textarea');
goog.events.listen(element, 'input', textChangeHandler);
- element.className = 'TextArea';
typeNames = 'TextArea';
return element;
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextButton.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextButton.as
index f517941..87c35d0 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextButton.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextButton.as
@@ -129,7 +129,6 @@ package org.apache.royale.html
override protected function createElement():WrappedHTMLElement
{
super.createElement();
- className = "TextButton";
typeNames = "TextButton";
return element;
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextInput.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextInput.as
index 0fea2f6..3214bd5 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextInput.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextInput.as
@@ -171,7 +171,6 @@ package org.apache.royale.html
{
addElementToWrapper(this,'input');
element.setAttribute('type', 'text');
- element.className = 'TextInput';
typeNames = 'TextInput';
//attach input handler to dispatch royale change event when user write in textinput
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TitleBar.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TitleBar.as
index 6961c8e..b6acb46 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TitleBar.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TitleBar.as
@@ -61,7 +61,7 @@ package org.apache.royale.html
{
super();
- className = "TitleBar";
+ typeNames = "TitleBar";
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ToolTip.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ToolTip.as
index 29db9dc..2f586a3 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ToolTip.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ToolTip.as
@@ -57,7 +57,7 @@ package org.apache.royale.html
public function ToolTip()
{
super();
- className = "ToolTip";
+ typeNames = "ToolTip";
COMPILE::SWF
{
mouseEnabled = false;
@@ -73,7 +73,6 @@ package org.apache.royale.html
super.createElement();
positioner.style.position = 'absolute';
positioner.style.pointerEvents = "none";
- typeNames = "ToolTip";
return element;
}
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Tree.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Tree.as
index ec4b46a..d217e35 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Tree.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Tree.as
@@ -45,7 +45,7 @@ package org.apache.royale.html
public function Tree()
{
super();
- className = "Tree";
+ typeNames += " Tree";
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TreeGrid.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TreeGrid.as
index fc84246..f503a6d 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TreeGrid.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TreeGrid.as
@@ -49,7 +49,7 @@ package org.apache.royale.html
public function TreeGrid()
{
super();
- className = "TreeGrid";
+ typeNames = "TreeGrid";
}
diff --git a/frameworks/projects/Express/src/main/royale/org/apache/royale/express/MXMLViewer.as b/frameworks/projects/Express/src/main/royale/org/apache/royale/express/MXMLViewer.as
index 4b79034..a1787ad 100644
--- a/frameworks/projects/Express/src/main/royale/org/apache/royale/express/MXMLViewer.as
+++ b/frameworks/projects/Express/src/main/royale/org/apache/royale/express/MXMLViewer.as
@@ -63,7 +63,6 @@ package org.apache.royale.express
element.style.cursor = "default";
element.style.pointerEvents = "none";
- className = "MXMLViewer";
typeNames = "MXMLViewer";
return element;
diff --git a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/DatePicker.as b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/DatePicker.as
index b5bc095..945236b 100644
--- a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/DatePicker.as
+++ b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/DatePicker.as
@@ -47,7 +47,7 @@ package org.apache.royale.mobile
{
super();
- className = "DatePicker";
+ typeNames = "DatePicker";
setWidthAndHeight(120, 60, true);
selectedDate = new Date();
diff --git a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/ManagerBase.as b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/ManagerBase.as
index d001f0c..7c61e01 100644
--- a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/ManagerBase.as
+++ b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/ManagerBase.as
@@ -50,6 +50,7 @@ package org.apache.royale.mobile
public function ManagerBase()
{
super();
+ typeNames = 'ManagerBase';
_contentArea = new UIBase();
@@ -74,7 +75,6 @@ package org.apache.royale.mobile
override protected function createElement():WrappedHTMLElement
{
super.createElement();
- element.className = 'ManagerBase';
_contentArea.positioner.style['width'] = '100%';
_contentArea.positioner.style['height'] = '100%';
diff --git a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/StackedViewManager.as b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/StackedViewManager.as
index 4a1cf10..f932344 100644
--- a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/StackedViewManager.as
+++ b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/StackedViewManager.as
@@ -58,7 +58,7 @@ package org.apache.royale.mobile
{
super();
- className = "StackedViewManager";
+ typeNames = "StackedViewManager";
}
/**
diff --git a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/TabbedViewManager.as b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/TabbedViewManager.as
index 29c9997..5dd462c 100644
--- a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/TabbedViewManager.as
+++ b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/TabbedViewManager.as
@@ -52,7 +52,7 @@ package org.apache.royale.mobile
{
super();
- className = "TabbedViewManager";
+ typeNames = "TabbedViewManager";
}
/**
diff --git a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/chrome/NavigationBar.as b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/chrome/NavigationBar.as
index 0192a90..80443f4 100644
--- a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/chrome/NavigationBar.as
+++ b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/chrome/NavigationBar.as
@@ -46,7 +46,7 @@ package org.apache.royale.mobile.chrome
{
super();
- className = "NavigationBar";
+ typeNames = "NavigationBar";
}
public function hidesBackButton(value:Boolean):void
diff --git a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/chrome/TabBar.as b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/chrome/TabBar.as
index 911581b..58e8376 100644
--- a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/chrome/TabBar.as
+++ b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/chrome/TabBar.as
@@ -44,7 +44,7 @@ package org.apache.royale.mobile.chrome
{
super();
- className = "TabBar";
+ typeNames = "TabBar";
}
}
}
diff --git a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/chrome/ToolBar.as b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/chrome/ToolBar.as
index 9623b62..3e84a3a 100644
--- a/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/chrome/ToolBar.as
+++ b/frameworks/projects/Mobile/src/main/royale/org/apache/royale/mobile/chrome/ToolBar.as
@@ -38,7 +38,7 @@ package org.apache.royale.mobile.chrome
{
super();
- className = "ToolBar";
+ typeNames = "ToolBar";
}
private var _controls:Array;
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 03/07: ant build for MDLDynamicTabsExample
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 6c9e27abf6aa216a4ca5c2fc560cc1a4d19e9255
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Feb 22 15:23:54 2018 -0800
ant build for MDLDynamicTabsExample
---
examples/royale/MDLDynamicTabsExample/build.xml | 55 ++++++++++++++++++++++
.../src/main/config/compile-app-config.xml | 21 +++++++++
2 files changed, 76 insertions(+)
diff --git a/examples/royale/MDLDynamicTabsExample/build.xml b/examples/royale/MDLDynamicTabsExample/build.xml
new file mode 100644
index 0000000..d7e1315
--- /dev/null
+++ b/examples/royale/MDLDynamicTabsExample/build.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+
+
+<project name="mdldynamictabsexample" default="main" basedir=".">
+ <property name="ROYALE_HOME" location="../../.."/>
+ <property name="example" value="TabsExample" />
+
+ <property file="${ROYALE_HOME}/env.properties"/>
+ <property environment="env"/>
+ <property file="${ROYALE_HOME}/build.properties"/>
+ <property name="ROYALE_HOME" value="${ROYALE_HOME}"/>
+ <property name="opt1_arg" value="-js-output-optimization=skipAsCoercions" />
+
+ <include file="${basedir}/../../build_example.xml" />
+
+ <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}">
+ </target>
+
+ <target name="clean">
+ <delete dir="${basedir}/bin" failonerror="false" />
+ <delete dir="${basedir}/bin-debug" failonerror="false" />
+ <delete dir="${basedir}/bin-release" failonerror="false" />
+ <delete dir="${basedir}/target" failonerror="false" />
+ </target>
+
+ <target name="examine" depends="build_example.get.browser">
+ <property name="which" value="debug" />
+ <echo message="Choose from dropdown, get quote, click on checkbox to see if TextArea appears and disappears, click on radio buttons to see if other labels change via data binding"/>
+ <exec executable="${browser}" dir="${basedir}/bin-${which}" failonerror="true">
+ <arg value="${basedir}/bin-${which}/${example}.html"/>
+ </exec>
+ <exec executable="${browser}" dir="${basedir}/bin/js-${which}" failonerror="true">
+ <arg value="${basedir}/bin/js-${which}/index.html"/>
+ </exec>
+ </target>
+
+</project>
diff --git a/examples/royale/MDLDynamicTabsExample/src/main/config/compile-app-config.xml b/examples/royale/MDLDynamicTabsExample/src/main/config/compile-app-config.xml
new file mode 100644
index 0000000..7baec50
--- /dev/null
+++ b/examples/royale/MDLDynamicTabsExample/src/main/config/compile-app-config.xml
@@ -0,0 +1,21 @@
+<!--
+
+ 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.
+
+-->
+<royale-config>
+ <html-template>../resources/mdl-js-index-template.html</html-template>
+</royale-config>
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.