diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp index 6e638ee218e..c6b95d45f46 100644 --- a/mozilla/content/events/src/nsEventStateManager.cpp +++ b/mozilla/content/events/src/nsEventStateManager.cpp @@ -1386,9 +1386,8 @@ nsEventStateManager::PostHandleEvent(nsIPresContext* aPresContext, case NS_MOUSE_MIDDLE_BUTTON_UP: case NS_MOUSE_RIGHT_BUTTON_UP: { - ret = CheckForAndDispatchClick(aPresContext, (nsMouseEvent*)aEvent, aStatus); - SetContentState(nsnull, NS_EVENT_STATE_ACTIVE); + ret = CheckForAndDispatchClick(aPresContext, (nsMouseEvent*)aEvent, aStatus); nsCOMPtr shell; nsresult rv = aPresContext->GetShell(getter_AddRefs(shell)); if (NS_SUCCEEDED(rv) && shell){ diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp index 1a171b62ec3..3f4fe4a0d32 100644 --- a/mozilla/content/html/style/src/nsCSSParser.cpp +++ b/mozilla/content/html/style/src/nsCSSParser.cpp @@ -1376,10 +1376,8 @@ static PRBool IsPseudoClass(const nsIAtom* aAtom) (nsCSSAtoms::lastChildPseudo == aAtom) || (nsCSSAtoms::lastNodePseudo == aAtom) || (nsCSSAtoms::linkPseudo == aAtom) || - (nsCSSAtoms::outOfDatePseudo == aAtom) || (nsCSSAtoms::rootPseudo == aAtom) || (nsCSSAtoms::xblBoundElementPseudo == aAtom) || - (nsCSSAtoms::outOfDatePseudo == aAtom) || (nsCSSAtoms::visitedPseudo == aAtom)); } diff --git a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp index 88d1e66d931..3c5990da576 100644 --- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp @@ -2871,7 +2871,6 @@ static PRBool IsEventPseudo(nsIAtom* aAtom) static PRBool IsLinkPseudo(nsIAtom* aAtom) { return PRBool ((nsCSSAtoms::linkPseudo == aAtom) || - (nsCSSAtoms::outOfDatePseudo == aAtom) || (nsCSSAtoms::visitedPseudo == aAtom)); } @@ -2967,7 +2966,7 @@ static PRBool SelectorMatches(SelectorMatchesData &data, if ((localTrue == result) && (nsnull != aSelector->mPseudoClassList)) { // test for pseudo class match - // first-child, root, lang, active, focus, hover, link, outOfDate, visited + // first-child, root, lang, active, focus, hover, link, visited... // XXX disabled, enabled, selected, selection nsAtomList* pseudoClass = aSelector->mPseudoClassList; @@ -3061,9 +3060,6 @@ static PRBool SelectorMatches(SelectorMatchesData &data, if (nsCSSAtoms::linkPseudo == pseudoClass->mAtom) { result = PRBool(localTrue == (eLinkState_Unvisited == data.mLinkState)); } - else if (nsCSSAtoms::outOfDatePseudo == pseudoClass->mAtom) { - result = PRBool(localTrue == (eLinkState_OutOfDate == data.mLinkState)); - } else if (nsCSSAtoms::visitedPseudo == pseudoClass->mAtom) { result = PRBool(localTrue == (eLinkState_Visited == data.mLinkState)); } @@ -3698,7 +3694,6 @@ PRBool IsStateSelector(nsCSSSelector& aSelector) (pseudoClass->mAtom == nsCSSAtoms::focusPseudo) || (pseudoClass->mAtom == nsCSSAtoms::hoverPseudo) || (pseudoClass->mAtom == nsCSSAtoms::linkPseudo) || - (pseudoClass->mAtom == nsCSSAtoms::outOfDatePseudo) || (pseudoClass->mAtom == nsCSSAtoms::selectionPseudo) || (pseudoClass->mAtom == nsCSSAtoms::visitedPseudo)) { return PR_TRUE; diff --git a/mozilla/content/shared/public/nsCSSAtomList.h b/mozilla/content/shared/public/nsCSSAtomList.h index c5aa8f806f3..d02ed5be1f9 100644 --- a/mozilla/content/shared/public/nsCSSAtomList.h +++ b/mozilla/content/shared/public/nsCSSAtomList.h @@ -69,8 +69,6 @@ CSS_ATOM(menuPseudo, ":menu") CSS_ATOM(notPseudo, ":not") -CSS_ATOM(outOfDatePseudo, ":out-of-date") - CSS_ATOM(rootPseudo, ":root") CSS_ATOM(xblBoundElementPseudo, ":-moz-bound-element") diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 7bd292fbc4d..cfdb1bc64a6 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -856,8 +856,6 @@ nsWebShell::GetLinkState(const char* aLinkURI, nsLinkState& aState) NS_ERROR_FAILURE); if (isVisited) aState = eLinkState_Visited; - - // XXX how to tell if eLinkState_OutOfDate? } return NS_OK; diff --git a/mozilla/editor/composer/src/res/EditorOverride.css b/mozilla/editor/composer/src/res/EditorOverride.css index d90a73816ea..0686b50d28d 100644 --- a/mozilla/editor/composer/src/res/EditorOverride.css +++ b/mozilla/editor/composer/src/res/EditorOverride.css @@ -28,7 +28,7 @@ */ /* Override the browser's pointer cursor over links */ -a:link, a:visited, a:active, a:out-of-date { +a:link, a:visited, a:active { cursor: text; } @@ -37,7 +37,7 @@ a:link, a:visited, a:active, a:out-of-date { represents the named anchor */ a:link img, a:visited img, a:active img, -a:out-of-date img, img[usemap], +img[usemap], object[usemap], a[name] { cursor: default; @@ -47,7 +47,7 @@ a:link img, a:visited img, a:active { -moz-user-input: none; } -a:visited, a:active, a:out-of-date { +a:visited, a:activez { cursor: text; color : inherit; -moz-user-input: none; diff --git a/mozilla/editor/ui/composer/content/EditorOverride.css b/mozilla/editor/ui/composer/content/EditorOverride.css index d90a73816ea..0686b50d28d 100644 --- a/mozilla/editor/ui/composer/content/EditorOverride.css +++ b/mozilla/editor/ui/composer/content/EditorOverride.css @@ -28,7 +28,7 @@ */ /* Override the browser's pointer cursor over links */ -a:link, a:visited, a:active, a:out-of-date { +a:link, a:visited, a:active { cursor: text; } @@ -37,7 +37,7 @@ a:link, a:visited, a:active, a:out-of-date { represents the named anchor */ a:link img, a:visited img, a:active img, -a:out-of-date img, img[usemap], +img[usemap], object[usemap], a[name] { cursor: default; @@ -47,7 +47,7 @@ a:link img, a:visited img, a:active { -moz-user-input: none; } -a:visited, a:active, a:out-of-date { +a:visited, a:activez { cursor: text; color : inherit; -moz-user-input: none; diff --git a/mozilla/editor/ui/composer/content/editor.xul b/mozilla/editor/ui/composer/content/editor.xul index 162b5706c80..6867aba67df 100644 --- a/mozilla/editor/ui/composer/content/editor.xul +++ b/mozilla/editor/ui/composer/content/editor.xul @@ -71,7 +71,7 @@ - + @@ -84,7 +84,8 @@ - + + @@ -95,13 +96,16 @@ --> - + - + + + + diff --git a/mozilla/editor/ui/composer/content/editorOverlay.xul b/mozilla/editor/ui/composer/content/editorOverlay.xul index da5a57f0c08..1673829c82c 100644 --- a/mozilla/editor/ui/composer/content/editorOverlay.xul +++ b/mozilla/editor/ui/composer/content/editorOverlay.xul @@ -33,34 +33,13 @@ - - - + + + - + diff --git a/mozilla/extensions/irc/xul/content/chatzilla.xul b/mozilla/extensions/irc/xul/content/chatzilla.xul index 24a8095c05f..26ac6a67a8d 100644 --- a/mozilla/extensions/irc/xul/content/chatzilla.xul +++ b/mozilla/extensions/irc/xul/content/chatzilla.xul @@ -51,12 +51,12 @@ - +