Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rest api - support allOf to merge #427

Merged
merged 3 commits into from
Jun 24, 2016
Merged

Conversation

hellosnow
Copy link
Contributor

Fix #360 , merge 'allOf' in templates

@vwxyzh @ansyral @chenkennt @superyyrrzz @qinezh

@vwxyzh
Copy link
Contributor

vwxyzh commented Jun 24, 2016

👍

@@ -19,6 +19,7 @@ exports.transform = function (model) {
child.footer = child.footer || ''; // set to empty incase mustache looks up

formatExample(child.responses);
resolveAllOf(model.children[i]);
Copy link
Contributor

@qinezh qinezh Jun 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

replace with child for consistency? #Closed

// find 'allOf' array and process
processAllOfArray(obj[key], obj);
// set 'allOf' to undefined
obj[key] = undefined;
Copy link
Contributor

@qinezh qinezh Jun 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about removing "allOf" other than setting it to undefined? #Resolved

@qinezh
Copy link
Contributor

qinezh commented Jun 24, 2016

    return obj;

No need to return obj? Since you already updated it in the function. #Resolved


Refers to: src/docfx.website.themes/default/RestApi.common.js:146 in 842dd50. [](commit_id = 842dd50, deletion_comment = False)

@qinezh
Copy link
Contributor

qinezh commented Jun 24, 2016

:shipit:

@hellosnow hellosnow merged commit 7aebafb into dotnet:dev Jun 24, 2016
@hellosnow hellosnow deleted the supportAllOf branch June 24, 2016 08:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants