diff --git a/dom/base/nsRange.h b/dom/base/nsRange.h index cfd6055fef..e80acad24e 100644 --- a/dom/base/nsRange.h +++ b/dom/base/nsRange.h @@ -139,7 +139,7 @@ public: /** * Mark this range as being generated or not. * Currently it is used for marking ranges that are created when splitting up - * a range to exclude a -moz-user-select:none region. + * a range to exclude a user-select:none region. * @see Selection::AddItem * @see ExcludeNonSelectableNodes */ @@ -354,13 +354,13 @@ public: bool aClampToEdge, bool aFlushLayout); /** - * Scan this range for -moz-user-select:none nodes and split it up into + * Scan this range for user-select:none nodes and split it up into * multiple ranges to exclude those nodes. The resulting ranges are put - * in aOutRanges. If no -moz-user-select:none node is found in the range + * in aOutRanges. If no user-select:none node is found in the range * then |this| is unmodified and is the only range in aOutRanges. * Otherwise, |this| will be modified so that it ends before the first - * -moz-user-select:none node and additional ranges may also be created. - * If all nodes in the range are -moz-user-select:none then aOutRanges + * user-select:none node and additional ranges may also be created. + * If all nodes in the range are user-select:none then aOutRanges * will be empty. * @param aOutRanges the resulting set of ranges */ diff --git a/dom/base/test/test_user_select.html b/dom/base/test/test_user_select.html index bf1683724e..112e035751 100644 --- a/dom/base/test/test_user_select.html +++ b/dom/base/test/test_user_select.html @@ -1,7 +1,7 @@ --moz-user-select selection tests +user-select selection tests @@ -249,7 +249,7 @@ function test() // ================== shift+click tests ================= // ====================================================== - // test extending a selection that starts in a -moz-user-select:none node + // test extending a selection that starts in a user-select:none node clear(); e = document.getElementById('test2'); init([[0,0,0,1]], e); @@ -261,7 +261,7 @@ function test() checkRanges([[-1,1,1,10]], e); doneTest(e); - // test extending a selection that end in a -moz-user-select:none node + // test extending a selection that end in a user-select:none node clear(); e = document.getElementById('test3'); init([[1,0,1,1]], e); diff --git a/editor/libeditor/TextEditorDataTransfer.cpp b/editor/libeditor/TextEditorDataTransfer.cpp index 2cc2906fa0..121910b7d5 100644 --- a/editor/libeditor/TextEditorDataTransfer.cpp +++ b/editor/libeditor/TextEditorDataTransfer.cpp @@ -233,7 +233,7 @@ TextEditor::InsertFromDrop(nsIDOMEvent* aDropEvent) // Only the HTMLEditor::FindUserSelectAllNode returns a node. nsCOMPtr userSelectNode = FindUserSelectAllNode(newSelectionParent); if (userSelectNode) { - // The drop is happening over a "-moz-user-select: all" + // The drop is happening over a "user-select: all" // subtree so make sure the content we insert goes before // the root of the subtree. // diff --git a/editor/nsIContentFilter.idl b/editor/nsIContentFilter.idl index 585901ec18..c7f3ebfa5c 100644 --- a/editor/nsIContentFilter.idl +++ b/editor/nsIContentFilter.idl @@ -44,7 +44,7 @@ interface nsIContentFilter : nsISupports * approximation since the editor may need to adjust it if it deletes * the selection as part of the event and later determines that insertion * point is an empty container which should also be removed (or in other - * scenarios such as -moz-user-select:none). + * scenarios such as user-select:none). * * In some scenarios the selection will be deleted. If callers choose * to adjust the insertion point, they should be careful that the insertion diff --git a/layout/generic/Selection.h b/layout/generic/Selection.h index b20e5d7bf6..2327e212a0 100644 --- a/layout/generic/Selection.h +++ b/layout/generic/Selection.h @@ -123,7 +123,7 @@ public: nsTArray* aOutput); /** * AddItem adds aRange to this Selection. If mUserInitiated is true, - * then aRange is first scanned for -moz-user-select:none nodes and split up + * then aRange is first scanned for user-select:none nodes and split up * into multiple ranges to exclude those before adding the resulting ranges * to this Selection. */ @@ -425,7 +425,7 @@ private: SelectionType mSelectionType; /** * True if the current selection operation was initiated by user action. - * It determines whether we exclude -moz-user-select:none nodes or not, + * It determines whether we exclude user-select:none nodes or not, * as well as whether selectstart events will be fired. */ bool mUserInitiated; diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index f9a3f03cc9..bd7ecdea42 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -3443,7 +3443,7 @@ nsFrame::HandlePress(nsPresContext* aPresContext, { // A single node is selected and we aren't extending an existing // selection, which means the user clicked directly on an object (either - // -moz-user-select: all or a non-text node without children). + // user-select: all or a non-text node without children). // Therefore, disable selection extension during mouse moves. // XXX This is a bit hacky; shouldn't editor be able to deal with this? fc->SetDragState(false); @@ -4251,7 +4251,7 @@ nsIFrame::ContentOffsets nsIFrame::GetContentOffsetsFromPoint(nsPoint aPoint, adjustedFrame = AdjustFrameForSelectionStyles(this); - // -moz-user-select: all needs special handling, because clicking on it + // user-select: all needs special handling, because clicking on it // should lead to the whole frame being selected if (adjustedFrame && adjustedFrame->StyleUIReset()->mUserSelect == StyleUserSelect::All) { diff --git a/layout/style/contenteditable.css b/layout/style/contenteditable.css index b3403925fe..151ac68390 100644 --- a/layout/style/contenteditable.css +++ b/layout/style/contenteditable.css @@ -14,7 +14,7 @@ } *|*:read-only > :read-write { - /* override the above -moz-user-select: all rule. */ + /* override the above user-select: all rule. */ user-select: -moz-text; }