From 86f74e90f6629209294621599b12010af6b0c641 Mon Sep 17 00:00:00 2001 From: Justin Mclean Date: Wed, 18 Oct 2017 18:22:06 +1100 Subject: [PATCH 1/9] 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/9] 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/9] 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/9] 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 fbae007b1e4d24ddb33168a8ad1ebea9b5eccefa Mon Sep 17 00:00:00 2001 From: Justin Mclean Date: Thu, 26 Oct 2017 19:28:00 +1100 Subject: [PATCH 5/9] add month changed event --- .../src/main/royale/org/apache/royale/html/DateChooser.as | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DateChooser.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DateChooser.as index cce0d3c0fe..dd084dc4e5 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DateChooser.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DateChooser.as @@ -26,6 +26,11 @@ package org.apache.royale.html */ [Event(name="change", type="org.apache.royale.events.Event")] + /** + * The change event is dispatched when the displayed month is changed. + */ + [Event(name="monthChanged", type="org.apache.royale.events.Event")] + /** * The DateChooser class is a component that displays a calendar. * From e587af6f38fb0440817546344b897e10f754bc7e Mon Sep 17 00:00:00 2001 From: Justin Mclean Date: Thu, 26 Oct 2017 19:28:47 +1100 Subject: [PATCH 6/9] change name of "internal" events and dispatch monthChanged publically --- .../royale/org/apache/royale/html/beads/DateChooserView.as | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateChooserView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateChooserView.as index 3cdfddb202..5faf68de5d 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateChooserView.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateChooserView.as @@ -70,8 +70,8 @@ package org.apache.royale.html.beads if (model == null) { model = new (ValuesManager.valuesImpl.getValue(_strand,"iBeadModel")) as DateChooserModel; } - model.addEventListener("displayedMonthChanged",handleModelChange); - model.addEventListener("displayedYearChanged",handleModelChange); + model.addEventListener("monthChanged",handleModelChange); + model.addEventListener("yearChanged",handleModelChange); createChildren(); updateDisplay(); @@ -241,6 +241,7 @@ package org.apache.royale.html.beads private function handleModelChange(event:Event):void { updateDisplay(); + IEventDispatcher(_strand).dispatchEvent( new Event("monthChanged") ); } } } From e753f3e528b480144d2dae9eccec62aaa2842176 Mon Sep 17 00:00:00 2001 From: Justin Mclean Date: Thu, 26 Oct 2017 19:29:13 +1100 Subject: [PATCH 7/9] change name of events --- .../org/apache/royale/html/beads/models/DateChooserModel.as | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DateChooserModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DateChooserModel.as index ab3e919435..3666d2498b 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DateChooserModel.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DateChooserModel.as @@ -121,7 +121,7 @@ package org.apache.royale.html.beads.models if (value != _displayedYear) { _displayedYear = value; updateCalendar(); - dispatchEvent( new Event("displayedYearChanged") ); + dispatchEvent( new Event("yearChanged") ); } } @@ -142,7 +142,7 @@ package org.apache.royale.html.beads.models if (_displayedMonth != value) { _displayedMonth = value; updateCalendar(); - dispatchEvent( new Event("displayedMonthChanged") ); + dispatchEvent( new Event("monthChanged") ); } } From c9b5a9898375fad1c20f4a09baff4094069e48af Mon Sep 17 00:00:00 2001 From: Justin Mclean Date: Sat, 28 Oct 2017 18:57:43 +1100 Subject: [PATCH 8/9] 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 1fdc5d435ead0dc66d4710801e1888c42c2c118f Mon Sep 17 00:00:00 2001 From: Justin Mclean Date: Sat, 28 Oct 2017 18:57:57 +1100 Subject: [PATCH 9/9] 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