[royale-asjs] branch develop updated: jewel-disabled: tabindex must be set only on element, not positioner

[ca...@apache.org]

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 1b20c6c  jewel-disabled: tabindex must be set only on element, not positioner
1b20c6c is described below

commit 1b20c6caf42418a252f35ce97faa609474b9f4fa
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Jun 24 10:19:02 2020 +0200

    jewel-disabled: tabindex must be set only on element, not positioner
---
 .../org/apache/royale/jewel/beads/controls/Disabled.as  | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Disabled.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Disabled.as
index cce2040..2229c95 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Disabled.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Disabled.as
@@ -113,29 +113,28 @@ package org.apache.royale.jewel.beads.controls
 			
 			if(_disabled) {
 				setDisableAndTabIndex(elem);
-				setDisableAndTabIndex(pos);
+				setDisableAndTabIndex(pos, true);
 			} else {
 				removeDisableAndTabIndex(elem);
-				removeDisableAndTabIndex(pos);
+				removeDisableAndTabIndex(pos, true);
 			}
 			}
 		}
 
 		COMPILE::JS
-		protected function setDisableAndTabIndex(o:HTMLElement):void
+		protected function setDisableAndTabIndex(o:HTMLElement, positioner:Boolean = false):void
 		{
 			o.setAttribute("disabled", "");
-			o.tabIndex = -1;
+			if(!positioner)
+				o.tabIndex = -1;
 		}
 
 		COMPILE::JS
-		protected function removeDisableAndTabIndex(o:*):void
+		protected function removeDisableAndTabIndex(o:*, positioner:Boolean = false):void
 		{
 			o.removeAttribute("disabled");
-				
-			lastTabVal ?
-				o.tabIndex = lastTabVal :
-				o.tabIndex = null;
+			if(!positioner)
+				o.tabIndex = lastTabVal ? lastTabVal : null;
 		}
 	}
 }