keep attributes that start with _op_ for use in DocPacker (#317)

dotnet · May 18, 2016 · 6e26cf4 · 6e26cf4
1 parent aa2a52d
commit 6e26cf4
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 9 deletions.
diff --git a/src/docfx.website.themes/docs.html/ManagedReference.mta.json.js b/src/docfx.website.themes/docs.html/ManagedReference.mta.json.js
@@ -56,7 +56,7 @@ exports.transform = function (model) {
     "requirements"
   ];
 
-  model = opCommon.resetKeysAndSystemAttributes(model, resetKeys);
+  model = opCommon.resetKeysAndSystemAttributes(model, resetKeys, true);
 
   // For metadata consumed by docs themes, rename with prefix "_op_"
   var metaForThemes = ["wordCount", "rawTitle"];

diff --git a/src/docfx.website.themes/docs.html/Resource.mta.json.aux.js b/src/docfx.website.themes/docs.html/Resource.mta.json.aux.js
@@ -6,7 +6,7 @@ exports.transform = function (model) {
   var resetKeys = [
     "newFileRepository"
   ];
-  model = opCommon.resetKeysAndSystemAttributes(model, resetKeys);
+  model = opCommon.resetKeysAndSystemAttributes(model, resetKeys, true);
   return {
     content: JSON.stringify(model)
   };

diff --git a/src/docfx.website.themes/docs.html/RestApi.mta.json.js b/src/docfx.website.themes/docs.html/RestApi.mta.json.js
@@ -34,7 +34,7 @@ exports.transform = function (model) {
     "sections"
   ];
 
-  model = opCommon.resetKeysAndSystemAttributes(model, resetKeys);
+  model = opCommon.resetKeysAndSystemAttributes(model, resetKeys, true);
   model._op_canonicalUrl = canonicalUrl;
   return {
     content: JSON.stringify(model)

diff --git a/src/docfx.website.themes/docs.html/conceptual.mta.json.js b/src/docfx.website.themes/docs.html/conceptual.mta.json.js
@@ -23,7 +23,7 @@ exports.transform = function (model) {
     "source",
     "newFileRepository"
   ];
-  model = opCommon.resetKeysAndSystemAttributes(model, resetKeys);
+  model = opCommon.resetKeysAndSystemAttributes(model, resetKeys, true);
 
   // For metadata consumed by docs themes, rename with prefix "_op_"
   var metaForThemes = ["wordCount", "rawTitle"];

diff --git a/src/docfx.website.themes/op.html/ManagedReference.mta.json.js b/src/docfx.website.themes/op.html/ManagedReference.mta.json.js
@@ -45,7 +45,7 @@ exports.transform = function (model) {
     "rawTitle"
   ];
 
-  model = opCommon.resetKeysAndSystemAttributes(model, resetKeys);
+  model = opCommon.resetKeysAndSystemAttributes(model, resetKeys, false);
 
   return {
     content: JSON.stringify(model)

diff --git a/src/docfx.website.themes/op.html/Resource.mta.json.aux.js b/src/docfx.website.themes/op.html/Resource.mta.json.aux.js
@@ -7,7 +7,7 @@ exports.transform = function (model) {
   var resetKeys = [
     "newFileRepository"
   ];
-  model = opCommon.resetKeysAndSystemAttributes(model, resetKeys);
+  model = opCommon.resetKeysAndSystemAttributes(model, resetKeys, false);
 
   return {
     content: JSON.stringify(model)

diff --git a/src/docfx.website.themes/op.html/conceptual.mta.json.js b/src/docfx.website.themes/op.html/conceptual.mta.json.js
@@ -16,7 +16,7 @@ exports.transform = function (model) {
     "newFileRepository"
   ];
 
-  model = opCommon.resetKeysAndSystemAttributes(model, resetKeys);
+  model = opCommon.resetKeysAndSystemAttributes(model, resetKeys, false);
 
   return {
     content: JSON.stringify(model)

diff --git a/src/docfx.website.themes/op.html/op.common.js b/src/docfx.website.themes/op.html/op.common.js
@@ -20,11 +20,17 @@ exports.removeExtension = function (path) {
   return path;
 }
 
-exports.resetKeysAndSystemAttributes = function (model, resetKeys){
+exports.resetKeysAndSystemAttributes = function (model, resetKeys, keepOpAttributes){
   return exports.batchSetProperties(
     model,
     function (key) {
-      return key.indexOf('_') === 0 || (exports.isArray(resetKeys) && resetKeys.indexOf(key) > -1);
+      if (exports.isArray(resetKeys) && resetKeys.indexOf(key) > -1) {
+        return true;
+      }
+      if (key.indexOf('_op_') === 0 && keepOpAttributes) {
+        return false;
+      }
+      return key.indexOf('_') === 0;
     },
     undefined);
 }

diff --git a/src/docfx/Template/docs.html.zip b/src/docfx/Template/docs.html.zip
diff --git a/src/docfx/Template/op.html.zip b/src/docfx/Template/op.html.zip