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

Allow a base url for external links #253

Merged
merged 1 commit into from
Nov 3, 2014
Merged

Conversation

mmpestorich
Copy link
Contributor

This commit addressed issue #237 and adds the ability to specify a base url for a given data.json to be
used when constructing urls for external links. For example:

  "external": {
    "data": [
      {
        "base": "http://emberjs.com/api/",
        "json": "http://builds.emberjs.com/tags/v1.5.1/ember-docs.json"
      },
      {
        "base": "http://emberjs.com/api/",
        "json": "http://builds.emberjs.com/tags/v1.0.0-beta.6/ember-data-docs.json"
      }
    ]
  }

This is not breaking. For example, the following is still valid:

  "external": {
    "data": [
      "http://builds.emberjs.com/tags/v1.5.1/ember-docs.json"
    ]
  }

This commit adds the ability to specify a base url for a given data.json to be
used when constructing urls for external links. For example:

  external: {
    data: [
      {
        base: 'http://emberjs.com/api/',
        json: 'http://builds.emberjs.com/tags/v1.5.1/ember-docs.json'
      },
      {
	    base: 'http://emberjs.com/api/',
	    json: 'http://builds.emberjs.com/tags/v1.0.0-beta.6/ember-data-docs.json'
      }
    ]
  }

This is not breaking. For example, the following is still valid:

  external: {
    data: [
      'http://builds.emberjs.com/tags/v1.5.1/ember-docs.json'
    ]
  }
@okuryu
Copy link
Member

okuryu commented Oct 30, 2014

I just confirmed to passed tests. Looks good to me.

@caridy I'd like to merge this.

@caridy
Copy link
Member

caridy commented Oct 30, 2014

LGTM

@okuryu okuryu self-assigned this Oct 31, 2014
@yahoocla
Copy link

CLA is valid!

@okuryu okuryu merged commit 75bb9ef into yui:master Nov 3, 2014
@okuryu okuryu mentioned this pull request Nov 3, 2014
@okuryu
Copy link
Member

okuryu commented Nov 3, 2014

@mmpestorich I just merged, it will be available in the next version. Thanks for your contribution! 👍

okuryu added a commit to okuryu/yuidoc that referenced this pull request Nov 5, 2014
This feature implemented in yui#253.
okuryu added a commit to okuryu/yuidoc that referenced this pull request Nov 5, 2014
This feature implemented in yui#253.
@okuryu okuryu added this to the v0.4.0 milestone Nov 28, 2014
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