From a4d243b202868e040977570dc67a8c89637bec3e Mon Sep 17 00:00:00 2001
From: Ghazi Triki <ghazi.triki@riadvice.tn>
Date: Thu, 23 Jul 2015 13:02:32 +0100
Subject: [PATCH] Added TabIndexer class for automating tab indexation.

---
 .../org/bigbluebutton/common/TabIndexer.as    | 114 ++++++++++++++++++
 .../main/views/AudioSelectionWindow.mxml      |  14 ++-
 .../main/views/CameraDisplaySettings.mxml     |  22 ++--
 .../main/views/FlashMicSettings.mxml          |  30 ++---
 .../main/views/LockSettings.mxml              |  12 +-
 .../main/views/MainApplicationShell.mxml      |  17 ++-
 .../bigbluebutton/main/views/MainToolbar.mxml |  37 +++---
 .../main/views/ShortcutHelpWindow.mxml        |  20 ++-
 .../modules/chat/views/AddChatTabBox.mxml     |  14 +--
 .../modules/chat/views/ChatBox.mxml           |  16 +--
 .../modules/chat/views/ChatView.mxml          |  14 +--
 .../modules/chat/views/ChatWindow.mxml        |  14 +--
 .../view/components/DesktopPublishWindow.mxml |  18 +--
 .../view/components/DesktopViewWindow.mxml    |  16 ++-
 .../layout/views/ToolbarComponent.mxml        |  19 ++-
 .../present/ui/views/PresentationWindow.mxml  |  41 +++----
 .../whiteboard/views/WhiteboardToolbar.mxml   |  17 +--
 17 files changed, 254 insertions(+), 181 deletions(-)
 create mode 100644 bigbluebutton-client/src/org/bigbluebutton/common/TabIndexer.as

diff --git a/bigbluebutton-client/src/org/bigbluebutton/common/TabIndexer.as b/bigbluebutton-client/src/org/bigbluebutton/common/TabIndexer.as
new file mode 100644
index 0000000000..fd2e8b9280
--- /dev/null
+++ b/bigbluebutton-client/src/org/bigbluebutton/common/TabIndexer.as
@@ -0,0 +1,114 @@
+/**
+ * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+ *
+ * Copyright (c) 2015 BigBlueButton Inc. and by respective authors (see below).
+ *
+ * This program is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 3.0 of the License, or (at your option) any later
+ * version.
+ *
+ * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.bigbluebutton.common
+{
+	import flash.events.Event;
+	import flash.events.EventDispatcher;
+	import mx.core.Container;
+	import mx.core.IMXMLObject;
+	import mx.core.UIComponent;
+	import mx.events.FlexEvent;
+	public class TabIndexer extends EventDispatcher implements IMXMLObject
+	{
+		private var _document:Container;
+		private var _id:String;
+		private var _ready:Boolean;
+		private var _startIndex:int;
+		private var _tabIndices:Array;
+
+		/**
+		 * @inheritDoc
+		 */
+		public function initialized(document:Object, id:String):void
+		{
+			_id=id;
+			_document=document as Container;
+			_document.addEventListener(FlexEvent.CREATION_COMPLETE, documentCreationCompleteHandler, false, 0, true);
+		}
+
+		[Bindable(event="startIndexChange")]
+		/**
+		 * tabIndex value of the first element.
+		 */
+		public function get startIndex():int
+		{
+			return _startIndex;
+		}
+
+		public function set startIndex(value:int):void
+		{
+			if (_startIndex !== value)
+			{
+				_startIndex=value;
+				dispatchEvent(new Event("startIndexChange"));
+				indexTabs();
+			}
+		}
+
+		[Bindable(event="tabIndicesChange")]
+		/**
+		 * An array containing tab indexable properties to index. Tab indexing will use array order.
+		 */
+		public function get tabIndices():Array
+		{
+			return _tabIndices;
+		}
+
+		public function set tabIndices(value:Array):void
+		{
+			if (_tabIndices !== value)
+			{
+				_tabIndices=value;
+				dispatchEvent(new Event("tabIndicesChange"));
+				indexTabs();
+			}
+		}
+
+		/**
+		 * Runs a tab indexation on document components contained in tabIndices Array.
+		 */
+		protected function indexTabs():void
+		{
+			if (_ready)
+			{
+				for (var i:int=0; i < tabIndices.length; i++)
+				{
+					if (_tabIndices[i - 1] != null)
+					{
+						UIComponent(_tabIndices[i - 1]).tabIndex=startIndex + i;
+					}
+				}
+			}
+		}
+
+		/**
+		 *
+		 * Sets state to ready to index after the document creation is compelete and starts
+		 * the first tab indexation.
+		 * @param event CREATION_COMPLETE event of the document
+		 *
+		 */
+		private function documentCreationCompleteHandler(event:FlexEvent):void
+		{
+			_document.removeEventListener(FlexEvent.CREATION_COMPLETE, documentCreationCompleteHandler, false);
+			_ready=true;
+			indexTabs();
+		}
+	}
+}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
index 6d6077c5f8..ff6114f314 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
@@ -21,6 +21,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 <mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" 
 				xmlns:mate="http://mate.asfusion.com/"
+				xmlns:common="org.bigbluebutton.common.*"
 				width="700" height="350" 
 				initialize="init()" 
 				styleName="micSettingsWindowStyle"
@@ -48,8 +49,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			
 			private var phoneOptions:PhoneOptions = new PhoneOptions;
 			
-			[Bindable] private var baseIndex:int = 1;
-			
 			private function init():void {
 				var conference:Conference = UserManager.getInstance().getConference();
 				
@@ -109,10 +108,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			}
 		]]>
 	</mx:Script>
+	
+	<common:TabIndexer startIndex="1" tabIndices="{[textArea, btnMicrophone, btnListenOnly, cancelBtn]}"/>
+	
 	<mx:VBox width="100%" height="100%"  paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" horizontalAlign="right">
 		<mx:HBox width="100%" height="60">
 			<mx:TextArea borderSkin="{null}" verticalScrollPolicy="off" 
-						 editable="false" tabIndex="{baseIndex}"
+						 editable="false" id="textArea"
 						 text="{ResourceUtil.getInstance().getString('bbb.audioSelection.title')}"
 						 styleName="micSettingsWindowTitleStyle"
 						 width="100%" height="100%" />
@@ -121,14 +123,14 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		<mx:HBox width="100%" height="100%">
 			<mx:VBox id="vboxMic" height="100%" width="30%" horizontalAlign="center">
 				<mx:Image source="@Embed('assets/microphone80.png')" />
-				<mx:Button id="btnMicrophone" tabIndex="{baseIndex+1}" click="onMicClick()"
+				<mx:Button id="btnMicrophone" click="onMicClick()"
 						   label="{ResourceUtil.getInstance().getString('bbb.audioSelection.btnMicrophone.label')}"
 						   accessibilityName="{ResourceUtil.getInstance().getString('bbb.audioSelection.btnMicrophone.toolTip')}"/>
 			</mx:VBox>
 			<mx:VRule id="vruleListen" height="100%" width="5%" />
 			<mx:VBox id="vboxListen" height="100%" width="30%" horizontalAlign="center">
 				<mx:Image source="@Embed('assets/speaker80.png')" />
-				<mx:Button id="btnListenOnly" tabIndex="{baseIndex+2}" click="onListenClick()"
+				<mx:Button id="btnListenOnly" click="onListenClick()"
 						   label="{ResourceUtil.getInstance().getString('bbb.audioSelection.btnListenOnly.label')}"
 						   accessibilityName="{ResourceUtil.getInstance().getString('bbb.audioSelection.btnListenOnly.toolTip')}" />
 			</mx:VBox>
@@ -140,6 +142,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		</mx:HBox>
 		<mx:HRule width="100%" />
 		<mx:Button id="cancelBtn" label="{ResourceUtil.getInstance().getString('bbb.micSettings.cancel')}" accessibilityName="{ResourceUtil.getInstance().getString('bbb.micSettings.cancel.toolTip')}"
