This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a commit to branch color_picker
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/color_picker by this push:
new 5a57db8 Rename SwatchList to ColorPalette
5a57db8 is described below
commit 5a57db854463285ab5408cd67e9f7c6a1373266f
Author: DESKTOP-RH4S838\Yishay <[email protected]>
AuthorDate: Sun May 5 17:18:16 2019 +0300
Rename SwatchList to ColorPalette
---
frameworks/projects/Basic/src/main/resources/basic-manifest.xml | 2 +-
frameworks/projects/Basic/src/main/resources/defaults.css | 2 +-
.../royale/html/supportClasses/{SwatchList.as => ColorPalette.as} | 6 +++---
.../org/apache/royale/html/supportClasses/ColorPickerPopUp.as | 2 +-
.../royale/html/supportClasses/ColorPickerPopUpWithPalette.as | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index 8fd129c..960d772 100644
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@ -48,7 +48,7 @@
<component id="DynamicList" class="org.apache.royale.html.DynamicList"/>
<component id="PopUpList" class="org.apache.royale.html.PopUpList"/>
<component id="SimpleList" class="org.apache.royale.html.SimpleList"/>
- <component id="SwatchList"
class="org.apache.royale.html.supportClasses.SwatchList"/>
+ <component id="ColorPalette"
class="org.apache.royale.html.supportClasses.ColorPalette"/>
<component id="ColorSpectrum"
class="org.apache.royale.html.supportClasses.ColorSpectrum"/>
<component id="ColorPicker" class="org.apache.royale.html.ColorPicker"/>
<component id="HueSelector" class="org.apache.royale.html.HueSelector"/>
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css
b/frameworks/projects/Basic/src/main/resources/defaults.css
index 03effc8..967a39d 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -588,7 +588,7 @@ SimpleList
IViewportModel:
ClassReference("org.apache.royale.html.beads.models.ViewportModel");
}
-SwatchList
+ColorPalette
{
IBeadModel:
ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel");
IBeadView: ClassReference("org.apache.royale.html.beads.ListView");
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/SwatchList.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorPalette.as
similarity index 89%
rename from
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/SwatchList.as
rename to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorPalette.as
index 997d5b7..7047438 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/SwatchList.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorPalette.as
@@ -21,7 +21,7 @@ package org.apache.royale.html.supportClasses
import org.apache.royale.html.List;
/**
- * The SwatchList class is use in a ColorPicker. It contains a list of
predefined colors.
+ * The ColorPalette class is used in a ColorPicker. It contains a list
of predefined colors.
*
*
* @toplevel
@@ -30,7 +30,7 @@ package org.apache.royale.html.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.9.6
*/
- public class SwatchList extends List
+ public class ColorPalette extends List
{
/**
* constructor.
@@ -40,7 +40,7 @@ package org.apache.royale.html.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.9.6
*/
- public function SwatchList()
+ public function ColorPalette()
{
super();
}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorPickerPopUp.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorPickerPopUp.as
index b312ca5..d4c3d7b 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorPickerPopUp.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorPickerPopUp.as
@@ -55,7 +55,7 @@ package org.apache.royale.html.supportClasses
colorSpectrum = new ColorSpectrum();
colorSpectrum.height = 300;
colorSpectrum.width = 300;
- hueSelector = new HueSelector;
+ hueSelector = new HueSelector();
hueSelector.width = 20;
hueSelector.height = 280;
hueSelector.x = 310;
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorPickerPopUpWithPalette.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorPickerPopUpWithPalette.as
index 335e65e..4c9273c 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorPickerPopUpWithPalette.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ColorPickerPopUpWithPalette.as
@@ -39,7 +39,7 @@ package org.apache.royale.html.supportClasses
*/
public class ColorPickerPopUpWithPalette extends ColorPickerPopUp
{
- protected var colorPalette:SwatchList;
+ protected var colorPalette:ColorPalette;
/**
* constructor.
*
@@ -51,7 +51,7 @@ package org.apache.royale.html.supportClasses
public function ColorPickerPopUpWithPalette()
{
super();
- colorPalette = new SwatchList();
+ colorPalette = new ColorPalette();
COMPILE::JS
{
colorPalette.element.style.position =
"absolute";
