This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 152a436 jewel: code cleaning and change content selection ifs to
ternary operators
152a436 is described below
commit 152a436a4ae0124f5e53e319bb9bceb445bb6fc9
Author: Carlos Rovira <[email protected]>
AuthorDate: Fri Apr 5 12:08:03 2019 +0200
jewel: code cleaning and change content selection ifs to ternary operators
---
.../apache/royale/jewel/ApplicationMainContent.as | 21 ++++++---------------
.../org/apache/royale/jewel/SectionContent.as | 9 ++++-----
.../royale/org/apache/royale/jewel/TabBarContent.as | 17 ++++-------------
.../royale/org/apache/royale/jewel/WizardContent.as | 10 +---------
4 files changed, 15 insertions(+), 42 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as
index fcea27e..1fdfad9 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as
@@ -18,13 +18,12 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
- import org.apache.royale.jewel.supportClasses.ISelectableContent;
-
COMPILE::JS
{
- import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.html.util.addElementToWrapper;
+ import org.apache.royale.core.WrappedHTMLElement;
+ import org.apache.royale.html.util.addElementToWrapper;
}
+ import org.apache.royale.jewel.supportClasses.ISelectableContent;
/**
* The ApplicationMainContent class is a Container component capable
of parenting
@@ -77,7 +76,7 @@ package org.apache.royale.jewel
COMPILE::JS
{
- toggleClass("has-topappbar", _hasTopAppBar);
+ toggleClass("has-topappbar", _hasTopAppBar);
}
}
}
@@ -106,7 +105,7 @@ package org.apache.royale.jewel
COMPILE::JS
{
- toggleClass("has-footerbar", _hasFooterBar);
+ toggleClass("has-footerbar", _hasFooterBar);
}
}
}
@@ -143,15 +142,7 @@ package org.apache.royale.jewel
for (var i:int = 0; i < numElements; i++)
{
var content:ISelectableContent =
getElementAt(i) as ISelectableContent;
-
- if(content.name == _selectedContent)
- {
- content.isSelected = true;
- }
- else
- {
- content.isSelected = false;
- }
+ content.isSelected = content.name ==
_selectedContent ? true : false;
}
}
catch (error:Error)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SectionContent.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SectionContent.as
index 8676950..409128b 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SectionContent.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SectionContent.as
@@ -18,14 +18,13 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
- import org.apache.royale.jewel.supportClasses.ISelectableContent;
-
COMPILE::JS
{
- import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.html.util.addElementToWrapper;
+ import org.apache.royale.core.WrappedHTMLElement;
+ import org.apache.royale.html.util.addElementToWrapper;
}
-
+ import org.apache.royale.jewel.supportClasses.ISelectableContent;
+
/**
* The SectionContent class is a Container component capable of
parenting other
* components. This class is used along with Tabs to separate content
and
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBarContent.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBarContent.as
index 7359542..5bbfb93 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBarContent.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBarContent.as
@@ -18,13 +18,12 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
- import org.apache.royale.jewel.supportClasses.ISelectableContent;
-
COMPILE::JS
{
- import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.html.util.addElementToWrapper;
+ import org.apache.royale.core.WrappedHTMLElement;
+ import org.apache.royale.html.util.addElementToWrapper;
}
+ import org.apache.royale.jewel.supportClasses.ISelectableContent;
/**
* The TabBarContent class is a Container component capable of
parenting
@@ -85,15 +84,7 @@ package org.apache.royale.jewel
for (var i:int = 0; i < numElements; i++)
{
var content:ISelectableContent =
getElementAt(i) as ISelectableContent;
-
- if(content.name == _selectedContent)
- {
- content.isSelected = true;
- }
- else
- {
- content.isSelected = false;
- }
+ content.isSelected = content.name ==
_selectedContent ? true : false;
}
}
catch (error:Error)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardContent.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardContent.as
index ea240d4..987fe69 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardContent.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/WizardContent.as
@@ -85,15 +85,7 @@ package org.apache.royale.jewel
for (var i:int = 0; i < numElements; i++)
{
var content:ISelectableContent =
getElementAt(i) as ISelectableContent;
-
- if(content.name == _selectedContent)
- {
- content.isSelected = true;
- }
- else
- {
- content.isSelected = false;
- }
+ content.isSelected = content.name ==
_selectedContent ? true : false;
}
}
catch (error:Error)