-				   tabIndex="{baseIndex+3}" click="onCancelClicked()" styleName="micSettingsWindowPlaySoundButtonStyle" />
+				   click="onCancelClicked()" styleName="micSettingsWindowPlaySoundButtonStyle" />
 	</mx:VBox>
 </mx:TitleWindow>
\ No newline at end of file
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
index 56b6d0b3bc..d8e126ba41 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
@@ -20,6 +20,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 -->
 <mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" 
                 xmlns:view="org.bigbluebutton.main.views.*"
+				xmlns:common="org.bigbluebutton.common.*"
                 layout="absolute" 
                 verticalScrollPolicy="off" horizontalScrollPolicy="off"
                 width="630" height="450" creationComplete="onCreationComplete()" styleName="cameraDisplaySettingsWindowStyle" 
@@ -68,11 +69,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		private var selectedCam:int;
 		private var aspectRatio:Number = 1;
 		
-        [Bindable]private var baseIndex:int; 
-    override public function move(x:Number, y:Number):void
-    {
-       return;
-    }
+	    override public function move(x:Number, y:Number):void
+	    {
+	       return;
+	    }
       
 		private function onCreationComplete():void {
             tabIndex = 51;
@@ -203,10 +203,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       
     ]]>
   </mx:Script>
+	
+  <common:TabIndexer startIndex="1" tabIndices="{[textArea, cmbCameraSelector, cmbVideoProfile, btnStartPublish, btnClosePublish]}"/>
   
   <mx:VBox id="webcamDisplay" width="100%" height="100%" paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" styleName="cameraDisplaySettingsWindowBackground">
     <mx:TextArea width="100%" borderSkin="{null}" editable="false" text="{ResourceUtil.getInstance().getString('bbb.users.settings.webcamSettings')}" 
-                   styleName="webcamSettingsWindowTitleStyle" tabIndex="{baseIndex}"/>
+                   styleName="webcamSettingsWindowTitleStyle" id="textArea"/>
     <mx:HRule width="100%"/>
     <mx:Spacer height="1"/>
     
@@ -215,9 +217,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		</mx:Box>
         
 		<mx:HBox width="100%" height="10%" horizontalAlign="center" horizontalGap="13" paddingRight="5"> 	
-			<mx:ComboBox id="cmbCameraSelector" styleName="cameraDisplaySettingsWindowCameraSelector" dataProvider="{camerasAvailable}" width="150" visible="true" labelField="label" change="updateCamera()" tabIndex="{baseIndex+1}" height="30"/>
+			<mx:ComboBox id="cmbCameraSelector" styleName="cameraDisplaySettingsWindowCameraSelector" dataProvider="{camerasAvailable}" width="150" visible="true" labelField="label" change="updateCamera()" height="30"/>
 			<mx:ComboBox id="cmbVideoProfile" styleName="cameraDisplaySettingsWindowProfileComboStyle" 
-						 dataProvider="{_videoProfiles}" visible="false" change="updateCamera()" tabIndex="{baseIndex+2}"
+						 dataProvider="{_videoProfiles}" visible="false" change="updateCamera()"
                          toolTip="{ResourceUtil.getInstance().getString('bbb.publishVideo.cmbResolution.tooltip')}" height="30" />
     </mx:HBox>
     
@@ -226,10 +228,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     <mx:HBox width="100%" height="10%" horizontalAlign="right" horizontalGap="13" paddingRight="5" paddingBottom="5" paddingTop="1">
       <mx:Button id="btnStartPublish" toolTip="{ResourceUtil.getInstance().getString('bbb.publishVideo.startPublishBtn.toolTip')}" 
                  click="startPublishing()" enabled="false" styleName="cameraDisplaySettingsWindowStartBtn" 
-                 label="{ResourceUtil.getInstance().getString('bbb.publishVideo.startPublishBtn.labelText')}" tabIndex="{baseIndex+3}"  />
+                 label="{ResourceUtil.getInstance().getString('bbb.publishVideo.startPublishBtn.labelText')}"/>
       <mx:Button id="btnClosePublish"   
                  click="onCancelClicked()" 
-                 enabled="true" tabIndex="{baseIndex+4}"
+                 enabled="true"
                  label="{ResourceUtil.getInstance().getString('bbb.video.publish.closeBtn.label')}"
                  accessibilityName="{ResourceUtil.getInstance().getString('bbb.video.publish.closeBtn.accessName')}"/>
     </mx:HBox>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml
index 7f7e0a4d6d..fb7ec76b0a 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml
@@ -20,6 +20,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 -->
 <mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" 
 				xmlns:mate="http://mate.asfusion.com/" 
+				xmlns:common="org.bigbluebutton.common.*"
 				width="600" height="380" 
 				creationComplete="onCreationComplete()" 
 				styleName="micSettingsWindowStyle"
@@ -88,7 +89,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			[Bindable] private var cancelIcon:Class = images.cancel;
 
 			[Bindable] private var microphoneList:Array;      
-			[Bindable] private var baseIndex:int = 1;
       private var doingEchoTest:Boolean = false;
       
       private var my_nc:NetConnection;      
@@ -326,6 +326,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		]]>
 	</mx:Script>
 	
+  <common:TabIndexer startIndex="1"
+					 tabIndices="{[audioSettingText, helpButton, comboMicList, micRecordVolume, micLevel, echoTestText, yesButton, noButton, echoTestButton, playButton, cancelBtn]}"/>
+	
   <mx:states>
     <mx:State name="{FLASH_ECHO_TEST_STATE}">
       <mx:AddChild relativeTo="displayMicNextToThis" position="after">
@@ -337,16 +340,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
           <mx:HRule width="100%"/>
           <mx:HBox width="100%" horizontalAlign="right" horizontalGap="18" paddingTop="10">
             <mx:TextArea editable="false" textAlign="left" borderSkin="{null}"
-                         width="100%" height="60" tabIndex="{baseIndex+5}"
+                         width="100%" height="60" id="echoTestText"
                          text="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestMicPrompt')}"
                          styleName="micSettingsWindowSpeakIntoMicLabelStyle" />
             <mx:Button id="yesButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestAudioYes')}" 
                      click="yesButtonClicked()" styleName="micSettingsWindowPlaySoundButtonStyle"
-                     toolTip="" tabIndex="{baseIndex+6}"/>
+                     toolTip=""/>
             <mx:Button id="noButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestAudioNo')}" 
                      styleName="micSettingsWindowPlaySoundButtonStyle"
                      click="noButtonClicked()" 
-                     toolTip="" tabIndex="{baseIndex+7}"/>
+                     toolTip=""/>
           </mx:HBox>
         </mx:VBox> 
       </mx:AddChild>
@@ -361,19 +364,18 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
             <mx:HBox>
               <mx:ComboBox id="comboMicList" 
                            dataProvider="{microphoneList}" change="selectMicrophone(event)"
-                           height="30" dropdownWidth="390" width="390" tabIndex="{baseIndex+2}" 
+                           height="30" dropdownWidth="390" width="390"
                            toolTip="{ResourceUtil.getInstance().getString('bbb.micSettings.comboMicList.toolTip')}" />
               <mx:HSlider id="micRecordVolume" 
                           maximum="100" snapInterval="1"                       
                           labels="[0%,{ResourceUtil.getInstance().getString('bbb.micSettings.micRecordVolume.label')},100%]"
                           tickInterval="10" liveDragging="true" change="changeRecordVolume(event);"
                           showTrackHighlight="true" trackColors="[ 0xEEEEEE, 0xFFFFFF ]"
-                          value="60" tabIndex="{baseIndex+3}" 
+                          value="60"
                           toolTip="{ResourceUtil.getInstance().getString('bbb.micSettings.micRecordVolume.toolTip')}" />                           
             </mx:HBox>
             <mx:ProgressBar id="micLevel" minimum="0" maximum="100" direction="right" label=""
-                            mode="manual" visible="true" width="100%" height="27" trackHeight="25" verticalGap="-20" 
-                            tabIndex="{baseIndex+4}" />
+                            mode="manual" visible="true" width="100%" height="27" trackHeight="25" verticalGap="-20"/>
         </mx:VBox>
        
       </mx:AddChild>     
