Check if accessibility is supported

markoscalderon · markoscalderon · commit 0d01fb9a4b7f · 2013-03-11T15:02:59.000-05:00
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
@@ -172,7 +172,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         // Listen for the ENTER key to send the message.
         txtMsgArea.addEventListener(KeyboardEvent.KEY_UP, handleTextAreaKeyUpEvent);
                 
-				Accessibility.updateProperties();
+				if(Capabilities.hasAccessibility)
+					Accessibility.updateProperties();
 		        
 		        queryForChatHistory();
 			}
@@ -476,7 +477,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 						chatMessagesList.accessibilityProperties.description += " ";
 					}
 				}
-				Accessibility.updateProperties();
+				if(Capabilities.hasAccessibility)
+					Accessibility.updateProperties();
 				navToFirst = false;
 				navToLatest = false;
 				spacerNeeded = false;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
@@ -50,21 +50,32 @@ package org.bigbluebutton.modules.present.managers
 		}
 		
 		public function handleStartModuleEvent(e:PresentModuleEvent):void{
-			if (presentWindow != null) return;
+			LogUtil.debug("markos: begin handleStartModuleEvent");
+			if (presentWindow != null){ 
+				LogUtil.debug("markos: presentwindow is NOT null");
+				return;
+			}
+			LogUtil.debug("markos: before presentwindow");
 			presentWindow = new PresentationWindow();
+			LogUtil.debug("markos: presentwindow is created");
 			presentWindow.visible = (e.data.showPresentWindow == "true");
+			LogUtil.debug("markos: presentwindow is visible");
 			presentWindow.showControls = (e.data.showWindowControls == "true");
+			LogUtil.debug("markos: presentwindow shows controls");
 			openWindow(presentWindow);
+			LogUtil.debug("markos: finish handleStartModuleEvent");
 		}
 		
 		public function handleStopModuleEvent():void{
 			presentWindow.close();
 		}
 		
-		private function openWindow(window:IBbbModuleWindow):void{				
+		private function openWindow(window:IBbbModuleWindow):void{
+			LogUtil.debug("markos: begin openwindow");
 			var event:OpenWindowEvent = new OpenWindowEvent(OpenWindowEvent.OPEN_WINDOW_EVENT);
 			event.window = window;
-			globalDispatcher.dispatchEvent(event);		
+			globalDispatcher.dispatchEvent(event);
+			LogUtil.debug("markos: finish openwindow");
 		}
 	
 		public function handleOpenUploadWindow(e:UploadEvent):void{
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
@@ -149,16 +149,22 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			private var localDispatcher:Dispatcher = new Dispatcher();
 			
 			private function init():void{
+				LogUtil.debug("markos: begin init");
 				presentOptions = new PresentOptions();
 				baseIndex = presentOptions.baseTabIndex;
+				LogUtil.debug("markos: end init");
 			}
 			
 			private function onCreationComplete():void{
+				LogUtil.debug("markos: begin oncreationcomplete");
 				thumbY = this.height - 160;
-                bindKeyboardEvents();
+                
+				bindKeyboardEvents();
+				LogUtil.debug("markos: passed bindKeyboardEvents");
 				this.addEventListener(MDIWindowEvent.RESIZE_END, onResizeEndEvent);
 				slideView.addEventListener(ListEvent.ITEM_ROLL_OVER, onItemRollOver);
 				resourcesChanged();
+				LogUtil.debug("markos: passed resourcesChanged");
 				
 				titleBarOverlay.tabIndex = baseIndex;
 				
@@ -168,6 +174,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				
 				slideView.slideLoader.tabIndex = baseIndex+4;
 				hotkeyCapture();
+				LogUtil.debug("markos: finish oncreationcomplete");
 			}
 			
 			private function hotkeyCapture():void{
@@ -584,7 +591,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 					closeBtn.accessibilityName = ResourceUtil.getInstance().getString("bbb.presentation.closeBtn.accessibilityName");
 				}
 				
-				Accessibility.updateProperties();
+				if(Capabilities.hasAccessibility)
+					Accessibility.updateProperties();
 			}
 			
 			private function localeChanged(e:LocaleChangeEvent):void{
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
@@ -308,8 +308,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			 */						
 			private function handleSlideLoadedEvent(e:SlideEvent):void{
 				slideLoader.source = e.slide;
-				slideLoader.accessibilityProperties.description = e.slideText;
-				Accessibility.updateProperties()
+				if(Capabilities.hasAccessibility){
+					slideLoader.accessibilityProperties.description = e.slideText;
+					Accessibility.updateProperties()
+				}
 			}
 			
 			/**

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.`
`172`	`172`	`// Listen for the ENTER key to send the message.`
`173`	`173`	`txtMsgArea.addEventListener(KeyboardEvent.KEY_UP, handleTextAreaKeyUpEvent);`
`174`	`174`
`175`		`- Accessibility.updateProperties();`
	`175`	`+ if(Capabilities.hasAccessibility)`
	`176`	`+ Accessibility.updateProperties();`
`176`	`177`
`177`	`178`	`queryForChatHistory();`
`178`	`179`	`}`
`@@ -476,7 +477,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.`
`476`	`477`	`chatMessagesList.accessibilityProperties.description += " ";`
`477`	`478`	`}`
`478`	`479`	`}`
`479`		`- Accessibility.updateProperties();`
	`480`	`+ if(Capabilities.hasAccessibility)`
	`481`	`+ Accessibility.updateProperties();`
`480`	`482`	`navToFirst = false;`
`481`	`483`	`navToLatest = false;`
`482`	`484`	`spacerNeeded = false;`