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

AMD, jQuery bundled #25

Closed
wants to merge 15 commits into from
Closed

AMD, jQuery bundled #25

wants to merge 15 commits into from

Conversation

bentaber
Copy link
Contributor

@bentaber bentaber commented Feb 5, 2013

Allows for F2.js to be loaded as an AMD module, or not. Also permits F2 to play more nicely within existing AMD containers. jQuery is also bundled as a dependency. Plus some fixes for Docs.

/cc @brianbaker @markhealey

bentaber and others added 9 commits February 5, 2013 13:12
Reduces number of exported global vars, and lays
foundation for moving to AMD loader in future commits.
Not yet necessary.  Left in combined js accidentally.
F2.js can be loaded as a standalone script file or via an
AMD loader like requirejs, curl, dojo require, etc.
jQuery 1.8.3 is now bundled as part of F2.js.  This removes need
for containers to reference jQuery on their own.

Also calls jQuery.noConflict() when done to allow multiple
versions to coexist.
@ghost ghost assigned brianbaker Feb 5, 2013
@markhealey
Copy link
Member

Thanks, Ben. Great stuff. I'm doing some testing on the example containers and apps, and running into some script errors. I've got most of them tracked down and will add commits to this pull request.

markhealey and others added 4 commits February 6, 2013 07:30
verified that the jquery instance inside of F2 contains modals and that
the page can run a separate version of jquery and even no bootstrap at
all
@markhealey
Copy link
Member

We are close to merging this pull request into master for a 1.1 release; we need to write a few more Jasmine tests and we're working on that now.

@ghost ghost assigned markhealey Feb 27, 2013
@markhealey markhealey closed this Feb 27, 2013
@markhealey markhealey reopened this Feb 27, 2013
@markhealey markhealey mentioned this pull request Feb 27, 2013
@markhealey
Copy link
Member

This pull has been merged into 1.1-wip ahead of the 1.1 release. See #36 for specifics.

@markhealey markhealey closed this Feb 27, 2013
@markhealey markhealey mentioned this pull request Aug 9, 2013
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.

None yet

3 participants