@@ -409,11 +411,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		    <mx:Canvas width="100%" id="flashMicSettingsTitle">
 			    <mx:TextArea borderSkin="{null}"
                    text="{ResourceUtil.getInstance().getString('bbb.users.settings.audioSettings')}"
-	                 editable="false" styleName="micSettingsWindowTitleStyle" tabIndex="{baseIndex}"
+	                 editable="false" styleName="micSettingsWindowTitleStyle" id="audioSettingText"
       						 width="400" left="0" />
 			    <mx:LinkButton toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.helpBtn')}"
     						   label="?" styleName="micSettingsWindowHelpButtonStyle" right="0"
-          			   height="22" click="onHelpButtonClicked()" tabIndex="{baseIndex+1}"
+          			   height="22" click="onHelpButtonClicked()" id="helpButton"
           			   accessibilityName="{ResourceUtil.getInstance().getString('bbb.micSettings.access.helpButton')}"/>
 		    </mx:Canvas>
         <mx:HBox width="100%" id="displayMicNextToThis">
@@ -428,15 +430,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         <mx:HBox width="100%" horizontalAlign="right" horizontalGap="18" paddingTop="10">
           <mx:Button id="echoTestButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.nextButton')}" 
                  click="echoTestButtonClickHandler()" styleName="micSettingsWindowPlaySoundButtonStyle"
-                 toolTip="{ResourceUtil.getInstance().getString('bbb.micSettings.nextButton')}"
-				 tabIndex="{baseIndex+8}"/>
+                 toolTip="{ResourceUtil.getInstance().getString('bbb.micSettings.nextButton')}"/>
           <mx:Button id="playButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.playSound')}" 
                  click="playButtonClickHandler()" toggle="true" styleName="micSettingsWindowPlaySoundButtonStyle"
-                 toolTip="{ResourceUtil.getInstance().getString('bbb.micSettings.playSound.toolTip')}"
-                 tabIndex="{baseIndex+9}" />
+                 toolTip="{ResourceUtil.getInstance().getString('bbb.micSettings.playSound.toolTip')}"/>
           <mx:Button id="cancelBtn" label="{ResourceUtil.getInstance().getString('bbb.micSettings.cancel')}" 
                  styleName="micSettingsWindowCancelButtonStyle"
-                 click="onCancelClicked()" tabIndex="{baseIndex+10}"
+                 click="onCancelClicked()"
                  toolTip="{ResourceUtil.getInstance().getString('bbb.micSettings.cancel.toolTip')}"/>
         </mx:HBox> 
 
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/LockSettings.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/LockSettings.mxml
index 2c4aa7cbc9..cbec69caf6 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/LockSettings.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/LockSettings.mxml
@@ -20,6 +20,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 -->
 <mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" 
 				xmlns:mate="http://mate.asfusion.com/" 
+				xmlns:common="org.bigbluebutton.common.*"
 				width="300" height="400" 
 				creationComplete="creationCompleteHandler(event)" 
 				styleName="lockSettingsWindowStyle"
@@ -47,8 +48,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			
 			[Bindable] private var cancelIcon:Class = images.cancel;
 			
-			[Bindable] private var baseIndex:int = 1;
-			  
 			[Bindable] public var disableCam:Boolean = false;
 			[Bindable] public var disableMic:Boolean = false;
 			[Bindable] public var disablePubChat:Boolean = false;
@@ -87,9 +86,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			}
 		]]>
 	</mx:Script>
+	
+	<common:TabIndexer startIndex="1" tabIndices="{[titleText, saveBtn, cancelBtn]}"/>
+	
 	<mx:VBox width="100%" height="100%"  paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5">
 		<mx:TextArea borderSkin="{null}" editable="false" selectable="false" text="{ResourceUtil.getInstance().getString('bbb.lockSettings.title')}" styleName="lockSettingsWindowTitleStyle"
-					 tabIndex="{baseIndex}" width="100%" left="0"/>
+					 id="titleText" width="100%" left="0"/>
 		<mx:HRule width="100%"/>
 		
 		<mx:HBox verticalAlign="top" width="100%" paddingTop="20">
@@ -159,11 +161,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		
 		<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18" paddingTop="20">
 			<mx:Button id="saveBtn" label="{ResourceUtil.getInstance().getString('bbb.lockSettings.save')}" 
-					   click="onSaveClicked()" tabIndex="{baseIndex+8}"
+					   click="onSaveClicked()"
 					   toolTip="{ResourceUtil.getInstance().getString('bbb.lockSettings.save.tooltip')}"/>
 			
 			<mx:Button id="cancelBtn" label="{ResourceUtil.getInstance().getString('bbb.lockSettings.cancel')}" 
-					   click="onCancelClicked()" tabIndex="{baseIndex+9}"
+					   click="onCancelClicked()"
 					   toolTip="{ResourceUtil.getInstance().getString('bbb.lockSettings.cancel.toolTip')}"/>
 		</mx:HBox>
 	</mx:VBox>		
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
index 0361bb606e..4584639933 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
@@ -27,10 +27,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		xmlns:mate="http://mate.asfusion.com/"
 		xmlns:maps="org.bigbluebutton.main.maps.*"
 		xmlns:api="org.bigbluebutton.main.api.*"
+		xmlns:common="org.bigbluebutton.common.*"
 		width="100%" height="100%" 
 		horizontalScrollPolicy="off" verticalScrollPolicy="off"
-		creationComplete="initializeShell()" 
-		xmlns:common="org.bigbluebutton.common.*">
+		creationComplete="initializeShell()" >
 		
 	<mate:Listener type="{OpenWindowEvent.OPEN_WINDOW_EVENT}" method="handleOpenWindowEvent" />	
 	<mate:Listener type="{CloseWindowEvent.CLOSE_WINDOW_EVENT}" method="handleCloseWindowEvent"/>
@@ -126,8 +126,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			private var logoutWindow:LoggedOutWindow;
 			private var connectionLostWindow:ConnectionLostWindow;
 			
-			[Bindable] private var baseIndex:int = 100000;
-			
 			// LIVE or PLAYBACK
 			private var _mode:String = 'LIVE';
 			[Bindable] public var appVersion:String = ' ';
@@ -568,7 +566,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			
 			private function handleAddToolbarComponent(event:ToolbarButtonEvent):void {
 				if (event.location == ToolbarButtonEvent.BOTTOM_TOOLBAR) {
-					(event.button as UIComponent).tabIndex = baseIndex + addedBtns.numChildren + 10;
+					(event.button as UIComponent).tabIndex = tabIndexer.startIndex + addedBtns.numChildren + 10;
 					addedBtns.addChild(event.button as UIComponent);
 					//realignButtons();
 				}
@@ -640,6 +638,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			}
 		]]>
 	</mx:Script>
+	
+	<common:TabIndexer id="tabIndexer" startIndex="100000"
+					   tabIndices="{[langSelector, logBtn]}"/>
 
 	<views:MainToolbar id="toolbar" 
 					   dock="true" 
@@ -686,8 +687,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				height="20"
 				width="180"
 				accessibilityName="{ResourceUtil.getInstance().getString('bbb.mainToolbar.langSelector')}"
-				styleName="languageSelectorStyle"
-				tabIndex="{baseIndex}"/>
+				styleName="languageSelectorStyle"/>
 		<mx:Button
 				width="20"
 				height="20"
@@ -696,8 +696,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				toolTip="{ResourceUtil.getInstance().getString('bbb.mainshell.logBtn.toolTip')}"
 				id="logBtn"
 				icon="{logs_icon}"
-				click="openLogWindow()"
-				tabIndex="{baseIndex+1}"/>
+				click="openLogWindow()"/>
 		<mx:HBox id="addedBtns" />
 	</mx:ControlBar>
 </mx:VBox>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
index 9363c1641a..aaae8c656e 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
@@ -21,9 +21,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 -->
 
 <mx:ApplicationControlBar xmlns:mx="http://www.adobe.com/2006/mxml" 
