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

Merge in upstream #773

Closed
wants to merge 5 commits into from
Closed

Merge in upstream #773

wants to merge 5 commits into from

Commits on Aug 20, 2015

  1. Make the fix for jazzband#591 even more focused

    When we undefine the entire window.define, modules loaded asynchronously
    can randomly fail to register themselves. However, jQuery 2+ checks for
    define.amd before registering itself as an AMD module, not just define.
    So, by unsetting window.define.amd instead of window.define, we don't
    break define() for other modules and we still prevent the page-global
    jQuery from registering itself as an AMD module, which was the ultimate
    goal of jazzband#591.
    Eric Petersen committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    b7d4964 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2015

  1. Merge pull request #1 from peap/master

    Confirming merge.
    NightwingOfGotham committed Aug 31, 2015
    Configuration menu
    Copy the full SHA
    ebb3058 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2015

  1. Better name for the define.amd backup

    Eric Petersen committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    17aac98 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2 from peap/master

    Better name for the define.amd backup
    Eric Petersen committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    fd3bcf4 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'upstream/master'

    Eric Petersen committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    f315de8 View commit details
    Browse the repository at this point in the history