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:02 UTC
[royale-asjs] 02/07: should use typeNames instead of className.
ClassName can be swapped out by the user
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.