-	xmlns:mate="http://mate.asfusion.com/" visible="{showToolbar}"
-	enabled="true" xmlns:views="org.bigbluebutton.main.views.*"
-	initialize="init()" creationComplete="onCreationComplete()" >   
+	xmlns:mate="http://mate.asfusion.com/" xmlns:common="org.bigbluebutton.common.*"
+	xmlns:views="org.bigbluebutton.main.views.*"
+	enabled="true" visible="{showToolbar}"
+	initialize="init()" creationComplete="onCreationComplete()">   
 	
 	<mate:Listener type="{ToolbarButtonEvent.ADD}" method="handleAddToolbarButtonEvent" />	
 	<mate:Listener type="{ToolbarButtonEvent.REMOVE}" method="handleRemoveToolbarButtonEvent"/>
@@ -72,7 +73,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			[Bindable] private var showHelpBtn:Boolean = false;
 			[Bindable] private var showToolbar:Boolean = false;
 			[Bindable] public var toolbarOptions:LayoutOptions = new LayoutOptions();		
-			[Bindable] private var baseIndex:int;
 			[Bindable] private var numButtons:int;
       
 			/*
@@ -90,7 +90,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 					AlertAccImpl.enableAccessibility();
 				}
 				
-				baseIndex = 101;
 				numButtons = 0;
                 
                 // Accessibility isn't active till a few second after the client starts to load so we need a delay
@@ -250,7 +249,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				for each (var button:UIComponent in addedBtns.getChildren()){
 					var toolbarComponent:IBbbToolbarComponent = button as IBbbToolbarComponent;
 					
-					
 					/*if (toolbarComponent.getAlignment() == ALIGN_LEFT){ 
 						addedBtns.setChildIndex(button, 0);
 						//(addedBtns.getChildAt(0) as Button).tabIndex = 0;
@@ -259,7 +257,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 						addedBtns.setChildIndex(button, addedBtns.numChildren - 1);
 						//(addedBtns.getChildAt(0) as Button).tabIndex = addedBtns.numChildren - 1;
 					}*/
-					button.tabIndex = baseIndex + 5;
+					button.tabIndex = quickLinksIndexer.startIndex + 5;
 					//for (var i:int = 0; i < addedBtns.numChildren; i++){
 					//	(addedBtns.getChildAt(i) as Button).tabIndex = baseIndex + i;
 					//}
@@ -328,25 +326,30 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 		]]>
 	</mx:Script>
+	
+	<common:TabIndexer id="quickLinksIndexer" startIndex="102" tabIndices="{[usersLinkBtn, webcamLinkButton, presentationLinkBtn, chatLinkBtn]}"/>
+	<common:TabIndexer id="buttonsIndexer" startIndex="{quickLinksIndexer.startIndex + numButtons + 10}"
+					   tabIndices="{[recordBtn, muteMeBtn, shortcutKeysBtn, helpBtn, btnLogout]}"/>
+
     
     <mx:HBox id="quickLinks" width="1" includeInLayout="false">
         <mx:LinkButton id="usersLinkBtn" click="onQuickLinkClicked('users')" label="{ResourceUtil.getInstance().getString('bbb.users.quickLink.label')}"
                        accessibilityDescription="{usersLinkBtn.label}" toolTip="{usersLinkBtn.label}"
-                       tabIndex="{baseIndex+1}" height="22" styleName="quickWindowLinkStyle" />
+                       height="22" styleName="quickWindowLinkStyle" />
         <mx:LinkButton id="webcamLinkButton" click="onQuickLinkClicked('webcams')" label="{ResourceUtil.getInstance().getString('bbb.videodock.quickLink.label')}" 
                        accessibilityDescription="{webcamLinkButton.label}" toolTip="{webcamLinkButton.label}"
-                       tabIndex="{baseIndex+2}" height="22" styleName="quickWindowLinkStyle" />
+                       height="22" styleName="quickWindowLinkStyle" />
         <mx:LinkButton id="presentationLinkBtn" click="onQuickLinkClicked('presentation')" label="{ResourceUtil.getInstance().getString('bbb.presentation.quickLink.label')}"
                        accessibilityDescription="{presentationLinkBtn.label}" toolTip="{presentationLinkBtn.label}"
-                       tabIndex="{baseIndex+3}" height="22" styleName="quickWindowLinkStyle" />
+                       height="22" styleName="quickWindowLinkStyle" />
         <mx:LinkButton id="chatLinkBtn" click="onQuickLinkClicked('chat')" label="{ResourceUtil.getInstance().getString('bbb.chat.quickLink.label')}" 
                        accessibilityDescription="{chatLinkBtn.label}" toolTip="{chatLinkBtn.label}"
-                       tabIndex="{baseIndex+4}" height="22" styleName="quickWindowLinkStyle" />
+                       height="22" styleName="quickWindowLinkStyle" />
     </mx:HBox>
 	<mx:HBox id="addedBtns"/>
-	<views:RecordButton id="recordBtn" tabIndex="{baseIndex+numButtons+10}" />
+	<views:RecordButton id="recordBtn"/>
 	<mx:VRule strokeWidth="2" height="100%" visible="{muteMeBtn.visible}" includeInLayout="{muteMeBtn.includeInLayout}"/>
-	<views:MuteMeButton id="muteMeBtn"  height="20" tabIndex="{baseIndex+numButtons+11}"/>
+	<views:MuteMeButton id="muteMeBtn"  height="20"/>
 	<mx:Label id="meetingNameLbl" width="100%" minWidth="1" styleName="meetingNameLabelStyle" />
 
 <!--
@@ -354,13 +357,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 -->
 	<mx:Button id="shortcutKeysBtn" label="{ResourceUtil.getInstance().getString('bbb.mainToolbar.shortcutBtn')}" styleName="shortcutButtonStyle"
              click="onShortcutButtonClick()" height="22" 
-             toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.shortcutBtn.toolTip')}" 
-             tabIndex="{baseIndex+numButtons+13}" />
+             toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.shortcutBtn.toolTip')}"/>
 	<mx:LinkButton id="helpBtn" visible="{showHelpBtn}" includeInLayout="{showHelpBtn}" label="?" click="onHelpButtonClicked()" height="22" 
-                   styleName="helpLinkButtonStyle" tabIndex="{baseIndex+numButtons+14}" 
+                   styleName="helpLinkButtonStyle"
                    toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.helpBtn')}"
 				   accessibilityName="{ResourceUtil.getInstance().getString('bbb.micSettings.access.helpButton')}"/>
 	<mx:Button label="" id="btnLogout" styleName="logoutButtonStyle"
-                 toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.logoutBtn.toolTip')}" right="10" click="confirmLogout()" height="22"
-                 tabIndex="{baseIndex+numButtons+15}" />
+                 toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.logoutBtn.toolTip')}" right="10" click="confirmLogout()" height="22"/>
 </mx:ApplicationControlBar>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
index f0f0a61e31..6d74ecf992 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
@@ -22,7 +22,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 <CustomMdiWindow xmlns="org.bigbluebutton.common.*" 
 	       xmlns:mx="http://www.adobe.com/2006/mxml" 
-	       showCloseButton="true"
+		   xmlns:common="org.bigbluebutton.common.*"
+		   showCloseButton="true"
 		   initialize="init()"
 	       creationComplete="onCreationComplete()"
 		   xmlns:mate="http://mate.asfusion.com/" 
@@ -86,9 +87,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			[Bindable]
 			private var shownKeys:ArrayCollection;
 			
-			[Bindable]
-			private var baseIndex:int = 100;
-			
 			private var modifier:String;
 			private var globalModifier:String;
 			
@@ -100,11 +98,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			
 			private function onCreationComplete():void {
 				localeChanged();
-				titleBarOverlay.tabIndex = baseIndex;
-				
-				minimizeBtn.tabIndex = baseIndex + 1;
-				maximizeRestoreBtn.tabIndex = baseIndex + 2;
-				closeBtn.tabIndex = baseIndex + 3;
+				titleBarOverlay.tabIndex = headerIndexer.startIndex - 1;
 			}
 			
 			private function populateModules():void{
@@ -268,10 +262,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		]]>
 	</mx:Script>
 	
