royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [royale-asjs] branch develop updated: fix positioning in IE11 for ComboBox and DateField
Date Mon, 17 Sep 2018 17:57:25 GMT
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 42378f4  fix positioning in IE11 for ComboBox and DateField
42378f4 is described below

commit 42378f4086670293dc83cc14007a08ccffb538df
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Mon Sep 17 19:57:14 2018 +0200

    fix positioning in IE11 for ComboBox and DateField
---
 .../royale/jewel/beads/views/ComboBoxView.as       |  6 ++--
 .../royale/jewel/beads/views/DateFieldView.as      | 32 ++++++++++------------
 2 files changed, 17 insertions(+), 21 deletions(-)

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 55d1090..2da2721 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
@@ -313,10 +313,8 @@ package org.apache.royale.jewel.beads.views
 				{
 					var origin:Point = new Point(0, button.y + button.height - top);
 					var relocated:Point = PointUtils.localToGlobal(origin,_strand);
-					// comboList.x = relocated.x;
-					// comboList.y = relocated.y;
-					_list.positioner.style["left"] = relocated.x + "px";
-					_list.positioner.style["top"] = relocated.y + "px";
+					_list.x = relocated.x;
+					_list.y = relocated.y;
 					_list.width = _textinput.width + _button.width;
 				}
 				else
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
index 20f5e25..801d43d 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
@@ -18,6 +18,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.views
 {
+	COMPILE::SWF
+	{
+		//import org.apache.royale.jewel.beads.views.TextInputView;
+		import flash.text.TextFieldType;
+		import flash.utils.setTimeout;
+    }
     import org.apache.royale.core.BeadViewBase;
     import org.apache.royale.core.IBeadModel;
     import org.apache.royale.core.IBeadView;
@@ -26,27 +32,21 @@ package org.apache.royale.jewel.beads.views
     import org.apache.royale.core.IPopUpHost;
     import org.apache.royale.core.IStrand;
     import org.apache.royale.core.UIBase;
+	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.Button;
     import org.apache.royale.jewel.DateChooser;
     import org.apache.royale.jewel.TextInput;
     import org.apache.royale.jewel.beads.controls.datefield.DateFieldMaskedTextInput;
     import org.apache.royale.jewel.beads.controls.textinput.MaxNumberCharacters;
-    import org.apache.royale.utils.UIUtils;
-	import org.apache.royale.utils.PointUtils;
-	import org.apache.royale.geom.Point;
 	import org.apache.royale.jewel.supportClasses.ResponsiveSizes;
 	import org.apache.royale.jewel.Table;
 	import org.apache.royale.jewel.beads.views.DateChooserView;
-	import org.apache.royale.core.ValuesManager;
-
-	COMPILE::SWF
-	{
-		//import org.apache.royale.jewel.beads.views.TextInputView;
-		import flash.text.TextFieldType;
-		import flash.utils.setTimeout;
-    }
+	import org.apache.royale.jewel.Alert;
+    import org.apache.royale.utils.UIUtils;
+	import org.apache.royale.utils.PointUtils;
 
 	/**
 	 * The DateFieldView class is a bead for DateField that creates the
@@ -310,15 +310,13 @@ package org.apache.royale.jewel.beads.views
 
 					var origin:Point = new Point(0, _button.y + _button.height - top);
 					var relocated:Point = PointUtils.localToGlobal(origin, _strand);
-					// daysTable.x = relocated.x;
-					// daysTable.y = relocated.y;
-					daysTable.positioner.style["left"] = relocated.x + "px";
-					daysTable.positioner.style["top"] = relocated.y + "px";
+					daysTable.x = relocated.x;
+					daysTable.y = relocated.y;
 				}
 				else
 				{
-					daysTable.positioner.style["left"] = "50%";
-					daysTable.positioner.style["top"] = "calc(100% - 10px)";
+					daysTable.positioner.style.left = '50%';
+					daysTable.positioner.style.top = 'calc(100% - 10px)';
 				}
 			}
 		}


Mime
View raw message