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/22 01:27:56 UTC
[royale-asjs] branch develop updated (2dd5941 -> 306bf9b)
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 2dd5941 Added simple pop-up Menu.
new e1398bb remove * selector and use global as the 'browser defaults' for SWF side. Set default font-size to 16 and use serif font to match FireFox, Safari and Chrome. Set default control font size to 11px Arial to match browsers as well
new 146aa4c checkbox and radiobutton were not pcking up styles correctly
new 7337e94 The browser defaults of serif and 16px are undesirable and unexpected for migrating Flex users. Add a basic.css theme with the type selectors that override browser defaults. More type selectors might be needed as we scrub the examples
new fff09e0 Express doesn't need * selector either
new 2e1c8c0 fix lookup
new e7c3769 fix up styles after changing lookup
new 0271a9a need more typeselectors to get default font in most places. We don't really want to inherit a font family from application in case other component sets are being mixed in
new 859cce6 need more typenames in order to set defaults
new d92ca0f fix up ASDOc after style lookup changes
new 306bf9b remove exclude-defaults-css. Shouldn't be needed anymore after we took out the * selector
The 10 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 | 3 ++
.../ASDoc/src/main/royale/AttributeRenderer.as | 2 +-
examples/royale/MDLDynamicTableExample/pom.xml | 1 -
examples/royale/MDLDynamicTabsExample/pom.xml | 1 -
examples/royale/RemoteObjectAMFTest/build.xml | 3 +-
examples/royale/RemoteObjectAMFTest/pom.xml | 2 --
examples/royale/RoyaleTeamPage_MDL/pom.xml | 1 -
.../src/main/config/compile-app-config.xml | 5 ---
examples/royale/RoyaleWebsite/pom.xml | 1 -
.../src/main/config/compile-app-config.xml | 4 ---
frameworks/air-config-template.xml | 1 +
frameworks/flex-config-template.xml | 1 +
.../projects/Basic/src/main/resources/defaults.css | 39 +++++++++++++++++-----
.../royale/org/apache/royale/html/DataContainer.as | 1 +
.../org/apache/royale/html/beads/CheckBoxView.as | 7 +++-
.../apache/royale/html/beads/DropDownListView.as | 3 ++
.../apache/royale/html/beads/RadioButtonView.as | 5 +++
.../royale/html/supportClasses/MXMLItemRenderer.as | 1 +
.../org/apache/royale/core/SimpleCSSValuesImpl.as | 17 +++++-----
.../Express/src/main/resources/defaults.css | 8 -----
frameworks/royale-config-template.xml | 1 +
.../defaults.css => themes/Basic/basic.css} | 29 +++++++++++++++-
22 files changed, 92 insertions(+), 44 deletions(-)
copy frameworks/{projects/Testing/src/main/resources/defaults.css => themes/Basic/basic.css} (74%)
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 02/10: checkbox and radiobutton were not pcking up
styles correctly
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 146aa4c71491526f91bdf85d137c17469c2e5f01
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Feb 21 13:40:46 2018 -0800
checkbox and radiobutton were not pcking up styles correctly
---
.../src/main/royale/org/apache/royale/html/beads/CheckBoxView.as | 7 ++++++-
.../main/royale/org/apache/royale/html/beads/RadioButtonView.as | 5 +++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/CheckBoxView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/CheckBoxView.as
index 8d73420..b0547f4 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/CheckBoxView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/CheckBoxView.as
@@ -115,7 +115,12 @@ package org.apache.royale.html.beads
_toggleButtonModel.addEventListener("selectedChange", selectedChangeHandler);
if (_toggleButtonModel.text !== null)
text = _toggleButtonModel.text;
-
+ for each( var s:Sprite in sprites )
+ {
+ var tf:CSSTextField = s.getChildByName("textField") as CSSTextField;
+ tf.styleParent = value;
+ }
+
layoutControl();
var hitArea:Shape = new Shape();
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/RadioButtonView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/RadioButtonView.as
index 66a30cb..32abe85 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/RadioButtonView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/RadioButtonView.as
@@ -115,6 +115,11 @@ package org.apache.royale.html.beads
text = _toggleButtonModel.text;
if (_toggleButtonModel.html != null)
html = _toggleButtonModel.html;
+ for each( var s:Sprite in sprites )
+ {
+ var tf:CSSTextField = s.getChildByName("textField") as CSSTextField;
+ tf.styleParent = value;
+ }
layoutControl();
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 04/10: Express doesn't need * selector either
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 fff09e0a7c7c39ba6613ad2d95efab6ef4deecfd
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Feb 21 17:22:41 2018 -0800
Express doesn't need * selector either
---
frameworks/projects/Express/src/main/resources/defaults.css | 8 --------
1 file changed, 8 deletions(-)
diff --git a/frameworks/projects/Express/src/main/resources/defaults.css b/frameworks/projects/Express/src/main/resources/defaults.css
index 6f50bdc..a0e3ae1 100644
--- a/frameworks/projects/Express/src/main/resources/defaults.css
+++ b/frameworks/projects/Express/src/main/resources/defaults.css
@@ -19,14 +19,6 @@
@namespace "library://ns.apache.org/royale/express";
-/* Global style declaration */
-*
-{
- font-family: "Arial";
- font-size: 12px;
- border-width: 1px;
-}
-
.royale *, . royale *:before, . royale *:after {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 06/10: fix up styles after changing lookup
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 e7c3769b51a0a196b3b01fc790940766df0bed2e
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Feb 21 17:24:22 2018 -0800
fix up styles after changing lookup
---
frameworks/projects/Basic/src/main/resources/defaults.css | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css
index 2f67fa3..51b8c36 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -154,6 +154,7 @@ DataContainer
IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel");
border-style: solid;
border-color: #222222;
+ border-width: 1px;
}
/* ASJS */
@@ -743,7 +744,7 @@ global
global
{
font-size: 16px;
- border-width: 1px;
+ border-width: 4px;
}
Accordion {
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 01/10: remove * selector and use global as the
'browser defaults' for SWF side. Set default font-size to 16 and use serif
font to match FireFox,
Safari and Chrome. Set default control font size to 11px Arial to match
browsers as well
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 e1398bba9cb45aa4b368d231e74b82ac7df03189
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Feb 21 13:00:02 2018 -0800
remove * selector and use global as the 'browser defaults' for SWF side. Set default font-size to 16 and use serif font to match FireFox, Safari and Chrome. Set default control font size to 11px Arial to match browsers as well
---
.../projects/Basic/src/main/resources/defaults.css | 38 +++++++++++++++++-----
.../apache/royale/html/beads/DropDownListView.as | 3 ++
.../org/apache/royale/core/SimpleCSSValuesImpl.as | 24 ++++++++------
3 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css
index c3f05d4..2f67fa3 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -20,14 +20,6 @@
@namespace "library://ns.apache.org/royale/basic";
@namespace svg "library://ns.apache.org/royale/svg";
-/* Global style declaration */
-*
-{
- font-family: "Arial";
- font-size: 12px;
- border-width: 1px;
-}
-
.Application *, .royale *, . royale *:before, . royale *:after {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -746,6 +738,14 @@ global
@media -royale-swf
{
+ /* Global style declaration for Flash only. This will effectively be the same
+ as the browser defaults */
+ global
+ {
+ font-size: 16px;
+ border-width: 1px;
+ }
+
Accordion {
IContentView: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
}
@@ -779,12 +779,16 @@ global
{
IBeadModel: ClassReference("org.apache.royale.html.beads.models.ToggleButtonModel");
IBeadView: ClassReference("org.apache.royale.html.beads.CheckBoxView");
+ font-size: 11px;
+ font-family: Arial;
}
CSSCheckBox
{
IBeadModel: ClassReference("org.apache.royale.html.beads.models.ToggleButtonModel");
IBeadView: ClassReference("org.apache.royale.html.beads.CheckBoxView");
+ font-size: 11px;
+ font-family: Arial;
}
CloseButton
@@ -814,12 +818,16 @@ global
DataGrid {
IBackgroundBead: ClassReference("org.apache.royale.html.beads.SolidBackgroundBead");
IBorderBead: ClassReference("org.apache.royale.html.beads.SingleLineBorderBead");
+ font-size: 11px;
+ font-family: Arial;
}
DataContainer {
IBackgroundBead: ClassReference("org.apache.royale.html.beads.SolidBackgroundBead");
IBorderBead: ClassReference("org.apache.royale.html.beads.SingleLineBorderBead");
IContentView: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
+ font-size: 11px;
+ font-family: Arial;
}
DataGridButtonBar {
@@ -859,6 +867,8 @@ global
IBeadView: ClassReference("org.apache.royale.html.beads.DropDownListView");
IBeadController: ClassReference("org.apache.royale.html.beads.controllers.DropDownListController");
IPopUp: ClassReference("org.apache.royale.html.supportClasses.DropDownListList");
+ font-size: 11px;
+ font-family: Arial;
}
DropDownListList
@@ -875,6 +885,8 @@ global
border-color: #333333;
border-width: 1px;
background-color: #FFFFFF;
+ font-size: 11px;
+ font-family: Arial;
}
Group
@@ -912,6 +924,8 @@ global
iBorderBead: ClassReference('org.apache.royale.html.beads.SingleLineBorderBead');
iBorderModel: ClassReference('org.apache.royale.html.beads.models.SingleLineBorderModel');
IContentView: ClassReference("org.apache.royale.html.supportClasses.DataGroup");
+ font-size: 11px;
+ font-family: Arial;
}
MenuItemRenderer
@@ -951,6 +965,8 @@ global
{
IBeadModel: ClassReference("org.apache.royale.html.beads.models.ValueToggleButtonModel");
IBeadView: ClassReference("org.apache.royale.html.beads.RadioButtonView");
+ font-size: 11px;
+ font-family: Arial;
}
VScrollBar
@@ -1024,6 +1040,8 @@ global
border-color: #000000;
border-width: 1px;
background-color: #FFFFFF;
+ font-size: 11px;
+ font-family: Arial;
}
TextButton
@@ -1031,6 +1049,8 @@ global
IBeadModel: ClassReference("org.apache.royale.html.beads.models.TextModel");
IBeadView: ClassReference("org.apache.royale.html.beads.CSSTextButtonView");
iMeasurementBead: ClassReference("org.apache.royale.html.beads.TextButtonMeasurementBead");
+ font-size: 11px;
+ font-family: Arial;
}
Tree {
@@ -1056,6 +1076,8 @@ global
border-color: #000000;
border-width: 1px;
background-color: #FFFFFF;
+ font-size: 11px;
+ font-family: Arial;
}
TitleBar
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DropDownListView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DropDownListView.as
index 7ce266a..285ddd5 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DropDownListView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DropDownListView.as
@@ -122,6 +122,9 @@ package org.apache.royale.html.beads
shape.graphics.beginFill(0xCCCCCC);
shape.graphics.drawRect(0, 0, 10, 10);
shape.graphics.endFill();
+ upTextField.styleParent = _strand;
+ downTextField.styleParent = _strand;
+ overTextField.styleParent = _strand;
var button:SimpleButton = value as SimpleButton;
button.upState = upSprite;
button.downState = downSprite;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/SimpleCSSValuesImpl.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/SimpleCSSValuesImpl.as
index c3560bf..751af9d 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/SimpleCSSValuesImpl.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/SimpleCSSValuesImpl.as
@@ -408,6 +408,12 @@ package org.apache.royale.core
}
}
+ o = values["*"];
+ if (o !== undefined)
+ {
+ return o[valueName];
+ }
+
COMPILE::SWF
{
className = getQualifiedClassName(thisObject);
@@ -466,18 +472,16 @@ package org.apache.royale.core
return getValue(parentObject, valueName, state, attrs);
}
- o = values["global"];
- if (o !== undefined)
+ COMPILE::SWF
{
- value = o[valueName];
- if (value !== undefined)
- return value;
+ o = values["global"];
+ if (o !== undefined)
+ {
+ value = o[valueName];
+ if (value !== undefined)
+ return value;
+ }
}
- o = values["*"];
- if (o !== undefined)
- {
- return o[valueName];
- }
return undefined;
}
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 03/10: The browser defaults of serif and 16px are
undesirable and unexpected for migrating Flex users. Add a basic.css theme
with the type selectors that override browser defaults. More type selectors
might be needed as we scrub the examples
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 7337e94f827335555b474eff67712987cc6b7ea2
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Feb 21 13:52:05 2018 -0800
The browser defaults of serif and 16px are undesirable and unexpected for migrating Flex users. Add a basic.css theme with the type selectors that override browser defaults. More type selectors might be needed as we scrub the examples
---
frameworks/air-config-template.xml | 1 +
frameworks/flex-config-template.xml | 1 +
frameworks/royale-config-template.xml | 1 +
frameworks/themes/Basic/basic.css | 38 +++++++++++++++++++++++++++++++++++
4 files changed, 41 insertions(+)
diff --git a/frameworks/air-config-template.xml b/frameworks/air-config-template.xml
index 0faa5d5..a58d503 100644
--- a/frameworks/air-config-template.xml
+++ b/frameworks/air-config-template.xml
@@ -283,6 +283,7 @@
<!-- List of CSS or SWC files to apply as a theme. -->
<!-- not set -->
<theme>
+ <filename>themes/Basic/basic.css</filename>
</theme>
<!-- Turns on the display of stack traces for uncaught runtime errors. -->
diff --git a/frameworks/flex-config-template.xml b/frameworks/flex-config-template.xml
index 38bfeab..0b49886 100644
--- a/frameworks/flex-config-template.xml
+++ b/frameworks/flex-config-template.xml
@@ -317,6 +317,7 @@
<!-- List of CSS or SWC files to apply as a theme. -->
<theme>
+ <filename>themes/Basic/basic.css</filename>
</theme>
<!-- Turns on the display of stack traces for uncaught runtime errors. -->
diff --git a/frameworks/royale-config-template.xml b/frameworks/royale-config-template.xml
index 2fcdbe2..42bc3a8 100644
--- a/frameworks/royale-config-template.xml
+++ b/frameworks/royale-config-template.xml
@@ -317,6 +317,7 @@
<!-- List of CSS or SWC files to apply as a theme. -->
<theme>
+ <filename>themes/Basic/basic.css</filename>
</theme>
<!-- Turns on the display of stack traces for uncaught runtime errors. -->
diff --git a/frameworks/themes/Basic/basic.css b/frameworks/themes/Basic/basic.css
new file mode 100644
index 0000000..05f06cb
--- /dev/null
+++ b/frameworks/themes/Basic/basic.css
@@ -0,0 +1,38 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+@namespace "library://ns.apache.org/royale/basic";
+
+CheckBox
+{
+ font-size: 12px;
+ font-family: sans-serif;
+}
+
+Label
+{
+ font-size: 12px;
+ font-family: sans-serif;
+}
+
+RadioButton
+{
+ font-size: 12px;
+ font-family: sans-serif;
+}
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 08/10: need more typenames in order to set defaults
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 859cce688e37353c41a2d9d1e9717145cb7ac210
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Feb 21 17:26:08 2018 -0800
need more typenames in order to set defaults
---
.../Basic/src/main/royale/org/apache/royale/html/DataContainer.as | 1 +
.../royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as | 1 +
2 files changed, 2 insertions(+)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
index bb5707e..7259f84 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
@@ -87,6 +87,7 @@ package org.apache.royale.html
public function DataContainer()
{
super();
+ typeNames = "DataContainer";
}
/**
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
index 8d75804..d4748f3 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
@@ -49,6 +49,7 @@ package org.apache.royale.html.supportClasses
public function MXMLItemRenderer()
{
super();
+ typeNames = "MXMLItemRenderer";
}
[Bindable("dataChange")]
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 07/10: need more typeselectors to get default font in
most places. We don't really want to inherit a font family from application
in case other component sets are being mixed in
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 0271a9a74e44eb2b5460464aa87f5e8a5ee1b05b
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Feb 21 17:25:46 2018 -0800
need more typeselectors to get default font in most places. We don't really want to inherit a font family from application in case other component sets are being mixed in
---
frameworks/themes/Basic/basic.css | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/frameworks/themes/Basic/basic.css b/frameworks/themes/Basic/basic.css
index 05f06cb..5b5d3ee 100644
--- a/frameworks/themes/Basic/basic.css
+++ b/frameworks/themes/Basic/basic.css
@@ -36,3 +36,15 @@ RadioButton
font-size: 12px;
font-family: sans-serif;
}
+
+StringItemRenderer
+{
+ font-size: 12px;
+ font-family: sans-serif;
+}
+
+MXMLItemRenderer
+{
+ font-size: 12px;
+ font-family: sans-serif;
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 05/10: fix lookup
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 2e1c8c0509ef0caaae33af2be66ef4ced10eda58
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Feb 21 17:23:26 2018 -0800
fix lookup
---
.../royale/org/apache/royale/core/SimpleCSSValuesImpl.as | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/SimpleCSSValuesImpl.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/SimpleCSSValuesImpl.as
index 751af9d..fc094de 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/SimpleCSSValuesImpl.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/SimpleCSSValuesImpl.as
@@ -411,7 +411,9 @@ package org.apache.royale.core
o = values["*"];
if (o !== undefined)
{
- return o[valueName];
+ value = o[valueName];
+ if (value !== undefined)
+ return value;
}
COMPILE::SWF
@@ -472,15 +474,10 @@ package org.apache.royale.core
return getValue(parentObject, valueName, state, attrs);
}
- COMPILE::SWF
+ o = values["global"];
+ if (o !== undefined)
{
- o = values["global"];
- if (o !== undefined)
- {
- value = o[valueName];
- if (value !== undefined)
- return value;
- }
+ return o[valueName];
}
return undefined;
}
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 10/10: remove exclude-defaults-css. Shouldn't be
needed anymore after we took out the * selector
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 306bf9bb684db56baee71bdbd97f71550790215d
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Feb 21 17:27:29 2018 -0800
remove exclude-defaults-css. Shouldn't be needed anymore after we took out the * selector
---
examples/royale/MDLDynamicTableExample/pom.xml | 1 -
examples/royale/MDLDynamicTabsExample/pom.xml | 1 -
examples/royale/RemoteObjectAMFTest/build.xml | 3 +--
examples/royale/RemoteObjectAMFTest/pom.xml | 2 --
examples/royale/RoyaleTeamPage_MDL/pom.xml | 1 -
.../royale/RoyaleTeamPage_MDL/src/main/config/compile-app-config.xml | 5 -----
examples/royale/RoyaleWebsite/pom.xml | 1 -
examples/royale/RoyaleWebsite/src/main/config/compile-app-config.xml | 4 ----
8 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/examples/royale/MDLDynamicTableExample/pom.xml b/examples/royale/MDLDynamicTableExample/pom.xml
index 7ea0e98..a07fd92 100644
--- a/examples/royale/MDLDynamicTableExample/pom.xml
+++ b/examples/royale/MDLDynamicTableExample/pom.xml
@@ -55,7 +55,6 @@
<mainClass>MDLDynamicTableExample.mxml</mainClass>
<targets>JSRoyale</targets>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html</htmlTemplate>
- <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-${royale.framework.version}-js.swc:defaults.css</additionalCompilerOptions>
</configuration>
</plugin>
</plugins>
diff --git a/examples/royale/MDLDynamicTabsExample/pom.xml b/examples/royale/MDLDynamicTabsExample/pom.xml
index 37da876..afe8026 100644
--- a/examples/royale/MDLDynamicTabsExample/pom.xml
+++ b/examples/royale/MDLDynamicTabsExample/pom.xml
@@ -50,7 +50,6 @@
<targets>JSRoyale</targets>
<removeCirculars>true</removeCirculars>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html</htmlTemplate>
- <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-${royale.framework.version}-js.swc:defaults.css</additionalCompilerOptions>
</configuration>
</plugin>
</plugins>
diff --git a/examples/royale/RemoteObjectAMFTest/build.xml b/examples/royale/RemoteObjectAMFTest/build.xml
index efa5e54..64adeeb 100644
--- a/examples/royale/RemoteObjectAMFTest/build.xml
+++ b/examples/royale/RemoteObjectAMFTest/build.xml
@@ -27,8 +27,7 @@
<property environment="env"/>
<property file="${ROYALE_HOME}/build.properties"/>
<property name="ROYALE_HOME" value="${ROYALE_HOME}"/>
- <property name="opt1_arg" value="-compiler.exclude-defaults-css-files=HTML.swc:defaults.css" />
- <property name="opt2_arg" value="-html-template=${basedir}/src/main/resources/mdl-js-index-template.html" />
+ <property name="opt1_arg" value="-html-template=${basedir}/src/main/resources/mdl-js-index-template.html" />
<include file="${basedir}/../../build_example.xml" />
diff --git a/examples/royale/RemoteObjectAMFTest/pom.xml b/examples/royale/RemoteObjectAMFTest/pom.xml
index 366d873..610eb24 100644
--- a/examples/royale/RemoteObjectAMFTest/pom.xml
+++ b/examples/royale/RemoteObjectAMFTest/pom.xml
@@ -54,8 +54,6 @@
<configuration>
<mainClass>App.mxml</mainClass>
<targets>SWF,JSRoyale</targets>
- <!--<htmlTemplate>${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html</htmlTemplate>-->
- <!--<additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-${royale.framework.version}.swc:defaults.css</additionalCompilerOptions>-->
</configuration>
</plugin>
<plugin>
diff --git a/examples/royale/RoyaleTeamPage_MDL/pom.xml b/examples/royale/RoyaleTeamPage_MDL/pom.xml
index afa6396..aaa53df 100644
--- a/examples/royale/RoyaleTeamPage_MDL/pom.xml
+++ b/examples/royale/RoyaleTeamPage_MDL/pom.xml
@@ -55,7 +55,6 @@
<mainClass>App.mxml</mainClass>
<targets>JSRoyale</targets>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html</htmlTemplate>
- <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-${royale.framework.version}-js.swc:defaults.css</additionalCompilerOptions>
</configuration>
</plugin>
</plugins>
diff --git a/examples/royale/RoyaleTeamPage_MDL/src/main/config/compile-app-config.xml b/examples/royale/RoyaleTeamPage_MDL/src/main/config/compile-app-config.xml
index db5d641..7baec50 100644
--- a/examples/royale/RoyaleTeamPage_MDL/src/main/config/compile-app-config.xml
+++ b/examples/royale/RoyaleTeamPage_MDL/src/main/config/compile-app-config.xml
@@ -17,10 +17,5 @@
-->
<royale-config>
- <compiler>
- <exclude-defaults-css-files>
- <filename>HTML.swc:defaults.css</filename>
- </exclude-defaults-css-files>
- </compiler>
<html-template>../resources/mdl-js-index-template.html</html-template>
</royale-config>
diff --git a/examples/royale/RoyaleWebsite/pom.xml b/examples/royale/RoyaleWebsite/pom.xml
index 62505a0..0e98257 100644
--- a/examples/royale/RoyaleWebsite/pom.xml
+++ b/examples/royale/RoyaleWebsite/pom.xml
@@ -55,7 +55,6 @@
<mainClass>RoyaleWebsite.mxml</mainClass>
<targets>JSRoyale</targets>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/royale-index-template.html</htmlTemplate>
- <additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-${royale.framework.version}-SNAPSHOT-js.swc:defaults.css</additionalCompilerOptions>
</configuration>
</plugin>
</plugins>
diff --git a/examples/royale/RoyaleWebsite/src/main/config/compile-app-config.xml b/examples/royale/RoyaleWebsite/src/main/config/compile-app-config.xml
index fecd735..0e5ca47 100644
--- a/examples/royale/RoyaleWebsite/src/main/config/compile-app-config.xml
+++ b/examples/royale/RoyaleWebsite/src/main/config/compile-app-config.xml
@@ -19,10 +19,6 @@
<royale-config>
<compiler>
<targets><target>JSRoyale</target></targets>
- <exclude-defaults-css-files>
- <filename>BasicJS.swc:defaults.css</filename>
- <filename>Basic.swc:defaults.css</filename>
- </exclude-defaults-css-files>
</compiler>
<html-template>../resources/royale-index-template.html</html-template>
</royale-config>
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.
[royale-asjs] 09/10: fix up ASDOc after style lookup changes
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 d92ca0fcca4494cf7da72329243db6cc32dae295
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Feb 21 17:26:40 2018 -0800
fix up ASDOc after style lookup changes
---
examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml | 3 +++
examples/royale/ASDoc/src/main/royale/AttributeRenderer.as | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml b/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml
index a043933..9c1c986 100644
--- a/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml
+++ b/examples/royale/ASDoc/src/main/royale/ASDocMainView.mxml
@@ -253,6 +253,8 @@ limitations under the License.
.description {
margin-top: 10px;
margin-bottom: 10px;
+ font-family: sans-serif;
+ font-size: 12px;
}
.attributeCaption {
@@ -289,6 +291,7 @@ limitations under the License.
padding-left: 20px;
padding-right: 10px;
padding-bottom: 20px;
+ border-width: 1px;
border-bottom-style: solid;
}
.propertyQName {
diff --git a/examples/royale/ASDoc/src/main/royale/AttributeRenderer.as b/examples/royale/ASDoc/src/main/royale/AttributeRenderer.as
index 4739506..262e695 100644
--- a/examples/royale/ASDoc/src/main/royale/AttributeRenderer.as
+++ b/examples/royale/ASDoc/src/main/royale/AttributeRenderer.as
@@ -40,7 +40,7 @@ import org.apache.royale.html.supportClasses.StringItemRenderer;
*/
public function AttributeRenderer()
{
- typeNames = "AttributeRenderer"
+ typeNames += " AttributeRenderer"
}
override public function set text(value:String):void
--
To stop receiving notification emails like this one, please contact
aharui@apache.org.