+	<common:TabIndexer id="headerIndexer" startIndex="101" tabIndices="{[minimizeBtn, maximizeRestoreBtn, closeBtn]}"/>
+	<common:TabIndexer startIndex="115" tabIndices="{[categories, keyList]}"/>
+
 	<mx:ComboBox id="categories" labelField="Please select an area for which to view shortcut keys: " 
 				 editable="false" 
-				 change="changeArray()"
-				 tabIndex="{baseIndex + 10}">
+				 change="changeArray()">
 		<mx:ArrayCollection id="categoryAC">
         	<!--
 			<mx:String>{ResourceUtil.getInstance().getString("bbb.shortcuthelp.dropdown.general")}</mx:String>
@@ -283,7 +279,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			-->
       	</mx:ArrayCollection>
 	</mx:ComboBox>
-	<mx:DataGrid id="keyList" draggableColumns="false" dataProvider="{shownKeys}" width="100%" height="100%" tabIndex="{baseIndex + 15}" >
+	<mx:DataGrid id="keyList" draggableColumns="false" dataProvider="{shownKeys}" width="100%" height="100%">
 		<mx:columns>
 			<mx:DataGridColumn dataField="shortcut" headerText="{ResourceUtil.getInstance().getString('bbb.shortcuthelp.headers.shortcut')}"/>
 			<mx:DataGridColumn dataField="func" headerText="{ResourceUtil.getInstance().getString('bbb.shortcuthelp.headers.function')}"/>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
index 068ffa266a..1242e7beb1 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
@@ -22,6 +22,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 <mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" 
          xmlns:mate="http://mate.asfusion.com/"
+		 xmlns:common="org.bigbluebutton.common.*"
          implements="org.bigbluebutton.modules.chat.views.IChatTab"
          creationComplete="onCreationComplete()">
   
@@ -54,9 +55,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
             
             [Bindable] public var chatOptions:ChatOptions = new ChatOptions();		
             
-			[Bindable]
-			public var baseIndex:int;
-			
             private function onCreationComplete():void{
                 users = UserManager.getInstance().getConference().users;
                 if (fontSizes.indexOf(chatOptions.fontSize) != -1) {
@@ -119,21 +117,21 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         ]]>
     </mx:Script>
     
-    <mx:HBox width="100%" height="100%">
+	<common:TabIndexer id="tabIndexer" startIndex="1" tabIndices="{[usersList, cmbFontSize]}"/>
+
+	<mx:HBox width="100%" height="100%">
         <mx:VBox  height="100%" width="50%" enabled="true">
             <mx:Label id="lblSelect" text="{ResourceUtil.getInstance().getString('bbb.chat.privateChatSelect')}" visible="{chatOptions.privateEnabled}" includeInLayout="{chatOptions.privateEnabled}"/>
             <mx:List id="usersList" height="100%" width="100%" dataProvider="{users}" dragEnabled="false" 
                      visible="{chatOptions.privateEnabled}" includeInLayout="{chatOptions.privateEnabled}"
                      itemRenderer="org.bigbluebutton.modules.chat.views.UserRenderer"
-                     itemClick="openPrivateChat(event)" toolTip="{ResourceUtil.getInstance().getString('bbb.chat.usersList.toolTip')}"
-					 tabIndex="{baseIndex}"/>
+                     itemClick="openPrivateChat(event)" toolTip="{ResourceUtil.getInstance().getString('bbb.chat.usersList.toolTip')}"/>
             <mx:VBox id="optionsBox" height="100%" width="50%" >
                 <mx:Label text="{ResourceUtil.getInstance().getString('bbb.chat.chatOptions')}" />
                 <mx:HBox width="100%">
                     <mx:Label text="{ResourceUtil.getInstance().getString('bbb.chat.fontSize')}" />
                     <mx:ComboBox width="60" id="cmbFontSize" dataProvider="{fontSizes}" change="changeFontSize()" 
-								 selectedIndex="1" toolTip="{ResourceUtil.getInstance().getString('bbb.chat.cmbFontSize.toolTip')}" 
-								 tabIndex="{baseIndex+1}"/>
+								 selectedIndex="1" toolTip="{ResourceUtil.getInstance().getString('bbb.chat.cmbFontSize.toolTip')}" />
                 </mx:HBox>
             </mx:VBox>
         </mx:VBox>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
index 3affc31ea4..917e62866c 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
@@ -22,8 +22,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 <mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" 
 	xmlns:mate="http://mate.asfusion.com/"
-  xmlns:chat="org.bigbluebutton.modules.chat.views.*"
-  implements="org.bigbluebutton.modules.chat.views.IChatTab"
+	xmlns:common="org.bigbluebutton.common.*"
+    xmlns:chat="org.bigbluebutton.modules.chat.views.*"
+    implements="org.bigbluebutton.modules.chat.views.IChatTab"
 	click="setMessageRead()" verticalScrollPolicy="off"
 	creationComplete="onCreationComplete()">
 
@@ -143,9 +144,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			private var indicatorNeeded:Boolean = false
 			private var repeat:Boolean = false;
 			
-			[Bindable]
-			public var baseIndex:int;
-			
 		      [Bindable]
 		      private var chatListHeight:Number = 100;
 			
@@ -669,11 +667,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		
 	</mx:Script>
 
+  <common:TabIndexer id="tabIndexer" tabIndices="{[chatMessagesList, txtMsgArea, sendBtn, cmpColorPicker]}"/>
+	
   <mx:HBox width="100%" height="{chatListHeight}" verticalScrollPolicy="off">
     <chat:AdvancedList width="100%" height="{chatListHeight}" id="chatMessagesList" selectable="false" variableRowHeight="true" 
              itemRenderer="org.bigbluebutton.modules.chat.views.ChatMessageRenderer" verticalScrollPolicy="on" horizontalScrollPolicy="off" wordWrap="true"
              dataProvider="{chatMessages.messages}"
-             tabIndex="{baseIndex}"
              accessibilityName="{ResourceUtil.getInstance().getString('bbb.chat.messageList')}" />    
   </mx:HBox>
   
@@ -682,19 +681,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     <mx:TextArea id="txtMsgArea" width="100%" height="100%"
                  styleName="chatControlBarTextMsgStyle" 
                  toolTip="{ResourceUtil.getInstance().getString('bbb.accessibility.chat.chatwindow.input')}"
-                 tabIndex="{baseIndex+1}"
 				 accessibilityName="{ResourceUtil.getInstance().getString('bbb.chat.input.accessibilityName')}" />
     <mx:VBox verticalScrollPolicy="off" verticalAlign="middle" height="100%" >
       <mx:Button label="{ResourceUtil.getInstance().getString('bbb.chat.sendBtn')}" id="sendBtn"
                  styleName="chatControlBarSendButtonStyle"
                  toolTip="{ResourceUtil.getInstance().getString('bbb.chat.sendBtn.toolTip')}" 
                  click="sendMessages()"
-                 tabIndex="{baseIndex+2}"
                  accessibilityName="{ResourceUtil.getInstance().getString('bbb.chat.sendBtn.accessibilityName')}"/>  
 		<mx:ColorPicker id="cmpColorPicker" showTextField="false" width="100%" visible="{chatOptions.colorPickerIsVisible}" includeInLayout="{chatOptions.colorPickerIsVisible}" 
 						toolTip="{ResourceUtil.getInstance().getString('bbb.chat.cmpColorPicker.toolTip')}" 
-						selectedColor="0x000000" dataProvider="{colorPickerColours}" swatchPanelStyleName="chatColorPickerStyle"
-						tabIndex="{baseIndex+3}" />
+						selectedColor="0x000000" dataProvider="{colorPickerColours}" swatchPanelStyleName="chatColorPickerStyle"/>
     </mx:VBox>
   </mx:HBox>	
 </mx:VBox>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
index f71d7bb550..b4e605785f 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
@@ -26,7 +26,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     initialize="init()"
     xmlns:flexlib="http://code.google.com/p/flexlib/"
     width="100%" height="100%" xmlns:containers="flexlib.containers.*"
