This is an automated email from the ASF dual-hosted git repository.
aharui 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 a122377 refactor disabledChangeCheck to its own interface
a122377 is described below
commit a1223771e514e131051c97a0ea331a590775fba4
Author: Alex Harui <[email protected]>
AuthorDate: Sun Feb 2 21:59:34 2020 -0800
refactor disabledChangeCheck to its own interface
---
.../org/apache/royale/html/beads/DateFieldView.as | 3 +-
.../royale/html/beads/models/DateChooserModel.as | 4 +-
.../projects/Core/src/main/royale/CoreClasses.as | 2 +-
.../org/apache/royale/core/IDateChooserModel.as | 13 ------
.../core/IDateChooserModelWithChangeCheck.as | 46 ++++++++++++++++++++++
.../royale/jewel/beads/models/DateChooserModel.as | 19 ---------
6 files changed, 51 insertions(+), 36 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateFieldView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateFieldView.as
index 13c0ab8..67c3d04 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateFieldView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateFieldView.as
@@ -22,6 +22,7 @@ package org.apache.royale.html.beads
import org.apache.royale.core.IBeadView;
import org.apache.royale.core.IBeadModel;
import org.apache.royale.core.IDateChooserModel;
+ import org.apache.royale.core.IDateChooserModelWithChangeCheck;
import org.apache.royale.core.IFormatter;
import org.apache.royale.core.IParent;
import org.apache.royale.core.IPopUpHost;
@@ -207,7 +208,7 @@ package org.apache.royale.html.beads
var model:IDateChooserModel =
_strand.getBeadByType(IDateChooserModel) as IDateChooserModel;
_popUp.selectedDate =
model.selectedDate;
- var popUpModel:IDateChooserModel =
_popUp.getBeadByType(IDateChooserModel) as IDateChooserModel;
+ var popUpModel:IDateChooserModelWithChangeCheck =
_popUp.getBeadByType(IDateChooserModelWithChangeCheck) as
IDateChooserModelWithChangeCheck;
popUpModel.disableChangeCheck = true;
var host:IPopUpHost =
UIUtils.findPopUpHost(getHost());
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 39ca423..6a4fc2b 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
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.html.beads.models
{
- import org.apache.royale.core.IDateChooserModel;
+ import org.apache.royale.core.IDateChooserModelWithChangeCheck;
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
@@ -33,7 +33,7 @@ package org.apache.royale.html.beads.models
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class DateChooserModel extends EventDispatcher implements
IDateChooserModel
+ public class DateChooserModel extends EventDispatcher implements
IDateChooserModelWithChangeCheck
{
public function DateChooserModel()
{
diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as
b/frameworks/projects/Core/src/main/royale/CoreClasses.as
index 3a451e1..4acda47 100644
--- a/frameworks/projects/Core/src/main/royale/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as
@@ -261,7 +261,7 @@ internal class CoreClasses
import org.apache.royale.core.IDataGridModel; IDataGridModel;
import org.apache.royale.core.IDataGridPresentationModel;
IDataGridPresentationModel;
- import org.apache.royale.core.IDateChooserModel; IDateChooserModel;
+ import org.apache.royale.core.IDateChooserModelWithChangeCheck;
IDateChooserModelWithChangeCheck;
import org.apache.royale.core.ParentDocumentBead; ParentDocumentBead;
import org.apache.royale.core.TransformBeadBase; TransformBeadBase;
import org.apache.royale.core.TransformModel; TransformModel;
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDateChooserModel.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDateChooserModel.as
index 57caeaf..dd13d7d 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDateChooserModel.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDateChooserModel.as
@@ -98,18 +98,5 @@ package org.apache.royale.core
function get selectedDate():Date;
function set selectedDate(value:Date):void;
- /**
- * If true, the DateChooser will dispatch change
- * events even if the date clicked is the selected date.
- * This flag is used by DateField to get the
- * dropdown to dismiss when clicking the selected date.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- function get disableChangeCheck():Boolean;
- function set disableChangeCheck(value:Boolean):void;
}
}
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDateChooserModelWithChangeCheck.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDateChooserModelWithChangeCheck.as
new file mode 100644
index 0000000..051b773
--- /dev/null
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IDateChooserModelWithChangeCheck.as
@@ -0,0 +1,46 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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 "License"); 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.core
+{
+ /**
+ * The IDateChooserModelWithChangeCheck adds a disabledChangeCheck API
to
+ * the IDateChooserModel interface.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ public interface IDateChooserModelWithChangeCheck extends
IDateChooserModel
+ {
+ /**
+ * If true, the DateChooser will dispatch change
+ * events even if the date clicked is the selected date.
+ * This flag is used by DateField to get the
+ * dropdown to dismiss when clicking the selected date.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ function get disableChangeCheck():Boolean;
+ function set disableChangeCheck(value:Boolean):void;
+ }
+}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as
index 40750f1..3ed24d1 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as
@@ -303,25 +303,6 @@ package org.apache.royale.jewel.beads.models
}
}
- private var _disableChangeCheck:Boolean;
-
- /**
- * The currently selected date or null if no date has been selected.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- public function get disableChangeCheck():Boolean
- {
- return _disableChangeCheck;
- }
- public function set disableChangeCheck(value:Boolean):void
- {
- _disableChangeCheck = value;
- }
-
// Utilities
public function changeYear(newYear:Number):void
{
