You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/06/19 12:41:42 UTC

git commit: [flex-sdk] [refs/heads/develop] - FLEX-29002 Fix RTE/work around flash player accessibility issue.

Updated Branches:
  refs/heads/develop f5dcd74f9 -> a7cf04dd4


FLEX-29002 Fix RTE/work around flash player accessibility issue.


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/a7cf04dd
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/a7cf04dd
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/a7cf04dd

Branch: refs/heads/develop
Commit: a7cf04dd4294dd8c314e9c9226a439d9225af8ef
Parents: f5dcd74
Author: Justin Mclean <jm...@apache.org>
Authored: Wed Jun 19 20:41:22 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Wed Jun 19 20:41:22 2013 +1000

----------------------------------------------------------------------
 .../src/mx/managers/PopUpManagerImpl.as         | 25 +++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a7cf04dd/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as b/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as
index 3cb569d..da14742 100644
--- a/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as
+++ b/frameworks/projects/framework/src/mx/managers/PopUpManagerImpl.as
@@ -1478,7 +1478,12 @@ public class PopUpManagerImpl extends EventDispatcher implements IPopUpManager
 				// This hides top-level document content from assistive technology.	
 				sbRoot.document.accessibilityProperties.silent = true;
 				
-				Accessibility.updateProperties();
+				try {
+					Accessibility.updateProperties();
+				}
+				catch(e:Error) {
+					// Flash Player issue causes hasAccessibility and active to be true when accessibility is turned off 
+				}
 			}
 			return true;
 		}
@@ -1508,7 +1513,12 @@ public class PopUpManagerImpl extends EventDispatcher implements IPopUpManager
 					sbRoot.document.accessibilityProperties.silent = false;
 				}
 				
-				Accessibility.updateProperties();	
+				try {
+					Accessibility.updateProperties();
+				}
+				catch(e:Error) {
+					// Flash Player issue on windows causes hasAccessibility and active to be true when accessibility is turned off 
+				}
 			}
 			return true;
 		}
@@ -1545,12 +1555,14 @@ public class PopUpManagerImpl extends EventDispatcher implements IPopUpManager
 			{
 				// If this is the only popUp, we should expose accessibility 
 				// of the top-level system manager's document
-				sm.document.accessibilityProperties.silent = false;
+				if (sm.document.accessibilityProperties)
+					sm.document.accessibilityProperties.silent = false;
 				
 				// We should also expose accessibility 
 				// of the sandbox root's document.
-				var sbRoot:Object = popupData.systemManager.getSandboxRoot();				
-				sbRoot.document.accessibilityProperties.silent = false;
+				var sbRoot:Object = popupData.systemManager.getSandboxRoot();	
+				if (sbRoot.document.accessibilityProperties)
+					sbRoot.document.accessibilityProperties.silent = false;
 			}
 		}
 		else if (index > 0)
@@ -1559,7 +1571,8 @@ public class PopUpManagerImpl extends EventDispatcher implements IPopUpManager
 			// of the underlying popUp
 			underneathPopUpData = popupInfo[index - 1];
 			
-			underneathPopUpData.owner.accessibilityProperties.silent = false;
+			if (underneathPopUpData.owner.accessibilityProperties)
+				underneathPopUpData.owner.accessibilityProperties.silent = false;
 			
 			// All the nested popUp's AccessibilityProperties 
 			// changes should be handled by a single