-    verticalScrollPolicy="off">
+    verticalScrollPolicy="off" xmlns:common="org.bigbluebutton.common.*">
 
   <mate:Listener type="{PrivateChatMessageEvent.PRIVATE_CHAT_MESSAGE_EVENT}" method="handlePrivateChatMessageEvent"/>
   <mate:Listener type="{PublicChatMessageEvent.PUBLIC_CHAT_MESSAGE_EVENT}" method="handlePublicChatMessageEvent"/>
@@ -81,8 +81,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			
       [Bindable] public var chatOptions:ChatOptions;
 	  
-	    [Bindable] private var baseIndex:int;
-      
 		  private static const PUBLIC_TAB_NEW:String = ResourceUtil.getInstance().getString("bbb.accessibility.chat.chatView.publicTabNew");
 		  private var publicWaiting:Boolean = false;
 		  private var publicFocus:Boolean = false;
@@ -99,7 +97,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				chatOptions = new ChatOptions();
 				noticeLabel = ResourceUtil.getInstance().getString('bbb.chat.chatTabs.accessibleNotice');
 				// Get the base tab index from config, and add four to make up for the min/max/close buttons and title overlay
-				baseIndex = chatOptions.getBaseIndex() + 4;
 			}
 			
 
@@ -268,7 +265,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				chatBox.id = chatWithUserID;
 		    chatBox.name = chatWithUserID;
 				chatBox.chatWithUserID = chatWithUserID;
-				chatBox.baseIndex = baseIndex+10;
+				chatBox.tabIndexer.startIndex = tabIndexer.startIndex + 10;
 		        
 		    if (publicChat) {
 		      chatBox.label = PUBLIC_CHAT_USERNAME
@@ -300,7 +297,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				tabBox.label = OPTION_TAB_ID;
 				tabBox.name = OPTION_TAB_ID;
 				tabBox.chatOptions = chatOptions;
-				tabBox.baseIndex = baseIndex + 10;
+				tabBox.tabIndexer.startIndex = tabIndexer.startIndex + 10;
 				tabBox.addEventListener(KeyboardEvent.KEY_DOWN, tabBox.accessibleClick);
 				chatTabs.addChild(tabBox);
 				
@@ -364,9 +361,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			
 		]]>
 	</mx:Script>
+	
+	<common:TabIndexer id="tabIndexer" startIndex="{chatOptions.getBaseIndex() + 4}" tabIndices="{[chatTabs]}"/>
+	
 	<containers:SuperTabNavigator includeInLayout="false" id="chatTabs" 
                                 width="100%" height="100%" change="onTabNavChange()" 
                                 tabClose="onTabClose(event)" minTabWidth="20"
-								  dragEnabled="false" popUpButtonPolicy="off" tabIndex="{baseIndex}"
+								  dragEnabled="false" popUpButtonPolicy="off"
 								  />
 </mx:VBox>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml
index a3e33189b3..40796982fd 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml
@@ -25,7 +25,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	       xmlns:chat="org.bigbluebutton.modules.chat.views.components.*"
 	       showCloseButton="false"
 	       implements="org.bigbluebutton.common.IBbbModuleWindow" 
-	       initialize="init()"
 	       creationComplete="onCreationComplete()"
 	       xmlns:components="org.bigbluebutton.modules.chat.view.components.*" 
 		   xmlns:mate="http://mate.asfusion.com/" 
@@ -61,11 +60,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			private var dispState:String;
 			[Bindable] public var chatOptions:ChatOptions;
 			
-			[Bindable] private var baseIndex:int;
-			private function init():void{
-				baseIndex = chatOptions.baseTabIndex;
-			}
-			
 			public function getPrefferedPosition():String{
 				return chatOptions.position;
 			} 
@@ -76,11 +70,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				dispState = FlexGlobals.topLevelApplication.stage.displayState;
 				
 				hotkeyCapture();
-				titleBarOverlay.tabIndex = baseIndex;
+				titleBarOverlay.tabIndex = chatOptions.baseTabIndex;
 				
-				minimizeBtn.tabIndex = baseIndex+1;
-				maximizeRestoreBtn.tabIndex = baseIndex+2;
-				closeBtn.tabIndex = baseIndex+3;
+				minimizeBtn.tabIndex = chatOptions.baseTabIndex+1;
+				maximizeRestoreBtn.tabIndex = chatOptions.baseTabIndex+2;
+				closeBtn.tabIndex = chatOptions.baseTabIndex+3;
 
 				resourcesChanged(); // update the window controls once they've been created
 			}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
index f22cbcc4f8..18f9ca3aaf 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
@@ -99,12 +99,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			private var javaTimer:Timer;
 			
 			[Bindable] private var cursor:Sprite;
-			[Bindable] private var baseIndex:int;
 			[Bindable] private var dsOptions:DeskshareOptions;
 			
 			private function init():void {
 				dsOptions = new DeskshareOptions();
-				baseIndex = dsOptions.baseTabIndex;
 			}
 			
 			private function onCreationComplete():void {
@@ -132,12 +130,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				}
 				resourcesChanged();
 				
-				titleBarOverlay.tabIndex = baseIndex;
+				titleBarOverlay.tabIndex = dsOptions.baseTabIndex;
 				titleBarOverlay.focusEnabled = true;
-								
-				minimizeBtn.tabIndex = baseIndex+1;
-				maximizeRestoreBtn.tabIndex = baseIndex+2;
-				closeBtn.tabIndex = baseIndex+3;
 			}
 			
 			private function remoteFocus(e:ShortcutEvent):void{
@@ -409,6 +403,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		]]>
 	</mx:Script>
 
+	<dspub:TabIndexer startIndex="{dsOptions.baseTabIndex + 1}"
+					  tabIndices="{[minimizeBtn, maximizeRestoreBtn, closeBtn, btnFSPublish, btnClosePublish, btnRegionPublish]}"/>
+
 	<!--http://stackoverflow.com/questions/369120/why-does-mxstates-have-trouble-being-resolved-to-a-component-implementation-->
 	<mx:VBox id="javaHelpArea" includeInLayout="false" visible="false" height="100%" width="100%" verticalAlign="middle" horizontalAlign="center">
 		<mx:Text width="80%" textAlign="center" styleName="desktopShareTextStyle" text="{ResourceUtil.getInstance().getString('bbb.desktopPublish.chromeHint.title')}" />
@@ -426,23 +423,20 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
                                toolTip="{ResourceUtil.getInstance().getString('bbb.desktopPublish.fullscreen.tooltip')}" 
                                label="{ResourceUtil.getInstance().getString('bbb.desktopPublish.fullscreen.label')}" 
                                visible="true" 
-                               click="shareScreen(true)" 
-                               tabIndex="{baseIndex+4}"/>
+                               click="shareScreen(true)" />
                     <mx:Spacer width="100%"/>
                     <mx:Button id="btnClosePublish" 
                                toolTip="{ResourceUtil.getInstance().getString('bbb.desktopPublish.stop.tooltip')}" 
                                label="{ResourceUtil.getInstance().getString('bbb.desktopPublish.stop.label')}" 
                                visible="true" 
                                enabled="false" 
-                               click="stopSharing()" 
-                               tabIndex="{baseIndex+5}"/>
+                               click="stopSharing()" />
                     <mx:Spacer width="100%"/>
                     <mx:Button id="btnRegionPublish"
                                toolTip="{ResourceUtil.getInstance().getString('bbb.desktopPublish.region.tooltip')}" 
                                label="{ResourceUtil.getInstance().getString('bbb.desktopPublish.region.label')}" 
                                visible="true" 
                                click="shareScreen(false)" 
-                               tabIndex="{baseIndex+6}"
                                focusEnabled="false"
                                tabEnabled="false"/>
                     <mx:Spacer width="100%"/>                      
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
index d17a955645..782697a1a8 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
@@ -22,7 +22,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 <CustomMdiWindow xmlns="org.bigbluebutton.common.*" 
 	xmlns:mx="http://www.adobe.com/2006/mxml" 
-	width="600" height="400"
+	xmlns:common="org.bigbluebutton.common.*"
+    width="600" height="400"
 	initialize="init()"
 	creationComplete="onCreationComplete()"
 	implements="org.bigbluebutton.common.IBbbModuleWindow"
@@ -80,12 +81,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			private var savedY:Number;
 			private var isMaximized:Boolean = false;
 			
-			[Bindable] private var baseIndex:int;
 			[Bindable] private var dsOptions:DeskshareOptions;
 									
 			private function init():void{
 				dsOptions = new DeskshareOptions();
-				baseIndex = dsOptions.baseTabIndex;
 			}
 									
 			private function onCreationComplete():void{
@@ -105,10 +104,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				
 				resourcesChanged();
 				
-				titleBarOverlay.tabIndex = baseIndex;
-				minimizeBtn.tabIndex = baseIndex+1;
-				maximizeRestoreBtn.tabIndex = baseIndex+2;
-				closeBtn.tabIndex = baseIndex+3;
+				titleBarOverlay.tabIndex = dsOptions.baseTabIndex;
 			}
 			
 			private function onResizeEndEvent(event:MDIWindowEvent):void {
@@ -308,6 +304,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			
 		]]>
 	</mx:Script>
+
+	<common:TabIndexer startIndex="{dsOptions.baseTabIndex + 1}" tabIndices="{[minimizeBtn, maximizeRestoreBtn, closeBtn, btnActualSize]}"/>
+
 	<mx:Move id="cursorMove" target="{cursorImg}"/>
 	<mx:Image id="cursorImg" visible="false" source="@Embed('../../assets/images/cursor4.png')"/>
 		
@@ -318,7 +317,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				   selected="false"
 				   height="90%" 
 				   label="{btnActualSize.selected ? ResourceUtil.getInstance().getString('bbb.desktopView.fitToWindow') : ResourceUtil.getInstance().getString('bbb.desktopView.actualSize')}" 
-				   toolTip="{btnActualSize.selected ? ResourceUtil.getInstance().getString('bbb.desktopView.fitToWindow') : ResourceUtil.getInstance().getString('bbb.desktopView.actualSize')}" 
-				   tabIndex="{baseIndex+4}"/>
+				   toolTip="{btnActualSize.selected ? ResourceUtil.getInstance().getString('bbb.desktopView.fitToWindow') : ResourceUtil.getInstance().getString('bbb.desktopView.actualSize')}"/>
 	</mx:HBox>
 </CustomMdiWindow>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml
index 346e8537af..59dde95e8e 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml
@@ -21,6 +21,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 <mx:HBox xmlns:mx="http://www.adobe.com/2006/mxml" 
 		   creationComplete="init()" visible="{_visibleTools}"
 		   xmlns:mate="http://mate.asfusion.com/"
+		   xmlns:common="org.bigbluebutton.common.*"
 		   xmlns:views="org.bigbluebutton.modules.layout.views.*"
 		   implements="org.bigbluebutton.common.IBbbToolbarComponent">
 	
@@ -37,8 +38,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			[Bindable] private var _enableEdit:Boolean = false;
 			[Bindable] private var _visibleTools:Boolean = true;
 			
-			[Bindable] private var baseIndex:int = 110000;
-			
 			private function init():void {
 				var evt:ViewInitializedEvent = new ViewInitializedEvent();
 				evt.canvas = getMdiCanvas(parent) as MDICanvas;
@@ -76,25 +75,21 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		]]>
 	</mx:Script>
 
-	<views:LayoutsCombo id="comboBox" 
-						tabIndex="{baseIndex}"/>
+	<common:TabIndexer startIndex="110000" tabIndices="{[comboBox, addButton, saveButton, loadButton, broadcastButton, lockButton]}"/>
+	
+	<views:LayoutsCombo id="comboBox"/>
 	<views:AddButton id="addButton" 
 					 includeInLayout="{_enableEdit}" 
-					 visible="{_enableEdit}" 
-					 tabIndex="{baseIndex+1}"/>
+					 visible="{_enableEdit}"/>
 	<views:SaveButton id="saveButton" 
 					  includeInLayout="{_enableEdit}" 
-					  visible="{_enableEdit}" 
-					  tabIndex="{baseIndex+2}"/>
+					  visible="{_enableEdit}"/>
 	<views:LoadButton id="loadButton" 
 					  includeInLayout="{_enableEdit}" 
-					  visible="{_enableEdit}" 
-					  tabIndex="{baseIndex+3}"/>
+					  visible="{_enableEdit}"/>
 	<views:BroadcastButton id="broadcastButton"
-					  tabIndex="{baseIndex+4}"
 					  enabled="{!lockButton.selected}"/>
 	<views:LockButton id="lockButton"
-					  tabIndex="{baseIndex+5}"
 					  visible="false"
 					  includeInLayout="false"/>
 </mx:HBox>
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
index 6df85952c3..f45847b9fa 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
@@ -148,7 +148,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 			[Bindable] private var currentPresentation:String = "";
 			
-			[Bindable] private var baseIndex:int; 
 			[Bindable] private var presentOptions:PresentOptions;
 			
 			private var keyCombos:Object;
@@ -159,7 +158,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			
 			private function init():void{
 				presentOptions = new PresentOptions();
-				baseIndex = presentOptions.baseTabIndex;;
 			}
 			
 			private function onCreationComplete():void{
@@ -175,13 +173,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				this.addEventListener(MDIWindowEvent.RESIZE_END, onResizeEndEvent);
 				resourcesChanged();
 				
-				titleBarOverlay.tabIndex = baseIndex;
+				titleBarOverlay.tabIndex = presentOptions.baseTabIndex;
 				
-				minimizeBtn.tabIndex = baseIndex+1;
-				maximizeRestoreBtn.tabIndex = baseIndex+2;
-				closeBtn.tabIndex = baseIndex+3;
-				
-				slideView.slideLoader.tabIndex = baseIndex+4;
 				hotkeyCapture();
                 
         //Necessary now because of module loading race conditions
@@ -702,7 +695,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				var pollXY:Point = pollStartBtn.localToGlobal(new Point(pollStartBtn.width + 2, pollStartBtn.height - pollMenu.height));
 				pollMenu.x = pollXY.x;
 				pollMenu.y = pollXY.y;
-			}
+			}
 			
 			private function pollStartedHandler(e:PollStartedEvent):void {
 				// the event for this doesn't exist yet
@@ -762,51 +755,49 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			
 			private function pollShowResultHandler(e:PollShowResultEvent):void {
 				setControlBarState("presenter");
-			}
+			}
 
 		]]>
 	</mx:Script>
+	
+	<pres:TabIndexer startIndex="{presentOptions.baseTabIndex + 1}"
+					 tabIndices="{[minimizeBtn, maximizeRestoreBtn, closeBtn, slideView.slideLoader, uploadPres, pollStartBtn, backButton, btnSlideNum, forwardButton, zoomSlider, btnFitToWidth, btnFitToPage]}"/>
   	 
 	<mx:Fade id="thumbFadeIn" alphaFrom="1" alphaTo="0" duration="100" />
 	<mx:Fade id="thumbFadeOut" alphaFrom="0" alphaTo="1" duration="100" />
 
 	<views:SlideView id="slideView" width="100%" height="100%" visible="false" mouseDown="mouseDown = true"
-		mouseUp="mouseDown = false" verticalScrollPolicy="off" horizontalScrollPolicy="off" tabIndex="{baseIndex+4}"/>			    
+		mouseUp="mouseDown = false" verticalScrollPolicy="off" horizontalScrollPolicy="off"/>			    
 	<mx:ControlBar id="presCtrlBar" name="presCtrlBar" width="100%" height="{controlBarHeight}" styleName="presentationWindowControlsStyle">
 		<mx:HBox id="presenterControls" x="0" y="0" width="100%" height="100%" horizontalAlign="center">
 			<mx:Button id="uploadPres" visible="false" height="30" styleName="presentationUploadButtonStyle"
 					   toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.uploadPresBtn.toolTip')}" 
