Merge pull request #8739 from MarcelGerber/wp-docs-vendor-prefixes

redmunds · redmunds · commit 90c912e6974f · 2014-09-09T16:46:34.000-07:00
Quick Docs: Ignore vendor prefixes if needed
diff --git a/src/extensions/default/WebPlatformDocs/main.js b/src/extensions/default/WebPlatformDocs/main.js
@@ -110,6 +110,12 @@ define(function (require, exports, module) {
                 .done(function (cssDocs) {
                     // Construct inline widget (if we have docs for this property)
                     var cssPropDetails = cssDocs.PROPERTIES["css/properties/" + cssPropName];
+                    if (!cssPropDetails) {
+                        cssPropName = cssPropName.replace(/^-(webkit|moz|ms|o)-/, ""); // remove possible vendor prefixes
+                        if (cssPropName) {
+                            cssPropDetails = cssDocs.PROPERTIES["css/properties/" + cssPropName];
+                        }
+                    }
                     if (cssPropDetails) {
                         var inlineWidget = new InlineDocsViewer(cssPropName, cssPropDetails);
                         inlineWidget.load(hostEditor);
diff --git a/src/extensions/default/WebPlatformDocs/unittest-files/test1.css b/src/extensions/default/WebPlatformDocs/unittest-files/test1.css
@@ -3,4 +3,6 @@
     {{3}}does-not-exist: 0;
     /* {{5}}color: #000 */
     background: border{{4}};
-}
+    {{6}}-webkit-animation: none;
+    {{7}}-border-width: 2px;
+}
diff --git a/src/extensions/default/WebPlatformDocs/unittests.js b/src/extensions/default/WebPlatformDocs/unittests.js
@@ -139,6 +139,16 @@ define(function (require, exports, module) {
                 queryInlineAtPos(testCSSInfo, 3, false);
             });
             
+            it("should open docs for a vendor-prefixed CSS property", function () {
+                /* css -webkit- prefixed property */
+                queryInlineAtPos(testCSSInfo, 6, true, "animation");
+            });
+
+            it("should not open docs for an invalid CSS property (looking like a vendor-prefixed one)", function () {
+                /* css property invalidly prefixed */
+                queryInlineAtPos(testCSSInfo, 7, false);
+            });
+
         });
             
         describe("InlineDocsProvider parsing in HTML", function () {
diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
@@ -237,6 +237,10 @@ define(function (require, exports, module) {
                     testToken.type === "tag") {
                 propName = testToken.string;
                 offset = 0;
+            } else if (testToken.type === "meta" || testToken.string === "-") {
+                ctx.pos = testPos;
+                ctx.token = testToken;
+                return _getPropNameInfo(ctx);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,10 @@ define(function (require, exports, module) {`
`237`	`237`	`testToken.type === "tag") {`
`238`	`238`	`propName = testToken.string;`
`239`	`239`	`offset = 0;`
	`240`	`+ } else if (testToken.type === "meta" \|\| testToken.string === "-") {`
	`241`	`+ ctx.pos = testPos;`
	`242`	`+ ctx.token = testToken;`
	`243`	`+ return _getPropNameInfo(ctx);`
`240`	`244`	`}`
`241`	`245`	`}`
`242`	`246`