From 86f74e90f6629209294621599b12010af6b0c641 Mon Sep 17 00:00:00 2001 From: Justin Mclean Date: Wed, 18 Oct 2017 18:22:06 +1100 Subject: [PATCH 1/7] When changing minimum or maximum checks that value is not out of range. Fixes #37 --- .../org/apache/royale/html/beads/models/RangeModel.as | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as index 0dbdd1213b..a12fdda084 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as @@ -87,6 +87,10 @@ package org.apache.royale.html.beads.models _maximum = value; dispatchEvent(new Event("maximumChange")); } + if (this.value > _maximum) + { + this.value = _maximum; + } } private var _minimum:Number = 0; @@ -113,6 +117,10 @@ package org.apache.royale.html.beads.models _minimum = value; dispatchEvent(new Event("minimumChange")); } + if (this.value < _minimum) + { + this.value = _minimum; + } } private var _snapInterval:Number = 1; From 2ec53044ddfaa4e4bbc09295c0fe47c6b6c31124 Mon Sep 17 00:00:00 2001 From: Justin Mclean Date: Wed, 25 Oct 2017 17:30:32 +1100 Subject: [PATCH 2/7] undo change to make clean pull request --- .../org/apache/royale/html/beads/models/RangeModel.as | 8 -------- 1 file changed, 8 deletions(-) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as index a12fdda084..0dbdd1213b 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as @@ -87,10 +87,6 @@ package org.apache.royale.html.beads.models _maximum = value; dispatchEvent(new Event("maximumChange")); } - if (this.value > _maximum) - { - this.value = _maximum; - } } private var _minimum:Number = 0; @@ -117,10 +113,6 @@ package org.apache.royale.html.beads.models _minimum = value; dispatchEvent(new Event("minimumChange")); } - if (this.value < _minimum) - { - this.value = _minimum; - } } private var _snapInterval:Number = 1; From 601bbd57a8fdc5c9c844fc8770812c1c58eb4e72 Mon Sep 17 00:00:00 2001 From: Justin Mclean Date: Wed, 25 Oct 2017 17:36:12 +1100 Subject: [PATCH 3/7] Revert "undo change to make clean pull request" This reverts commit 2ec53044ddfaa4e4bbc09295c0fe47c6b6c31124. --- .../org/apache/royale/html/beads/models/RangeModel.as | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as index 0dbdd1213b..a12fdda084 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as @@ -87,6 +87,10 @@ package org.apache.royale.html.beads.models _maximum = value; dispatchEvent(new Event("maximumChange")); } + if (this.value > _maximum) + { + this.value = _maximum; + } } private var _minimum:Number = 0; @@ -113,6 +117,10 @@ package org.apache.royale.html.beads.models _minimum = value; dispatchEvent(new Event("minimumChange")); } + if (this.value < _minimum) + { + this.value = _minimum; + } } private var _snapInterval:Number = 1; From a25fe2ffaa5e24164be618ce33c5869c12926d88 Mon Sep 17 00:00:00 2001 From: Justin Mclean Date: Wed, 25 Oct 2017 18:20:51 +1100 Subject: [PATCH 4/7] undo changes so that can be put into a branch --- .../apache/royale/html/accessories/DateFormatMMDDYYYYBead.as | 2 +- .../apache/royale/html/accessories/DateFormatYYYYMMDDBead.as | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/projects/Formatters/src/main/royale/org/apache/royale/html/accessories/DateFormatMMDDYYYYBead.as b/frameworks/projects/Formatters/src/main/royale/org/apache/royale/html/accessories/DateFormatMMDDYYYYBead.as index 0d3c7e9637..a570c551f7 100644 --- a/frameworks/projects/Formatters/src/main/royale/org/apache/royale/html/accessories/DateFormatMMDDYYYYBead.as +++ b/frameworks/projects/Formatters/src/main/royale/org/apache/royale/html/accessories/DateFormatMMDDYYYYBead.as @@ -21,7 +21,7 @@ package org.apache.royale.html.accessories import org.apache.royale.html.accessories.SimpleDateFormatBead; /** - * The DateFormatBead class formats the display of a DateField using MM/DD/YYYY format. + * The DateFormatBead class formats the display of a DateField using DD/MM/YYYY format. * * @langversion 3.0 * @playerversion Flash 10.2 diff --git a/frameworks/projects/Formatters/src/main/royale/org/apache/royale/html/accessories/DateFormatYYYYMMDDBead.as b/frameworks/projects/Formatters/src/main/royale/org/apache/royale/html/accessories/DateFormatYYYYMMDDBead.as index 7a2eb430da..6697ea238f 100644 --- a/frameworks/projects/Formatters/src/main/royale/org/apache/royale/html/accessories/DateFormatYYYYMMDDBead.as +++ b/frameworks/projects/Formatters/src/main/royale/org/apache/royale/html/accessories/DateFormatYYYYMMDDBead.as @@ -21,7 +21,7 @@ package org.apache.royale.html.accessories import org.apache.royale.html.accessories.SimpleDateFormatBead; /** - * The DateFormatBead class formats the display of a DateField using YYYY-MM-DD format. + * The DateFormatBead class formats the display of a DateField using MM/DD/YYYY format. * * @langversion 3.0 * @playerversion Flash 10.2 From 97c758a31c14254e76a75247a76addf43a6e5b73 Mon Sep 17 00:00:00 2001 From: Justin Mclean Date: Fri, 27 Oct 2017 18:04:42 +1100 Subject: [PATCH 5/7] remove hard coded colours --- .../html/supportClasses/DataItemRenderer.as | 40 ++++++++++++++++++- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as index 356a3aed27..118efc8027 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as @@ -56,6 +56,8 @@ package org.apache.royale.html.supportClasses } private var _columnIndex:int; + private var _selectedColor:uint = 0x9C9C9C; + private var _hoverColor:uint = 0xECECEC; /** * The index of the column the itemRenderer represents. @@ -74,6 +76,40 @@ package org.apache.royale.html.supportClasses _columnIndex = value; } + /** + * The selected colour. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion Royale 0.9 + */ + public function get selectedColor():uint + { + return _selectedColor; + } + public function set selectedColor(value:uint):void + { + _selectedColor = value; + } + + /** + * The hover colour. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion Royale 0.9 + */ + public function get hoverColor():uint + { + return _hoverColor; + } + public function set hoverColor(value:uint):void + { + _hoverColor = value; + } + private var _rowIndex:int; /** @@ -133,9 +169,9 @@ package org.apache.royale.html.supportClasses COMPILE::JS { if (selected) - element.style.backgroundColor = '#9C9C9C'; + element.style.backgroundColor = "#" + selectedColor.toString(16); else if (hovered) - element.style.backgroundColor = '#ECECEC'; + element.style.backgroundColor = "#" + hoverColor.toString(16); else element.style.backgroundColor = null; } From 6da471c5bc88d19e9887f8ba936004189bb8958b Mon Sep 17 00:00:00 2001 From: Justin Mclean Date: Sat, 28 Oct 2017 18:55:58 +1100 Subject: [PATCH 6/7] Update RangeModel.as --- .../org/apache/royale/html/beads/models/RangeModel.as | 8 -------- 1 file changed, 8 deletions(-) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as index a12fdda084..0dbdd1213b 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/RangeModel.as @@ -87,10 +87,6 @@ package org.apache.royale.html.beads.models _maximum = value; dispatchEvent(new Event("maximumChange")); } - if (this.value > _maximum) - { - this.value = _maximum; - } } private var _minimum:Number = 0; @@ -117,10 +113,6 @@ package org.apache.royale.html.beads.models _minimum = value; dispatchEvent(new Event("minimumChange")); } - if (this.value < _minimum) - { - this.value = _minimum; - } } private var _snapInterval:Number = 1; From da4667ab12c4967abd656b57810033eb6bd97ef0 Mon Sep 17 00:00:00 2001 From: Justin Mclean Date: Sat, 28 Oct 2017 18:56:15 +1100 Subject: [PATCH 7/7] Update DateFormatMMDDYYYYBead.as --- .../apache/royale/html/accessories/DateFormatMMDDYYYYBead.as | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/projects/Formatters/src/main/royale/org/apache/royale/html/accessories/DateFormatMMDDYYYYBead.as b/frameworks/projects/Formatters/src/main/royale/org/apache/royale/html/accessories/DateFormatMMDDYYYYBead.as index a570c551f7..0d3c7e9637 100644 --- a/frameworks/projects/Formatters/src/main/royale/org/apache/royale/html/accessories/DateFormatMMDDYYYYBead.as +++ b/frameworks/projects/Formatters/src/main/royale/org/apache/royale/html/accessories/DateFormatMMDDYYYYBead.as @@ -21,7 +21,7 @@ package org.apache.royale.html.accessories import org.apache.royale.html.accessories.SimpleDateFormatBead; /** - * The DateFormatBead class formats the display of a DateField using DD/MM/YYYY format. + * The DateFormatBead class formats the display of a DateField using MM/DD/YYYY format. * * @langversion 3.0 * @playerversion Flash 10.2