-					   click="onUploadButtonClicked()" tabIndex="{baseIndex+5}"/>
+					   click="onUploadButtonClicked()"/>
 			<mx:Button id="pollStartBtn" visible="false" height="30" styleName="pollStartButtonStyle"
 					   toolTip="{ResourceUtil.getInstance().getString('bbb.polling.startButton.tooltip')}" 
-					   click="onPollStartButtonClicked()" tabIndex="{baseIndex+6}"/>
+					   click="onPollStartButtonClicked()"/>
 			<mx:Spacer width="100%" id="spacer1"/>
 			<mx:Button id="backButton" visible="false" width="45" height="30" styleName="presentationBackButtonStyle"
-					   toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.backBtn.toolTip')}" click="gotoPreviousSlide()"
-					   tabIndex="{baseIndex+7}"/>
+					   toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.backBtn.toolTip')}" click="gotoPreviousSlide()"/>
 			<mx:Button id="btnSlideNum" visible="false" label="" click="showThumbnails()"
-					   toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.btnSlideNum.toolTip')}"
-					   tabIndex="{baseIndex+8}"/>
+					   toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.btnSlideNum.toolTip')}"/>
 			<mx:Button id="forwardButton" visible="false" width="45" height="30" styleName="presentationForwardButtonStyle"
-					   toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.forwardBtn.toolTip')}" click="gotoNextSlide()"
-					   tabIndex="{baseIndex+9}"/>    				
+					   toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.forwardBtn.toolTip')}" click="gotoNextSlide()"/>    				
 			<mx:Spacer width="50%" id="spacer3"/>
 			<mx:HSlider id="zoomSlider" visible="false" value="{slideView.zoomPercentage}" styleName="presentationZoomSliderStyle"
 						minimum="100" maximum="400" dataTipPlacement="top" labels="['100%','400%']" 
 						useHandCursor="true" snapInterval="5" allowTrackClick="true" liveDragging="true" 
 						dataTipFormatFunction="removeDecimalFromDataTip" change="onSliderZoom()" width="100"
-						tabIndex="{baseIndex+10}" accessibilityName="{ResourceUtil.getInstance().getString('bbb.presentation.slider')}"/>
+						accessibilityName="{ResourceUtil.getInstance().getString('bbb.presentation.slider')}"/>
 			<mx:Button id="btnFitToWidth" visible="false" width="30" height="30" styleName="presentationFitToWidthButtonStyle"
 					   toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.fitToWidth.toolTip')}" 
-					   click="onFitToPage(false)"
-					   tabIndex="{baseIndex+11}"/>
+					   click="onFitToPage(false)"/>
 			<mx:Button id="btnFitToPage" visible="false" width="30" height="30" styleName="presentationFitToPageButtonStyle"
 					   toolTip="{ResourceUtil.getInstance().getString('bbb.presentation.fitToPage.toolTip')}" 
-					   click="onFitToPage(true)"
-					   tabIndex="{baseIndex+12}"/>
+					   click="onFitToPage(true)"/>
 			<!-- This spacer is to prevent the whiteboard toolbar from overlapping the fit-ot-page button -->
 			<mx:Spacer width="30" height="30" id="spacer4"/>
 		</mx:HBox>
-		<mx:HBox id="pollVoteBox" x="0" y="0" width="100%" height="100%" horizontalAlign="center" />
+		<mx:HBox id="pollVoteBox" x="0" y="0" width="100%" height="100%" horizontalAlign="center" />
     </mx:ControlBar>
 </pres:CustomMdiWindow>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
index 7eefe580a6..515a4afbea 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
@@ -25,6 +25,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     xmlns:mx="http://www.adobe.com/2006/mxml" 
     xmlns:view="org.bigbluebutton.modules.whiteboard.views.*"
     xmlns:wbBtns="org.bigbluebutton.modules.whiteboard.views.buttons.*"
+	xmlns:common="org.bigbluebutton.common.*"
     xmlns:mate="http://mate.asfusion.com/" 
     creationComplete="onCreationComplete()"
     visible="{showWhiteboardToolbar}" 
@@ -115,7 +116,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			[Bindable] private var grid_icon:Class = images.grid_icon;
 			
 			[Bindable] public var wbOptions:WhiteboardOptions;
-			[Bindable] private var baseIndex:int;
 			
 			[Bindable] private var showWhiteboardToolbar:Boolean = false;
 
@@ -132,7 +132,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			
 			private function init():void{
 				wbOptions = new WhiteboardOptions();
-				baseIndex = wbOptions.baseTabIndex;
 			}
 			
       private function onCreationComplete():void {
@@ -340,39 +339,33 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		]]>
 	</mx:Script>
 	
+	<common:TabIndexer startIndex="{wbOptions.baseTabIndex}"
+					   tabIndices="{[panzoomBtn, scribbleBtn, rectangleBtn, circleBtn, triangleBtn, lineBtn, textBtn, clearBtn, undoBtn, cpik, sld]}"/>
+	
 	<!-- Now, every 'tool' has two types of identifiers, one is found in WhiteboardConstants
 	that identifies the "category" of the tool (ex. shape vs text), and the other specifies the 
 	tool itself (ex. line tool vs triangle tool, even though both are "shapes")
 	-->
     <wbBtns:PanZoomButton id="panzoomBtn" 
-    					  tabIndex="{baseIndex}" 
     					  visible="{showWhiteboardToolbar}"/>
     <mx:Spacer height="10" visible="{showWhiteboardToolbar}"/>
 	<wbBtns:ScribbleButton id="scribbleBtn" 
-						   tabIndex="{baseIndex+1}" 
 						   visible="{showWhiteboardToolbar}"/>
 	<wbBtns:RectangleButton id="rectangleBtn" 
-							tabIndex="{baseIndex+2}" 
 							visible="{showWhiteboardToolbar}"/>
 	<wbBtns:CircleButton id="circleBtn" 
-						 tabIndex="{baseIndex+3}" 
 						 visible="{showWhiteboardToolbar}"/>
 	<wbBtns:TriangleButton id="triangleBtn" 
-						   tabIndex="{baseIndex+4}" 
 						   visible="{showWhiteboardToolbar}"/>
 	<wbBtns:LineButton id="lineBtn" 
-					   tabIndex="{baseIndex+5}" 
 					   visible="{showWhiteboardToolbar}"/>
 	<wbBtns:TextButton id="textBtn" 
-					   tabIndex="{baseIndex+6}" 
 					   visible="{showWhiteboardToolbar}"/>
 		
 	<mx:Spacer height="5" visible="{showWhiteboardToolbar}"/>
 	<wbBtns:ClearButton id="clearBtn" 
-						tabIndex="{baseIndex+7}" 
 						visible="{showWhiteboardToolbar}"/>
 	<wbBtns:UndoButton id="undoBtn" 
-					   tabIndex="{baseIndex+8}" 
 					   visible="{showWhiteboardToolbar}"/>
 	
 	<mx:Spacer height="5" visible="{showWhiteboardToolbar}"/>
@@ -391,7 +384,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	<mx:ColorPicker change="changeColor(event)" id="cpik"  visible="{showWhiteboardToolbar}"
                   selectedColor="0x000000" width="30" dataProvider="{colorPickerColours}" swatchPanelStyleName="colorPickerStyle"
                   toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.color')}"
-                  tabIndex="{baseIndex+9}"
 				  accessibilityName="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.color')}"/>
    
 	<mx:Spacer height="3" visible="{showWhiteboardToolbar}"/>
@@ -400,7 +392,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				toolTip="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.thickness.accessibilityName')}" 
 				minimum="1" maximum="30" 
 				useHandCursor="true" value="2" showDataTip="true" snapInterval="1" dataTipOffset="0" labelOffset="0" 
-				tabIndex="{baseIndex+10}"
 				accessibilityName="{ResourceUtil.getInstance().getString('bbb.highlighter.toolbar.thickness.accessibilityName')}" />
 	<mx:Image source="{thin_icon}" horizontalAlign="center" width="30" visible="{showWhiteboardToolbar}"/>