You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2019/12/14 17:14:09 UTC
[royale-asjs] branch develop updated: jewel: remove duplicated
"getLabelFromData" bead from Basic
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 991c714 jewel: remove duplicated "getLabelFromData" bead from Basic
991c714 is described below
commit 991c714ac59b1763dbc8e6fd1b05e3f8f36241b8
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sat Dec 14 18:13:56 2019 +0100
jewel: remove duplicated "getLabelFromData" bead from Basic
---
.../controls/textinput/SearchFilterForList.as | 2 +-
.../royale/jewel/beads/views/ComboBoxView.as | 21 ++++++----
.../CollapsibleNavigationSectionRenderer.as | 1 -
.../royale/jewel/itemRenderers/ListItemRenderer.as | 2 +-
.../itemRenderers/NavigationLinkItemRenderer.as | 2 -
.../jewel/itemRenderers/StringItemRenderer.as | 2 +-
...tonInidicatorRestrictedToContentItemRenderer.as | 4 --
.../itemRenderers/TabBarButtonItemRenderer.as | 2 +-
.../jewel/supportClasses/util/getLabelFromData.as | 49 ----------------------
9 files changed, 16 insertions(+), 69 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as
index 9c3594b..92c45e9 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as
@@ -23,10 +23,10 @@ package org.apache.royale.jewel.beads.controls.textinput
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.KeyboardEvent;
+ import org.apache.royale.html.util.getLabelFromData;
import org.apache.royale.jewel.List;
import org.apache.royale.jewel.itemRenderers.ListItemRenderer;
import org.apache.royale.jewel.supportClasses.textinput.TextInputBase;
- import org.apache.royale.jewel.supportClasses.util.getLabelFromData;
/**
* The SearchFilterForList bead class is a specialty bead that can be used with
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as
index 502c34b..6ee2910 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as
@@ -20,8 +20,16 @@ package org.apache.royale.jewel.beads.views
{
COMPILE::SWF
{
- import flash.utils.setTimeout;
+ import flash.utils.setTimeout;
}
+ COMPILE::JS
+ {
+ import org.apache.royale.geom.Point;
+ import org.apache.royale.jewel.supportClasses.ResponsiveSizes;
+ import org.apache.royale.jewel.supportClasses.util.positionInsideBoundingClientRect;
+ import org.apache.royale.utils.BrowserInfo;
+ import org.apache.royale.utils.PointUtils;
+ }
import org.apache.royale.core.BeadViewBase;
import org.apache.royale.core.IComboBoxModel;
import org.apache.royale.core.IPopUpHost;
@@ -31,18 +39,13 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.geom.Point;
- import org.apache.royale.jewel.beads.controls.combobox.IComboBoxView;
- import org.apache.royale.jewel.beads.models.IJewelSelectionModel;
+ import org.apache.royale.html.util.getLabelFromData;
import org.apache.royale.jewel.Button;
import org.apache.royale.jewel.List;
import org.apache.royale.jewel.TextInput;
- import org.apache.royale.jewel.supportClasses.util.getLabelFromData;
+ import org.apache.royale.jewel.beads.controls.combobox.IComboBoxView;
+ import org.apache.royale.jewel.beads.models.IJewelSelectionModel;
import org.apache.royale.jewel.supportClasses.combobox.ComboBoxPopUp;
- import org.apache.royale.jewel.supportClasses.ResponsiveSizes;
- import org.apache.royale.jewel.supportClasses.util.positionInsideBoundingClientRect;
- import org.apache.royale.utils.BrowserInfo;
- import org.apache.royale.utils.PointUtils;
import org.apache.royale.utils.UIUtils;
/**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/CollapsibleNavigationSectionRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/CollapsibleNavigationSectionRenderer.as
index 672bc50..32d3f74 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/CollapsibleNavigationSectionRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/CollapsibleNavigationSectionRenderer.as
@@ -23,7 +23,6 @@ package org.apache.royale.jewel.itemRenderers
import org.apache.royale.core.WrappedHTMLElement;
import org.apache.royale.html.util.addElementToWrapper;
}
-
import org.apache.royale.collections.IArrayList;
import org.apache.royale.core.StyledMXMLItemRenderer;
import org.apache.royale.events.Event;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as
index bfd352d..23b2d7e 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as
@@ -25,10 +25,10 @@ package org.apache.royale.jewel.itemRenderers
}
import org.apache.royale.core.StyledMXMLItemRenderer;
import org.apache.royale.events.Event;
+ import org.apache.royale.html.util.getLabelFromData;
import org.apache.royale.jewel.beads.controls.TextAlign;
import org.apache.royale.jewel.beads.itemRenderers.IAlignItemRenderer;
import org.apache.royale.jewel.beads.itemRenderers.ITextItemRenderer;
- import org.apache.royale.jewel.supportClasses.util.getLabelFromData;
/**
* The ListItemRenderer defines the basic Item Renderer for a Jewel List Component.
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as
index 2f5e55c..86f478c 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as
@@ -24,8 +24,6 @@ package org.apache.royale.jewel.itemRenderers
import org.apache.royale.html.util.addElementToWrapper;
}
import org.apache.royale.core.StyledMXMLItemRenderer;
- import org.apache.royale.events.Event;
- import org.apache.royale.jewel.beads.controls.TextAlign;
import org.apache.royale.jewel.supportClasses.INavigationRenderer;
/**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/StringItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/StringItemRenderer.as
index d0c612c..553317b 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/StringItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/StringItemRenderer.as
@@ -31,10 +31,10 @@ package org.apache.royale.jewel.itemRenderers
import org.apache.royale.html.util.addElementToWrapper;
}
import org.apache.royale.html.supportClasses.DataItemRenderer;
+ import org.apache.royale.html.util.getLabelFromData;
import org.apache.royale.jewel.beads.controls.TextAlign;
import org.apache.royale.jewel.beads.itemRenderers.IAlignItemRenderer;
import org.apache.royale.jewel.beads.itemRenderers.ITextItemRenderer;
- import org.apache.royale.jewel.supportClasses.util.getLabelFromData;
/**
* The StringItemRenderer class displays data in string form using the data's toString()
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonInidicatorRestrictedToContentItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonInidicatorRestrictedToContentItemRenderer.as
index 1d37100..5bfa324 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonInidicatorRestrictedToContentItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonInidicatorRestrictedToContentItemRenderer.as
@@ -23,10 +23,6 @@ package org.apache.royale.jewel.itemRenderers
import org.apache.royale.core.WrappedHTMLElement;
import org.apache.royale.html.util.addElementToWrapper;
}
- import org.apache.royale.core.StyledMXMLItemRenderer;
- import org.apache.royale.events.Event;
- import org.apache.royale.jewel.supportClasses.INavigationRenderer;
- import org.apache.royale.jewel.supportClasses.util.getLabelFromData;
/**
* The TabBarButtonInidicatorRestrictedToContentItemRenderer
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonItemRenderer.as
index aeaeb82..adb2652 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonItemRenderer.as
@@ -25,8 +25,8 @@ package org.apache.royale.jewel.itemRenderers
}
import org.apache.royale.core.StyledMXMLItemRenderer;
import org.apache.royale.events.Event;
+ import org.apache.royale.html.util.getLabelFromData;
import org.apache.royale.jewel.supportClasses.INavigationRenderer;
- import org.apache.royale.jewel.supportClasses.util.getLabelFromData;
/**
* The TabBarButtonItemRenderer defines the basic Item Renderer for a Jewel
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/util/getLabelFromData.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/util/getLabelFromData.as
deleted file mode 100644
index a9d18d6..0000000
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/util/getLabelFromData.as
+++ /dev/null
@@ -1,49 +0,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 "Licens"); 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.jewel.supportClasses.util
-{
- /**
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- *
- * Utility function to get a label string from a value object
- */
- public function getLabelFromData(obj:Object, data:Object):String
- {
- // slightly more code, but we bail early if it's a string which is often
- if(!data) return "";
-
- if (!(data is String))
- {
- if (obj["labelField"])
- return String(data[obj["labelField"]]);
-
- if (obj["dataField"])
- return String(data[obj["dataField"]]);
-
- if ("label" in data)
- return String(data["label"]);
- }
-
- return String(data);
-
- }
-}