From 1c79d198380247cd5545739734a13bfb2d928bd7 Mon Sep 17 00:00:00 2001 From: Paul Rouget Date: Sun, 18 Dec 2011 17:36:17 +0100 Subject: [PATCH] Bug 711737 - Orion should support all the CSS properties from CSS1, CSS2, CSS2.1 and CSS3. r=msucan --- browser/devtools/sourceeditor/orion/README | 2 + browser/devtools/sourceeditor/orion/orion.js | 54 +++++++++++++------- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/browser/devtools/sourceeditor/orion/README b/browser/devtools/sourceeditor/orion/README index 2465f87bdb2..dc332229479 100644 --- a/browser/devtools/sourceeditor/orion/README +++ b/browser/devtools/sourceeditor/orion/README @@ -13,6 +13,8 @@ Orion version: git clone from 2011-12-09 + patch for Eclipse Bug 366312 - right-clicking outside of the selection causes the caret to move https://github.com/mihaisucan/orion.client/tree/bug-366312 see https://bugs.eclipse.org/bugs/show_bug.cgi?id=366312 + + patch for Mozilla Bug 711737 - Orion should support all the CSS properties from CSS1, CSS2, CSS2.1 and CSS3 + https://bugzilla.mozilla.org/show_bug.cgi?id=711737 # License diff --git a/browser/devtools/sourceeditor/orion/orion.js b/browser/devtools/sourceeditor/orion/orion.js index 93d2681bfc6..d46b257a3c4 100644 --- a/browser/devtools/sourceeditor/orion/orion.js +++ b/browser/devtools/sourceeditor/orion/orion.js @@ -10472,24 +10472,42 @@ define(['orion/textview/annotations'], function(mAnnotations) { "while"]; var CSS_KEYWORDS = - ["color", "text-align", "text-indent", "text-decoration", - "font", "font-style", "font-family", "font-weight", "font-size", "font-variant", "line-height", - "background", "background-color", "background-image", "background-position", "background-repeat", "background-attachment", - "list-style", "list-style-image", "list-style-position", "list-style-type", - "outline", "outline-color", "outline-style", "outline-width", - "border", "border-left", "border-top", "border-bottom", "border-right", "border-color", "border-width", "border-style", - "border-bottom-color", "border-bottom-style", "border-bottom-width", - "border-left-color", "border-left-style", "border-left-width", - "border-top-color", "border-top-style", "border-top-width", - "border-right-color", "border-right-style", "border-right-width", - "padding", "padding-left", "padding-top", "padding-bottom", "padding-right", - "margin", "margin-left", "margin-top", "margin-bottom", "margin-right", - "width", "height", "left", "top", "right", "bottom", - "min-width", "max-width", "min-height", "max-height", - "display", "visibility", - "clip", "cursor", "overflow", "overflow-x", "overflow-y", "position", "z-index", - "vertical-align", "horizontal-align", - "float", "clear" + ["alignment-adjust", "alignment-baseline", "animation", "animation-delay", "animation-direction", "animation-duration", + "animation-iteration-count", "animation-name", "animation-play-state", "animation-timing-function", "appearance", + "azimuth", "backface-visibility", "background", "background-attachment", "background-clip", "background-color", + "background-image", "background-origin", "background-position", "background-repeat", "background-size", "baseline-shift", + "binding", "bleed", "bookmark-label", "bookmark-level", "bookmark-state", "bookmark-target", "border", "border-bottom", + "border-bottom-color", "border-bottom-left-radius", "border-bottom-right-radius", "border-bottom-style", "border-bottom-width", + "border-collapse", "border-color", "border-image", "border-image-outset", "border-image-repeat", "border-image-slice", + "border-image-source", "border-image-width", "border-left", "border-left-color", "border-left-style", "border-left-width", + "border-radius", "border-right", "border-right-color", "border-right-style", "border-right-width", "border-spacing", "border-style", + "border-top", "border-top-color", "border-top-left-radius", "border-top-right-radius", "border-top-style", "border-top-width", + "border-width", "bottom", "box-align", "box-decoration-break", "box-direction", "box-flex", "box-flex-group", "box-lines", + "box-ordinal-group", "box-orient", "box-pack", "box-shadow", "box-sizing", "break-after", "break-before", "break-inside", + "caption-side", "clear", "clip", "color", "color-profile", "column-count", "column-fill", "column-gap", "column-rule", + "column-rule-color", "column-rule-style", "column-rule-width", "column-span", "column-width", "columns", "content", "counter-increment", + "counter-reset", "crop", "cue", "cue-after", "cue-before", "cursor", "direction", "display", "dominant-baseline", + "drop-initial-after-adjust", "drop-initial-after-align", "drop-initial-before-adjust", "drop-initial-before-align", "drop-initial-size", + "drop-initial-value", "elevation", "empty-cells", "fit", "fit-position", "float", "float-offset", "font", "font-family", "font-size", + "font-size-adjust", "font-stretch", "font-style", "font-variant", "font-weight", "grid-columns", "grid-rows", "hanging-punctuation", + "height", "hyphenate-after", "hyphenate-before", "hyphenate-character", "hyphenate-lines", "hyphenate-resource", "hyphens", "icon", + "image-orientation", "image-rendering", "image-resolution", "inline-box-align", "left", "letter-spacing", "line-height", + "line-stacking", "line-stacking-ruby", "line-stacking-shift", "line-stacking-strategy", "list-style", "list-style-image", + "list-style-position", "list-style-type", "margin", "margin-bottom", "margin-left", "margin-right", "margin-top", "mark", "mark-after", + "mark-before", "marks", "marquee-direction", "marquee-loop", "marquee-play-count", "marquee-speed", "marquee-style", "max-height", + "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index", "nav-left", "nav-right", "nav-up", "opacity", "orphans", + "outline", "outline-color", "outline-offset", "outline-style", "outline-width", "overflow", "overflow-style", "overflow-x", + "overflow-y", "padding", "padding-bottom", "padding-left", "padding-right", "padding-top", "page", "page-break-after", "page-break-before", + "page-break-inside", "page-policy", "pause", "pause-after", "pause-before", "perspective", "perspective-origin", "phonemes", "pitch", + "pitch-range", "play-during", "position", "presentation-level", "punctuation-trim", "quotes", "rendering-intent", "resize", + "rest", "rest-after", "rest-before", "richness", "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang", "ruby-position", + "ruby-span", "size", "speak", "speak-header", "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set", "table-layout", + "target", "target-name", "target-new", "target-position", "text-align", "text-align-last", "text-decoration", "text-emphasis", + "text-height", "text-indent", "text-justify", "text-outline", "text-shadow", "text-transform", "text-wrap", "top", "transform", + "transform-origin", "transform-style", "transition", "transition-delay", "transition-duration", "transition-property", + "transition-timing-function", "unicode-bidi", "vertical-align", "visibility", "voice-balance", "voice-duration", "voice-family", + "voice-pitch", "voice-pitch-range", "voice-rate", "voice-stress", "voice-volume", "volume", "white-space", "white-space-collapse", + "widows", "width", "word-break", "word-spacing", "word-wrap", "z-index" ]; // Scanner constants