Bug 503222, check file types on drop last so that urls take priority,r=mano

dom/base/nsGlobalWindowCommands.cpp

@@ -242,11 +242,8 @@ nsSelectMoveScrollCommand::DoSelectCommand(const char *aCommandName, nsIDOMWindo
   selCont->GetCaretEnabled(&caretOn);
 
   // We allow the caret to be moved with arrow keys on any window for which
-  // the caret is enabled. In particular, this includes caret-browsing mode,
-  // but we refer to this mode again in the test condition for readability.
-  if (caretOn) {
-    // XXXndeakin P3 perhaps this should be cached
-    if (nsContentUtils::GetBoolPref("accessibility.browsewithcaret"))
+  // the caret is enabled. In particular, this includes caret-browsing mode.
+  if (caretOn || nsContentUtils::GetBoolPref("accessibility.browsewithcaret")) {
     return DoCommandBrowseWithCaretOn(aCommandName, aWindow, selCont);
   }
 

toolkit/content/tests/chrome/Makefile.in

@@ -85,6 +85,7 @@ _TEST_FILES = 	findbar_window.xul \
 		test_autocomplete4.xul \
 		test_keys.xul \
 		window_keys.xul \
+		test_showcaret.xul \
 		$(NULL)
 
 # test_panel_focus.xul won't work if the Full Keyboard Access preference is set to