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.

Sign up for GitHub

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

Jump to bottom

Check for already-injected @font-face rules by src - Fixes #80 #82

Merged
merged 6 commits into from
Sep 16, 2016
Merged

Check for already-injected @font-face rules by src - Fixes #80 #82

merged 6 commits into from
Sep 16, 2016

Commits on Jun 5, 2016

  1. Check for already-injected @font-face rules by src - Fixes #80 

    Hey @xymostech && @jlfwong,

This changeset modifies the call to `injectStyleOnce` to use `src` as the key, rather than `fontName` [which does not need to be unique](http://fonts.googleapis.com/css?family=Inconsolata:400,700).

I added a quick test as well, let me know if you'd like it to be more thorough. You can also [see the fix in action on my cloned Aphrodite output](https://output.jsbin.com/yujaqagiho?code=%7B%0A%20%20%22test%22%3A%20%7B%0A%20%20%20%20fontFamily%3A%20%5B%7B%0A%20%20%20%20%20%20fontStyle%3A%20%22normal%22%2C%0A%20%20%20%20%20%20fontWeight%3A%20%22normal%22%2C%0A%20%20%20%20%20%20fontFamily%3A%20%22My%20Font%22%2C%0A%20%20%20%20%20%20src%3A%20%27url%28blah%29%20format%28%22woff%22%29%2C%20url%28blah%29%20format%28%22truetype%22%29%27%0A%20%20%20%20%7D%2C%20%7B%0A%20%20%20%20%20%20fontStyle%3A%20%22italic%22%2C%0A%20%20%20%20%20%20fontWeight%3A%20%22normal%22%2C%0A%20%20%20%20%20%20fontFamily%3A%20%22My%20Font%22%2C%0A%20%20%20%20%20%20src%3A%20%27url%28blahitalic%29%20format%28%22woff%22%29%2C%20url%28blahitalic%29%20format%28%22truetype%22%29%27%0A%20%20%20%20%7D%5D%0A%20%20%7D%0A%7D).
    @jdan
    jdan committed Jun 5, 2016
    Configuration menu
    Copy the full SHA
    02b2d97 View commit details
    Browse the repository at this point in the history

  2. uniquify the font-family list

    @jdan
    jdan committed Jun 5, 2016
    Configuration menu
    Copy the full SHA
    cb324a1 View commit details
    Browse the repository at this point in the history

  3. beef up tests a little more

    @jdan
    jdan committed Jun 5, 2016
    Configuration menu
    Copy the full SHA
    f89b18c View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2016

  1. Revert "beef up tests a little more" 

    This reverts commit f89b18c.
    @jdan
    jdan committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    9beb4c5 View commit details
    Browse the repository at this point in the history

  2. Revert "uniquify the font-family list" 

    This reverts commit cb324a1.
    @jdan
    jdan committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    b8e0ba8 View commit details
    Browse the repository at this point in the history

  3. Add back some better tests

    @jdan
    jdan committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    e4dd772 View commit details
    Browse the repository at this point in the history