Fixed missed import and misspelled variable.

hslazzari · hslazzari · commit a98b604dc5aa · 2013-02-28T09:18:10.000-03:00
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
@@ -49,7 +49,6 @@ package org.bigbluebutton.modules.layout.managers
 	import org.bigbluebutton.modules.layout.model.LayoutLoader;
 	import org.bigbluebutton.modules.layout.model.WindowLayout;
 	import org.bigbluebutton.modules.layout.events.RedefineLayoutEvent;
-	import org.bigbluebutton.modules.layout.events.PopulateComboboxEvent;
 	import org.bigbluebutton.util.i18n.ResourceUtil;
 	
 	public class LayoutManager extends EventDispatcher {
@@ -85,8 +84,9 @@ package org.bigbluebutton.modules.layout.managers
 		
 		
 		public function sendPopulateComboboxEvent():void {
+			LogUtil.debug("Sending layout to populate combobox");
 			var sendLayoutsLoaded:LayoutsLoadedEvent = new LayoutsLoadedEvent(LayoutsLoadedEvent.SEND_LAYOUTS_LOADED_EVENT );
-		    sendLayoutsLoaded.layouts = _layouts;
+		    	sendLayoutsLoaded.layouts = _layouts;
 			_globalDispatcher.dispatchEvent(sendLayoutsLoaded);
 		}
 		
@@ -97,9 +97,10 @@ package org.bigbluebutton.modules.layout.managers
 		
 		
 		public function checkIfCanSendLayoutToCombobox():void {
-			LogUtil.debug("Estou tentando");
 			if(comboboxIsInitialized) {
-				_delayToSendLayoutsToCombobox.stop();
+				if(_delayToSendLayoutsToCombobox != null) {
+					_delayToSendLayoutsToCombobox.stop();
+				}
 				sendPopulateComboboxEvent();
 			}
 		}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
@@ -64,7 +64,6 @@
 			import org.bigbluebutton.util.i18n.ResourceUtil;
 			import org.bigbluebutton.modules.layout.events.LayoutEvent;
 			import org.bigbluebutton.modules.layout.events.ComboBoxCreatedEvent;
-			import org.bigbluebutton.modules.layout.events.PopulateComboboxEvent;
 			import org.bigbluebutton.modules.layout.events.LayoutsLoadedEvent;
 			import org.bigbluebutton.modules.layout.events.RedefineLayoutEvent;
 			import org.bigbluebutton.modules.layout.events.ViewInitializedEvent;
@@ -108,7 +107,7 @@
 					onApplyDefaultLayout();
 				}
 				else {
-					houldSelectedItemGoToDefaultBecauseTheEventWasLost = false;
+					shouldSelectedItemGoToDefaultBecauseTheEventWasLost = false;
 				}
 			}
 			

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,6 @@`
`64`	`64`	`import org.bigbluebutton.util.i18n.ResourceUtil;`
`65`	`65`	`import org.bigbluebutton.modules.layout.events.LayoutEvent;`
`66`	`66`	`import org.bigbluebutton.modules.layout.events.ComboBoxCreatedEvent;`
`67`		`- import org.bigbluebutton.modules.layout.events.PopulateComboboxEvent;`
`68`	`67`	`import org.bigbluebutton.modules.layout.events.LayoutsLoadedEvent;`
`69`	`68`	`import org.bigbluebutton.modules.layout.events.RedefineLayoutEvent;`
`70`	`69`	`import org.bigbluebutton.modules.layout.events.ViewInitializedEvent;`
`@@ -108,7 +107,7 @@`
`108`	`107`	`onApplyDefaultLayout();`
`109`	`108`	`}`
`110`	`109`	`else {`
`111`		`- houldSelectedItemGoToDefaultBecauseTheEventWasLost = false;`
	`110`	`+ shouldSelectedItemGoToDefaultBecauseTheEventWasLost = false;`
`112`	`111`	`}`
`113`	`112`	`}`
`114`	`113`