diff --git a/devtools/client/framework/options-panel.css b/devtools/client/framework/options-panel.css index 4aad29e7b6..660a30f1b3 100644 --- a/devtools/client/framework/options-panel.css +++ b/devtools/client/framework/options-panel.css @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ :root{ - -moz-user-select: none; + user-select: none; } #options-panel-container { diff --git a/devtools/client/inspector/layout/components/Accordion.css b/devtools/client/inspector/layout/components/Accordion.css index 4076d30fa2..773b93d62a 100644 --- a/devtools/client/inspector/layout/components/Accordion.css +++ b/devtools/client/inspector/layout/components/Accordion.css @@ -20,7 +20,7 @@ padding: 5px; transition: all 0.25s ease; width: 100%; - -moz-user-select: none; + user-select: none; } .accordion ._header:hover { diff --git a/devtools/client/jsonview/css/headers-panel.css b/devtools/client/jsonview/css/headers-panel.css index 54dc4be437..8e9caa498e 100644 --- a/devtools/client/jsonview/css/headers-panel.css +++ b/devtools/client/jsonview/css/headers-panel.css @@ -29,7 +29,7 @@ padding-top: 8px; padding-bottom: 4px; font-weight: bold; - -moz-user-select: none; + user-select: none; } .headersPanelBox .netInfoParamValue { diff --git a/devtools/client/jsonview/css/toolbar.css b/devtools/client/jsonview/css/toolbar.css index b97838a72e..ae99dd15ba 100644 --- a/devtools/client/jsonview/css/toolbar.css +++ b/devtools/client/jsonview/css/toolbar.css @@ -22,7 +22,7 @@ white-space: nowrap; vertical-align: middle; cursor: pointer; - -moz-user-select: none; + user-select: none; padding: 0 2px; border-radius: 2px; } diff --git a/devtools/client/responsive.html/index.css b/devtools/client/responsive.html/index.css index c88f957776..63bccdac49 100644 --- a/devtools/client/responsive.html/index.css +++ b/devtools/client/responsive.html/index.css @@ -140,7 +140,7 @@ select > option.divider { margin: 0 0 15px 0; padding: 4px 5px; display: inline-flex; - -moz-user-select: none; + user-select: none; } #global-toolbar > .title { @@ -196,7 +196,7 @@ select > option.divider { #global-dpr-selector { margin: 0 8px; - -moz-user-select: none; + user-select: none; color: var(--viewport-color); font-size: 11px; height: 15px; @@ -295,7 +295,7 @@ select > option.divider { .browser { display: block; border: 0; - -moz-user-select: none; + user-select: none; } .browser:-moz-focusring { @@ -383,7 +383,7 @@ select > option.divider { } .viewport-dimension-separator { - -moz-user-select: none; + user-select: none; } /** diff --git a/devtools/client/shared/components/tree/tree-view.css b/devtools/client/shared/components/tree/tree-view.css index 4b4a287516..cfa2505be1 100644 --- a/devtools/client/shared/components/tree/tree-view.css +++ b/devtools/client/shared/components/tree/tree-view.css @@ -85,7 +85,7 @@ .treeTable .treeHeaderCell { cursor: pointer; - -moz-user-select: none; + user-select: none; border-bottom: 1px solid rgba(0, 0, 0, 0.2); padding: 0 !important; background: linear-gradient( diff --git a/devtools/client/shared/widgets/cubic-bezier.css b/devtools/client/shared/widgets/cubic-bezier.css index 203fe336a6..9b9e956a4e 100644 --- a/devtools/client/shared/widgets/cubic-bezier.css +++ b/devtools/client/shared/widgets/cubic-bezier.css @@ -63,7 +63,7 @@ background-size: 100% 100%, 100% 100%; background-position: -2px 5px, -2px 5px; - -moz-user-select: none; + user-select: none; } canvas.curve { diff --git a/devtools/client/shared/widgets/filter-widget.css b/devtools/client/shared/widgets/filter-widget.css index d015cb5b15..de76c222e4 100644 --- a/devtools/client/shared/widgets/filter-widget.css +++ b/devtools/client/shared/widgets/filter-widget.css @@ -16,7 +16,7 @@ } #filter-container.dragging { - -moz-user-select: none; + user-select: none; } .filters-list, @@ -96,7 +96,7 @@ } .filter-name label { - -moz-user-select: none; + user-select: none; flex-grow: 1; } diff --git a/devtools/client/shared/widgets/spectrum.css b/devtools/client/shared/widgets/spectrum.css index 46826f2e13..fab001c8ce 100644 --- a/devtools/client/shared/widgets/spectrum.css +++ b/devtools/client/shared/widgets/spectrum.css @@ -101,7 +101,7 @@ http://www.briangrinstead.com/blog/keep-aspect-ratio-with-html-and-css */ } .spectrum-dragger, .spectrum-slider { - -moz-user-select: none; + user-select: none; } .spectrum-alpha { diff --git a/devtools/client/themes/animationinspector.css b/devtools/client/themes/animationinspector.css index 6a17ca02f9..3b2567955f 100644 --- a/devtools/client/themes/animationinspector.css +++ b/devtools/client/themes/animationinspector.css @@ -275,7 +275,7 @@ body { .animation-timeline .time-header { min-height: var(--timeline-animation-height); cursor: col-resize; - -moz-user-select: none; + user-select: none; } .animation-timeline .time-header .header-item { @@ -300,7 +300,7 @@ body { } .animation-timeline .time-body .time-tick { - -moz-user-select: none; + user-select: none; position: absolute; width: 0; /* When scroll bar is shown, make it covers entire time-body */ diff --git a/devtools/client/themes/boxmodel.css b/devtools/client/themes/boxmodel.css index 5a3289faed..4b23885124 100644 --- a/devtools/client/themes/boxmodel.css +++ b/devtools/client/themes/boxmodel.css @@ -228,7 +228,7 @@ .boxmodel-editable { border: 1px dashed transparent; - -moz-user-select: text; + user-select: text; } .boxmodel-editable:hover { diff --git a/devtools/client/themes/computed.css b/devtools/client/themes/computed.css index 5c37032010..74969077c6 100644 --- a/devtools/client/themes/computed.css +++ b/devtools/client/themes/computed.css @@ -44,7 +44,7 @@ } #propertyContainer { - -moz-user-select: text; + user-select: text; overflow-y: auto; overflow-x: hidden; flex: auto; diff --git a/devtools/client/themes/markup.css b/devtools/client/themes/markup.css index 0569b7ce76..b7c3c37a89 100644 --- a/devtools/client/themes/markup.css +++ b/devtools/client/themes/markup.css @@ -20,7 +20,7 @@ } body { - -moz-user-select: none; + user-select: none; } /* Force height and width (possibly overflowing) from inline elements. @@ -359,7 +359,7 @@ ul.children + .tag-line::before { border-radius: 3px; padding: 0px 2px; margin-inline-start: 5px; - -moz-user-select: none; + user-select: none; } .markupview-events { diff --git a/devtools/client/themes/netmonitor.css b/devtools/client/themes/netmonitor.css index 901344e8c9..d15970f4f4 100644 --- a/devtools/client/themes/netmonitor.css +++ b/devtools/client/themes/netmonitor.css @@ -322,7 +322,7 @@ padding: 0 2px; margin: 0; margin-inline-end: 3px; - -moz-user-select: none; + user-select: none; } .requests-menu-transferred { diff --git a/devtools/client/themes/performance.css b/devtools/client/themes/performance.css index ff449e659a..3ce39ec4e9 100644 --- a/devtools/client/themes/performance.css +++ b/devtools/client/themes/performance.css @@ -366,7 +366,7 @@ .call-tree-item .call-tree-cell, .call-tree-item .call-tree-cell[type=function] description { - -moz-user-select: text; + user-select: text; /* so that optimizations view doesn't break the lines in call tree */ white-space: nowrap; } diff --git a/devtools/client/themes/rules.css b/devtools/client/themes/rules.css index 9055101f51..8e033ac468 100644 --- a/devtools/client/themes/rules.css +++ b/devtools/client/themes/rules.css @@ -67,7 +67,7 @@ } #pseudo-class-panel > label { - -moz-user-select: none; + user-select: none; flex-grow: 1; display: flex; align-items: center; @@ -76,7 +76,7 @@ /* Rule View Container */ #ruleview-container { - -moz-user-select: text; + user-select: text; overflow: auto; flex: auto; height: 100%; @@ -148,7 +148,7 @@ overflow: hidden; text-overflow: ellipsis; - -moz-user-select: none; + user-select: none; margin-bottom: 2px; } @@ -184,7 +184,7 @@ border-top-style: solid; border-bottom-style: solid; padding: 1px 4px; - -moz-user-select: none; + user-select: none; word-wrap: break-word; vertical-align: middle; min-height: 1.5em; diff --git a/devtools/client/themes/styleeditor.css b/devtools/client/themes/styleeditor.css index cf5b201ad3..dccd128402 100644 --- a/devtools/client/themes/styleeditor.css +++ b/devtools/client/themes/styleeditor.css @@ -322,7 +322,7 @@ h3 { margin: 20px auto; -moz-column-width: 300px; font-size: 13px; - -moz-user-select: text; + user-select: text; } .csscoverage-report-summary, diff --git a/devtools/client/themes/webconsole.css b/devtools/client/themes/webconsole.css index 89bb386283..5a3ebd7b8d 100644 --- a/devtools/client/themes/webconsole.css +++ b/devtools/client/themes/webconsole.css @@ -94,7 +94,7 @@ a { /* The red bubble that shows the number of times a message is repeated */ .message-repeats { - -moz-user-select: none; + user-select: none; flex: none; margin: 2px 6px; padding: 0 6px; @@ -161,7 +161,7 @@ a { #output-wrapper { direction: ltr; overflow: auto; - -moz-user-select: text; + user-select: text; position: relative; } diff --git a/devtools/client/webconsole/net/components/net-info-group.css b/devtools/client/webconsole/net/components/net-info-group.css index 43800019f0..a5eb865513 100644 --- a/devtools/client/webconsole/net/components/net-info-group.css +++ b/devtools/client/webconsole/net/components/net-info-group.css @@ -21,7 +21,7 @@ .netInfoBody .netInfoGroupTitle { cursor: pointer; font-weight: bold; - -moz-user-select: none; + user-select: none; cursor: pointer; padding-left: 3px; } diff --git a/devtools/server/actors/highlighters.css b/devtools/server/actors/highlighters.css index 3cc9265851..0f83c0f625 100644 --- a/devtools/server/actors/highlighters.css +++ b/devtools/server/actors/highlighters.css @@ -265,7 +265,7 @@ /* The geometry editor can be interacted with, so it needs to react to pointer events */ pointer-events: auto; - -moz-user-select: none; + user-select: none; } :-moz-native-anonymous .geometry-editor-offset-parent { @@ -408,7 +408,7 @@ font: message-box; font-size: 10px; pointer-events: none; - -moz-user-select: none; + user-select: none; box-sizing: border-box; } diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js index ffb22d2052..a8a97cfa7c 100644 --- a/devtools/shared/css/generated/properties-db.js +++ b/devtools/shared/css/generated/properties-db.js @@ -1543,30 +1543,6 @@ exports.CSS_PROPERTIES = { "write-only" ] }, - "-moz-user-select": { - "isInherited": false, - "subproperties": [ - "-moz-user-select" - ], - "supports": [], - "values": [ - "-moz-all", - "-moz-none", - "-moz-text", - "all", - "auto", - "element", - "elements", - "inherit", - "initial", - "none", - "revert", - "text", - "toggle", - "tri-state", - "unset" - ] - }, "-moz-window-dragging": { "isInherited": false, "subproperties": [ @@ -2993,7 +2969,7 @@ exports.CSS_PROPERTIES = { "-webkit-user-select": { "isInherited": false, "subproperties": [ - "-moz-user-select" + "user-select" ], "supports": [], "values": [ @@ -3391,7 +3367,7 @@ exports.CSS_PROPERTIES = { "-moz-user-focus", "-moz-user-input", "-moz-user-modify", - "-moz-user-select", + "user-select", "vector-effect", "vertical-align", "visibility", @@ -10084,6 +10060,30 @@ exports.CSS_PROPERTIES = { "unset" ] }, + "user-select": { + "isInherited": false, + "subproperties": [ + "user-select" + ], + "supports": [], + "values": [ + "-moz-all", + "-moz-none", + "-moz-text", + "all", + "auto", + "element", + "elements", + "inherit", + "initial", + "none", + "revert", + "text", + "toggle", + "tri-state", + "unset" + ] + }, "vector-effect": { "isInherited": false, "subproperties": [ diff --git a/dom/base/test/chrome/test_bug765993.html b/dom/base/test/chrome/test_bug765993.html index b297c89065..5603645cbe 100644 --- a/dom/base/test/chrome/test_bug765993.html +++ b/dom/base/test/chrome/test_bug765993.html @@ -12,7 +12,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=765993
Mozilla Bug 765993 diff --git a/dom/base/test/test_bug1101364.html b/dom/base/test/test_bug1101364.html index dfcb26a49c..c1a4fae137 100644 --- a/dom/base/test/test_bug1101364.html +++ b/dom/base/test/test_bug1101364.html @@ -11,17 +11,17 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1101364 - +-diff --git a/dom/base/test/test_user_select.html b/dom/base/test/test_user_select.html index c2b1175974..bf1683724e 100644 --- a/dom/base/test/test_user_select.html +++ b/dom/base/test/test_user_select.html @@ -12,10 +12,10 @@ src: url("Ahem.ttf"); } body { font-family: Ahem; font-size: 20px; } -s, .non-selectable { -moz-user-select: none; } +s, .non-selectable { user-select: none; } n { display: none; } a { position:absolute; bottom: 0; right:0; } -.text { -moz-user-select: text; } +.text { user-select: text; } @@ -48,7 +48,7 @@ bbbb xbbbbbbb - +diff --git a/layout/base/tests/bug1123067-2.html b/layout/base/tests/bug1123067-2.html index 0139e7ac72..2f6427922a 100644 --- a/layout/base/tests/bug1123067-2.html +++ b/layout/base/tests/bug1123067-2.html @@ -19,7 +19,7 @@ } diff --git a/layout/base/tests/bug1123067-3.html b/layout/base/tests/bug1123067-3.html index 71c6bf1a3a..f79ad28a71 100644 --- a/layout/base/tests/bug1123067-3.html +++ b/layout/base/tests/bug1123067-3.html @@ -1,5 +1,5 @@ - + diff --git a/layout/base/tests/bug968148_inner.html b/layout/base/tests/bug968148_inner.html index 7de693f73c..7e1091b88d 100644 --- a/layout/base/tests/bug968148_inner.html +++ b/layout/base/tests/bug968148_inner.html @@ -12,7 +12,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=968148 width: 20px; height: 20px; border: 1px solid black; - -moz-user-select: none; + user-select: none; } diff --git a/layout/base/tests/multi-range-user-select.html b/layout/base/tests/multi-range-user-select.html index 9da8f93986..28136f35b8 100644 --- a/layout/base/tests/multi-range-user-select.html +++ b/layout/base/tests/multi-range-user-select.html @@ -13,8 +13,8 @@ } html,body { margin:0; padding: 0; } body,pre { font-family: Ahem; font-size: 20px; } -span { -moz-user-select:none; } -x { -moz-user-select:text; } +span { user-select:none; } +x { user-select:text; } diff --git a/layout/base/tests/test_bug582771.html b/layout/base/tests/test_bug582771.html index 17781643c8..a885aab407 100644 --- a/layout/base/tests/test_bug582771.html +++ b/layout/base/tests/test_bug582771.html @@ -12,7 +12,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=582771 width: 20px; height: 20px; border: 1px solid black; - -moz-user-select: none; + user-select: none; } diff --git a/layout/base/tests/test_bug603550.html b/layout/base/tests/test_bug603550.html index 0df24f28b6..a983179b84 100644 --- a/layout/base/tests/test_bug603550.html +++ b/layout/base/tests/test_bug603550.html @@ -12,7 +12,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=603550 width: 20px; height: 20px; border: 1px solid black; - -moz-user-select: none; + user-select: none; } diff --git a/layout/reftests/forms/input/file/style.css b/layout/reftests/forms/input/file/style.css index 18be345bbe..5a7c22b251 100644 --- a/layout/reftests/forms/input/file/style.css +++ b/layout/reftests/forms/input/file/style.css @@ -15,7 +15,7 @@ vbox, hbox { word-spacing: normal; letter-spacing: normal; text-indent: 0; - -moz-user-select: text; + user-select: text; text-shadow: none; /* Copy of the type=file part of forms.css below this */ diff --git a/layout/style/TopLevelVideoDocument.css b/layout/style/TopLevelVideoDocument.css index 0f6f26749a..351ec4247e 100644 --- a/layout/style/TopLevelVideoDocument.css +++ b/layout/style/TopLevelVideoDocument.css @@ -24,7 +24,7 @@ video { margin: auto; max-width: 100%; max-height: 100%; - -moz-user-select: none; + user-select: none; } video:focus { diff --git a/layout/style/contenteditable.css b/layout/style/contenteditable.css index 2a6dbb3197..b3403925fe 100644 --- a/layout/style/contenteditable.css +++ b/layout/style/contenteditable.css @@ -10,17 +10,17 @@ } *|*:read-write :read-only { - -moz-user-select: all; + user-select: all; } *|*:read-only > :read-write { /* override the above -moz-user-select: all rule. */ - -moz-user-select: -moz-text; + user-select: -moz-text; } input:read-write > .anonymous-div:read-only, textarea:read-write > .anonymous-div:read-only { - -moz-user-select: text; + user-select: text; } /* Use default arrow over objects with size that @@ -60,7 +60,7 @@ a:link:read-write { *|*:read-write > input:read-only, *|*:read-write > button:read-only, *|*:read-write > textarea:read-only { - -moz-user-select: all; + user-select: all; -moz-user-input: auto !important; -moz-user-focus: none !important; } @@ -75,7 +75,7 @@ input[contenteditable="true"]:disabled, input[contenteditable="true"][type="checkbox"], input[contenteditable="true"][type="radio"], input[contenteditable="true"][type="file"] { - -moz-user-select: all; + user-select: all; -moz-user-input: none !important; -moz-user-focus: none !important; } @@ -96,15 +96,15 @@ input[contenteditable="true"][type="hidden"] { } label:read-write { - -moz-user-select: all; + user-select: all; } *|*::-moz-display-comboboxcontrol-frame { - -moz-user-select: text; + user-select: text; } option:read-write { - -moz-user-select: text; + user-select: text; } /* the following rules are for Image Resizing */ @@ -115,7 +115,7 @@ span[\_moz_anonclass="mozResizer"] { position: absolute; border: 1px black solid; background-color: white; - -moz-user-select: none; + user-select: none; z-index: 2147483646; /* max value -1 for this property */ } @@ -163,7 +163,7 @@ span[\_moz_anonclass="mozResizer"][anonlocation="se"] { span[\_moz_anonclass="mozResizingShadow"], img[\_moz_anonclass="mozResizingShadow"] { outline: thin dashed black; - -moz-user-select: none; + user-select: none; opacity: 0.5; position: absolute; z-index: 2147483647; /* max value for this property */ @@ -204,7 +204,7 @@ span[\_moz_anonclass="mozGrabber"] { background-image: url("resource://gre/res/grabber.gif"); background-repeat: no-repeat; background-position: center center; - -moz-user-select: none; + user-select: none; cursor: move; } @@ -220,7 +220,7 @@ a[\_moz_anonclass="mozTableAddColumnBefore"] { background-image: url("resource://gre/res/table-add-column-before.gif"); background-repeat: no-repeat; background-position: center center; - -moz-user-select: none; + user-select: none; -moz-user-focus: none !important; } @@ -242,7 +242,7 @@ a[\_moz_anonclass="mozTableAddColumnAfter"] { background-image: url("resource://gre/res/table-add-column-after.gif"); background-repeat: no-repeat; background-position: center center; - -moz-user-select: none; + user-select: none; -moz-user-focus: none !important; } @@ -264,7 +264,7 @@ a[\_moz_anonclass="mozTableRemoveColumn"] { background-image: url("resource://gre/res/table-remove-column.gif"); background-repeat: no-repeat; background-position: center center; - -moz-user-select: none; + user-select: none; -moz-user-focus: none !important; } @@ -286,7 +286,7 @@ a[\_moz_anonclass="mozTableAddRowBefore"] { background-image: url("resource://gre/res/table-add-row-before.gif"); background-repeat: no-repeat; background-position: center center; - -moz-user-select: none; + user-select: none; -moz-user-focus: none !important; } @@ -308,7 +308,7 @@ a[\_moz_anonclass="mozTableAddRowAfter"] { background-image: url("resource://gre/res/table-add-row-after.gif"); background-repeat: no-repeat; background-position: center center; - -moz-user-select: none; + user-select: none; -moz-user-focus: none !important; } @@ -330,7 +330,7 @@ a[\_moz_anonclass="mozTableRemoveRow"] { background-image: url("resource://gre/res/table-remove-row.gif"); background-repeat: no-repeat; background-position: center center; - -moz-user-select: none; + user-select: none; -moz-user-focus: none !important; } diff --git a/layout/style/res/forms.css b/layout/style/res/forms.css index a250767bab..578802dbb8 100644 --- a/layout/style/res/forms.css +++ b/layout/style/res/forms.css @@ -101,7 +101,7 @@ input { cursor: text; -moz-binding: url("chrome://global/content/platformHTMLBindings.xml#inputFields"); text-indent: 0; - -moz-user-select: text; + user-select: text; text-shadow: none; overflow-clip-box: content-box; } @@ -148,7 +148,7 @@ textarea { -moz-binding: url("chrome://global/content/platformHTMLBindings.xml#textAreas"); -moz-appearance: textfield-multiline; text-indent: 0; - -moz-user-select: text; + user-select: text; text-shadow: none; white-space: pre-wrap; word-wrap: break-word; @@ -240,7 +240,7 @@ select { text-align: start; cursor: default; box-sizing: border-box; - -moz-user-select: none; + user-select: none; -moz-appearance: menulist; border-width: 2px; border-style: inset; @@ -332,7 +332,7 @@ select:empty { color: inherit; white-space: nowrap; text-align: inherit; - -moz-user-select: none; + user-select: none; /* Make sure to size correctly if the combobox has a non-auto block-size. */ block-size: 100% ! important; box-sizing: border-box ! important; @@ -345,7 +345,7 @@ option { position: static !important; min-block-size: 1em; line-height: normal !important; - -moz-user-select: none; + user-select: none; text-indent: 0; white-space: nowrap !important; word-wrap: normal !important; @@ -379,7 +379,7 @@ optgroup { font-style: italic; font-weight: bold; font-size: inherit; - -moz-user-select: none; + user-select: none; text-indent: 0; white-space: nowrap !important; word-wrap: normal !important; @@ -399,7 +399,7 @@ optgroup:before { *|*::-moz-dropdown-list { z-index: 2147483647; background-color: inherit; - -moz-user-select: none; + user-select: none; position: static !important; float: none !important; @@ -633,7 +633,7 @@ input[type="submit"] { background-color: ButtonFace; cursor: default; box-sizing: border-box; - -moz-user-select: none; + user-select: none; -moz-binding: none; } @@ -933,7 +933,7 @@ input[type=range] { border: none; -moz-binding: none; /* we don't want any of platformHTMLBindings.xml#inputFields */ /* Prevent nsFrame::HandlePress setting mouse capture to this element. */ - -moz-user-select: none ! important; + user-select: none ! important; } input[type=range][orient=block] { @@ -986,7 +986,7 @@ input[type=range]::-moz-range-track { inline-size: 100%; block-size: 0.2em; /* Prevent nsFrame::HandlePress setting mouse capture to this element. */ - -moz-user-select: none ! important; + user-select: none ! important; } input[type=range][orient=block]::-moz-range-track { @@ -1023,7 +1023,7 @@ input[type=range]::-moz-range-progress { width: 0.2em; height: 0.2em; /* Prevent nsFrame::HandlePress setting mouse capture to this element. */ - -moz-user-select: none ! important; + user-select: none ! important; } /** @@ -1047,7 +1047,7 @@ input[type=range]::-moz-range-thumb { border-radius: 0.5em; background-color: #F0F0F0; /* Prevent nsFrame::HandlePress setting mouse capture to this element. */ - -moz-user-select: none ! important; + user-select: none ! important; } /* As a temporary workaround until bug 677302 the rule for input[type=number] diff --git a/layout/style/res/html.css b/layout/style/res/html.css index 53c88cbdc5..ba12ebabb8 100644 --- a/layout/style/res/html.css +++ b/layout/style/res/html.css @@ -706,7 +706,7 @@ spacer { } canvas { - -moz-user-select: none; + user-select: none; } /* focusable content: anything w/ tabindex >=0 is focusable, but we diff --git a/layout/style/res/ua.css b/layout/style/res/ua.css index bf32e66c56..e49c573fea 100644 --- a/layout/style/res/ua.css +++ b/layout/style/res/ua.css @@ -110,7 +110,7 @@ vertical-align: baseline; font-variant-numeric: tabular-nums; /* Prevent the element from being selected when clicking on the marker. */ - -moz-user-select: none; + user-select: none; } /* SVG documents don't always load this file but they do have links. @@ -321,7 +321,7 @@ top: 0; left: 0; right: 0; bottom: 0; /* This prevents undesired interactions with the selection code. */ - -moz-user-select: none; + user-select: none; } *|*:-moz-full-screen:not(:root)::backdrop { diff --git a/layout/style/res/viewsource.css b/layout/style/res/viewsource.css index e586dc053f..b2a3250dab 100644 --- a/layout/style/res/viewsource.css +++ b/layout/style/res/viewsource.css @@ -36,7 +36,7 @@ pre[id]:before, span[id]:before { content: counter(line) " "; counter-increment: line; - -moz-user-select: none; + user-select: none; display: inline-block; width: 5ch; margin: 0 0 0 -5ch; diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js index e8ce0190f1..6056f65464 100644 --- a/layout/style/test/property_database.js +++ b/layout/style/test/property_database.js @@ -2237,7 +2237,7 @@ var gCSSProperties = { other_values: [ "read-write", "write-only" ], invalid_values: [] }, - "-moz-user-select": { + "user-select": { domProp: "MozUserSelect", inherited: false, type: CSS_TYPE_LONGHAND, @@ -7885,8 +7885,8 @@ if (IsCSSPropertyPrefEnabled("layout.css.prefixes.webkit")) { domProp: "webkitUserSelect", inherited: false, type: CSS_TYPE_SHORTHAND_AND_LONGHAND, - alias_for: "-moz-user-select", - subproperties: [ "-moz-user-select" ], + alias_for: "user-select", + subproperties: [ "user-select" ], }; if (SupportsMaskShorthand()) { diff --git a/testing/mochitest/browser-harness.xul b/testing/mochitest/browser-harness.xul index eef6277325..5d8f2ef089 100644 --- a/testing/mochitest/browser-harness.xul +++ b/testing/mochitest/browser-harness.xul @@ -20,7 +20,7 @@ #results { margin: 5px; background-color: window; - -moz-user-select: text; + user-select: text; } #summary { diff --git a/testing/talos/talos/tests/dromaeo/lib/ext-core.js b/testing/talos/talos/tests/dromaeo/lib/ext-core.js index fdfc55db71..41f5ae175e 100644 --- a/testing/talos/talos/tests/dromaeo/lib/ext-core.js +++ b/testing/talos/talos/tests/dromaeo/lib/ext-core.js @@ -11,7 +11,7 @@ Ext.Template=function(E){var B=arguments;if(Ext.isArray(E)){E=E.join("")}else{if Ext.DomQuery=function(){var cache={},simpleCache={},valueCache={};var nonSpace=/\S/;var trimRe=/^\s+|\s+$/g;var tplRe=/\{(\d+)\}/g;var modeRe=/^(\s?[\/>+~]\s?|\s|$)/;var tagTokenRe=/^(#)?([\w-\*]+)/;var nthRe=/(\d*)n\+?(\d*)/,nthRe2=/\D/;function child(p,index){var i=0;var n=p.firstChild;while(n){if(n.nodeType==1){if(++i==index){return n}}n=n.nextSibling}return null}function next(n){while((n=n.nextSibling)&&n.nodeType!=1){}return n}function prev(n){while((n=n.previousSibling)&&n.nodeType!=1){}return n}function children(d){var n=d.firstChild,ni=-1;while(n){var nx=n.nextSibling;if(n.nodeType==3&&!nonSpace.test(n.nodeValue)){d.removeChild(n)}else{n.nodeIndex=++ni}n=nx}return this}function byClassName(c,a,v){if(!v){return c}var r=[],ri=-1,cn;for(var i=0,ci;ci=c[i];i++){if((" "+ci.className+" ").indexOf(v)!=-1){r[++ri]=ci}}return r}function attrValue(n,attr){if(!n.tagName&&typeof n.length!="undefined"){n=n[0]}if(!n){return null}if(attr=="for"){return n.htmlFor}if(attr=="class"||attr=="className"){return n.className}return n.getAttribute(attr)||n[attr]}function getNodes(ns,mode,tagName){var result=[],ri=-1,cs;if(!ns){return result}tagName=tagName||"*";if(typeof ns.getElementsByTagName!="undefined"){ns=[ns]}if(!mode){for(var i=0,ni;ni=ns[i];i++){cs=ni.getElementsByTagName(tagName);for(var j=0,ci;ci=cs[j];j++){result[++ri]=ci}}}else{if(mode=="/"||mode==">"){var utag=tagName.toUpperCase();for(var i=0,ni,cn;ni=ns[i];i++){cn=ni.children||ni.childNodes;for(var j=0,cj;cj=cn[j];j++){if(cj.nodeName==utag||cj.nodeName==tagName||tagName=="*"){result[++ri]=cj}}}}else{if(mode=="+"){var utag=tagName.toUpperCase();for(var i=0,n;n=ns[i];i++){while((n=n.nextSibling)&&n.nodeType!=1){}if(n&&(n.nodeName==utag||n.nodeName==tagName||tagName=="*")){result[++ri]=n}}}else{if(mode=="~"){for(var i=0,n;n=ns[i];i++){while((n=n.nextSibling)&&(n.nodeType!=1||(tagName=="*"||n.tagName.toLowerCase()!=tagName))){}if(n){result[++ri]=n}}}}}}return result}function concat(a,b){if(b.slice){return a.concat(b)}for(var i=0,l=b.length;i1){return nodup(results)}return results},selectNode:function(path,root){return Ext.DomQuery.select(path,root)[0]},selectValue:function(path,root,defaultValue){path=path.replace(trimRe,"");if(!valueCache[path]){valueCache[path]=Ext.DomQuery.compile(path,"select")}var n=valueCache[path](root);n=n[0]?n[0]:n;var v=(n&&n.firstChild?n.firstChild.nodeValue:null);return((v===null||v===undefined||v==="")?defaultValue:v)},selectNumber:function(path,root,defaultValue){var v=Ext.DomQuery.selectValue(path,root,defaultValue||0);return parseFloat(v)},is:function(el,ss){if(typeof el=="string"){el=document.getElementById(el)}var isArray=Ext.isArray(el);var result=Ext.DomQuery.filter(isArray?el:[el],ss);return isArray?(result.length==el.length):(result.length>0)},filter:function(els,ss,nonMatches){ss=ss.replace(trimRe,"");if(!simpleCache[ss]){simpleCache[ss]=Ext.DomQuery.compile(ss,"simple")}var result=simpleCache[ss](els);return nonMatches?quickDiff(result,els):result},matchers:[{re:/^\.([\w-]+)/,select:"n = byClassName(n, null, \" {1} \");"},{re:/^\:([\w-]+)(?:\(((?:[^\s>\/]*|.*?))\))?/,select:"n = byPseudo(n, \"{1}\", \"{2}\");"},{re:/^(?:([\[\{])(?:@)?([\w-]+)\s?(?:(=|.=)\s?['"]?(.*?)["']?)?[\]\}])/,select:"n = byAttribute(n, \"{2}\", \"{4}\", \"{3}\", \"{1}\");"},{re:/^#([\w-]+)/,select:"n = byId(n, null, \"{1}\");"},{re:/^@([\w-]+)/,select:"return {firstChild:{nodeValue:attrValue(n, \"{1}\")}};"}],operators:{"=":function(a,v){return a==v},"!=":function(a,v){return a!=v},"^=":function(a,v){return a&&a.substr(0,v.length)==v},"$=":function(a,v){return a&&a.substr(a.length-v.length)==v},"*=":function(a,v){return a&&a.indexOf(v)!==-1},"%=":function(a,v){return(a%v)==0},"|=":function(a,v){return a&&(a==v||a.substr(0,v.length+1)==v+"-")},"~=":function(a,v){return a&&(" "+a+" ").indexOf(" "+v+" ")!=-1}},pseudos:{"first-child":function(c){var r=[],ri=-1,n;for(var i=0,ci;ci=n=c[i];i++){while((n=n.previousSibling)&&n.nodeType!=1){}if(!n){r[++ri]=ci}}return r},"last-child":function(c){var r=[],ri=-1,n;for(var i=0,ci;ci=n=c[i];i++){while((n=n.nextSibling)&&n.nodeType!=1){}if(!n){r[++ri]=ci}}return r},"nth-child":function(c,a){var r=[],ri=-1;var m=nthRe.exec(a=="even"&&"2n"||a=="odd"&&"2n+1"||!nthRe2.test(a)&&"n+"+a||a);var f=(m[1]||1)-0,l=m[2]-0;for(var i=0,n;n=c[i];i++){var pn=n.parentNode;if(batch!=pn._batch){var j=0;for(var cn=pn.firstChild;cn;cn=cn.nextSibling){if(cn.nodeType==1){cn.nodeIndex=++j}}pn._batch=batch}if(f==1){if(l==0||n.nodeIndex==l){r[++ri]=n}}else{if((n.nodeIndex+l)%f==0){r[++ri]=n}}}return r},"only-child":function(c){var r=[],ri=-1;for(var i=0,ci;ci=c[i];i++){if(!prev(ci)&&!next(ci)){r[++ri]=ci}}return r},"empty":function(c){var r=[],ri=-1;for(var i=0,ci;ci=c[i];i++){var cns=ci.childNodes,j=0,cn,empty=true;while(cn=cns[j]){++j;if(cn.nodeType==1||cn.nodeType==3){empty=false;break}}if(empty){r[++ri]=ci}}return r},"contains":function(c,v){var r=[],ri=-1;for(var i=0,ci;ci=c[i];i++){if((ci.textContent||ci.innerText||"").indexOf(v)!=-1){r[++ri]=ci}}return r},"nodeValue":function(c,v){var r=[],ri=-1;for(var i=0,ci;ci=c[i];i++){if(ci.firstChild&&ci.firstChild.nodeValue==v){r[++ri]=ci}}return r},"checked":function(c){var r=[],ri=-1;for(var i=0,ci;ci=c[i];i++){if(ci.checked==true){r[++ri]=ci}}return r},"not":function(c,ss){return Ext.DomQuery.filter(c,ss,true)},"any":function(c,selectors){var ss=selectors.split("|");var r=[],ri=-1,s;for(var i=0,ci;ci=c[i];i++){for(var j=0;s=ss[j];j++){if(Ext.DomQuery.is(ci,s)){r[++ri]=ci;break}}}return r},"odd":function(c){return this["nth-child"](c,"odd")},"even":function(c){return this["nth-child"](c,"even")},"nth":function(c,a){return c[a-1]||[]},"first":function(c){return c[0]||[]},"last":function(c){return c[c.length-1]||[]},"has":function(c,ss){var s=Ext.DomQuery.select;var r=[],ri=-1;for(var i=0,ci;ci=c[i];i++){if(s(ss,ci).length>0){r[++ri]=ci}}return r},"next":function(c,ss){var is=Ext.DomQuery.is;var r=[],ri=-1;for(var i=0,ci;ci=c[i];i++){var n=next(ci);if(n&&is(n,ss)){r[++ri]=ci}}return r},"prev":function(c,ss){var is=Ext.DomQuery.is;var r=[],ri=-1;for(var i=0,ci;ci=c[i];i++){var n=prev(ci);if(n&&is(n,ss)){r[++ri]=ci}}return r}}}}();Ext.query=Ext.DomQuery.select; Ext.util.Observable=function(){if(this.listeners){this.on(this.listeners);delete this.listeners}};Ext.util.Observable.prototype={fireEvent:function(){if(this.eventsSuspended!==true){var A=this.events[arguments[0].toLowerCase()];if(typeof A=="object"){return A.fire.apply(A,Array.prototype.slice.call(arguments,1))}}return true},filterOptRe:/^(?:scope|delay|buffer|single)$/,addListener:function(A,C,B,F){if(typeof A=="object"){F=A;for(var E in F){if(this.filterOptRe.test(E)){continue}if(typeof F[E]=="function"){this.addListener(E,F[E],F.scope,F)}else{this.addListener(E,F[E].fn,F[E].scope,F[E])}}return }F=(!F||typeof F=="boolean")?{}:F;A=A.toLowerCase();var D=this.events[A]||true;if(typeof D=="boolean"){D=new Ext.util.Event(this,A);this.events[A]=D}D.addListener(C,B,F)},removeListener:function(A,C,B){var D=this.events[A.toLowerCase()];if(typeof D=="object"){D.removeListener(C,B)}},purgeListeners:function(){for(var A in this.events){if(typeof this.events[A]=="object"){this.events[A].clearListeners()}}},relayEvents:function(F,D){var E=function(G){return function(){return this.fireEvent.apply(this,Ext.combine(G,Array.prototype.slice.call(arguments,0)))}};for(var C=0,A=D.length;C0},suspendEvents:function(){this.eventsSuspended=true},resumeEvents:function(){this.eventsSuspended=false},getMethodEvent:function(G){if(!this.methodEvents){this.methodEvents={}}var F=this.methodEvents[G];if(!F){F={};this.methodEvents[G]=F;F.originalFn=this[G];F.methodName=G;F.before=[];F.after=[];var C,B,D;var E=this;var A=function(J,I,H){if((B=J.apply(I||E,H))!==undefined){if(typeof B==="object"){if(B.returnValue!==undefined){C=B.returnValue}else{C=B}if(B.cancel===true){D=true}}else{if(B===false){D=true}else{C=B}}}};this[G]=function(){C=B=undefined;D=false;var I=Array.prototype.slice.call(arguments,0);for(var J=0,H=F.before.length;J 0){this.firing=true;var G=Array.prototype.slice.call(arguments,0);for(var H=0;H =33&&D<=40)||D==this.RETURN||D==this.TAB||D==this.ESC},isSpecialKey:function(){var D=this.keyCode;return(this.type=="keypress"&&this.ctrlKey)||D==9||D==13||D==40||D==27||(D==16)||(D==17)||(D>=18&&D<=20)||(D>=33&&D<=35)||(D>=36&&D<=39)||(D>=44&&D<=45)},stopPropagation:function(){if(this.browserEvent){if(this.browserEvent.type=="mousedown"){Ext.EventManager.stoppedMouseDownEvent.fire(this)}B.stopPropagation(this.browserEvent)}},getCharCode:function(){return this.charCode||this.keyCode},getKey:function(){var D=this.keyCode||this.charCode;return Ext.isSafari?(A[D]||D):D},getPageX:function(){return this.xy[0]},getPageY:function(){return this.xy[1]},getTime:function(){if(this.browserEvent){return B.getTime(this.browserEvent)}return null},getXY:function(){return this.xy},getTarget:function(E,F,D){return E?Ext.fly(this.target).findParent(E,F,D):(D?Ext.get(this.target):this.target)},getRelatedTarget:function(){if(this.browserEvent){return B.getRelatedTarget(this.browserEvent)}return null},getWheelDelta:function(){var D=this.browserEvent;var E=0;if(D.wheelDelta){E=D.wheelDelta/120}else{if(D.detail){E=-D.detail/3}}return E},hasModifier:function(){return((this.ctrlKey||this.altKey)||this.shiftKey)?true:false},within:function(E,F){var D=this[F?"getRelatedTarget":"getTarget"]();return D&&Ext.fly(E).contains(D)},getPoint:function(){return new Ext.lib.Point(this.xy[0],this.xy[1])}};return new Ext.EventObjectImpl()}(); -(function(){var D=Ext.lib.Dom;var E=Ext.lib.Event;var A=Ext.lib.Anim;var propCache={};var camelRe=/(-[a-z])/gi;var camelFn=function(m,a){return a.charAt(1).toUpperCase()};var view=document.defaultView;Ext.Element=function(element,forceNew){var dom=typeof element=="string"?document.getElementById(element):element;if(!dom){return null}var id=dom.id;if(forceNew!==true&&id&&Ext.Element.cache[id]){return Ext.Element.cache[id]}this.dom=dom;this.id=id||Ext.id(dom)};var El=Ext.Element;El.prototype={originalDisplay:"",visibilityMode:1,defaultUnit:"px",setVisibilityMode:function(visMode){this.visibilityMode=visMode;return this},enableDisplayMode:function(display){this.setVisibilityMode(El.DISPLAY);if(typeof display!="undefined"){this.originalDisplay=display}return this},findParent:function(simpleSelector,maxDepth,returnEl){var p=this.dom,b=document.body,depth=0,dq=Ext.DomQuery,stopEl;maxDepth=maxDepth||50;if(typeof maxDepth!="number"){stopEl=Ext.getDom(maxDepth);maxDepth=10}while(p&&p.nodeType==1&&depth ch||t cb){c.scrollTop=b-ch}}c.scrollTop=c.scrollTop;if(hscroll!==false){if(el.offsetWidth>c.clientWidth||l cr){c.scrollLeft=r-c.clientWidth}}c.scrollLeft=c.scrollLeft}return this},scrollChildIntoView:function(child,hscroll){Ext.fly(child,"_scrollChildIntoView").scrollIntoView(this,hscroll)},autoHeight:function(animate,duration,onComplete,easing){var oldHeight=this.getHeight();this.clip();this.setHeight(1);setTimeout(function(){var height=parseInt(this.dom.scrollHeight,10);if(!animate){this.setHeight(height);this.unclip();if(typeof onComplete=="function"){onComplete()}}else{this.setHeight(oldHeight);this.setHeight(height,animate,duration,function(){this.unclip();if(typeof onComplete=="function"){onComplete()}}.createDelegate(this),easing)}}.createDelegate(this),0);return this},contains:function(el){if(!el){return false}return D.isAncestor(this.dom,el.dom?el.dom:el)},isVisible:function(deep){var vis=!(this.getStyle("visibility")=="hidden"||this.getStyle("display")=="none");if(deep!==true||!vis){return vis}var p=this.dom.parentNode;while(p&&p.tagName.toLowerCase()!="body"){if(!Ext.fly(p,"_isVisible").isVisible()){return false}p=p.parentNode}return true},select:function(selector,unique){return El.select(selector,unique,this.dom)},query:function(selector){return Ext.DomQuery.select(selector,this.dom)},child:function(selector,returnDom){var n=Ext.DomQuery.selectNode(selector,this.dom);return returnDom?n:Ext.get(n)},down:function(selector,returnDom){var n=Ext.DomQuery.selectNode(" > "+selector,this.dom);return returnDom?n:Ext.get(n)},initDD:function(group,config,overrides){var dd=new Ext.dd.DD(Ext.id(this.dom),group,config);return Ext.apply(dd,overrides)},initDDProxy:function(group,config,overrides){var dd=new Ext.dd.DDProxy(Ext.id(this.dom),group,config);return Ext.apply(dd,overrides)},initDDTarget:function(group,config,overrides){var dd=new Ext.dd.DDTarget(Ext.id(this.dom),group,config);return Ext.apply(dd,overrides)},setVisible:function(visible,animate){if(!animate||!A){if(this.visibilityMode==El.DISPLAY){this.setDisplayed(visible)}else{this.fixDisplay();this.dom.style.visibility=visible?"visible":"hidden"}}else{var dom=this.dom;var visMode=this.visibilityMode;if(visible){this.setOpacity(0.01);this.setVisible(true)}this.anim({opacity:{to:(visible?1:0)}},this.preanim(arguments,1),null,0.35,"easeIn",function(){if(!visible){if(visMode==El.DISPLAY){dom.style.display="none"}else{dom.style.visibility="hidden"}Ext.get(dom).setOpacity(1)}})}return this},isDisplayed:function(){return this.getStyle("display")!="none"},toggle:function(animate){this.setVisible(!this.isVisible(),this.preanim(arguments,0));return this},setDisplayed:function(value){if(typeof value=="boolean"){value=value?this.originalDisplay:"none"}this.setStyle("display",value);return this},focus:function(){try{this.dom.focus()}catch(e){}return this},blur:function(){try{this.dom.blur()}catch(e){}return this},addClass:function(className){if(Ext.isArray(className)){for(var i=0,len=className.length;i dw+scrollX){x=swapX?r.left-w:dw+scrollX-w}if(x dh+scrollY){y=swapY?r.top-h:dh+scrollY-h}if(y vr){x=vr-w;moved=true}if((y+h)>vb){y=vb-h;moved=true}if(x ";E.onAvailable(id,function(){var hd=document.getElementsByTagName("head")[0];var re=/(?: