F2 1.1 #36

Merged
merged 30 commits into from Mar 7, 2013

Conversation

Projects
None yet
3 participants
@markhealey
Member

markhealey commented Feb 27, 2013

Pull request to track F2 1.1. Included in this release:

  • Merging previously separate Specification and F2.js versions into simultaneous releases
  • Support for AMD module loading, see #22 and #25
    • 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.
  • Adding source maps, #28
  • Fixed #24
  • More unit tests, following #23
  • Typos and other minor changes
  • Bug fixes

bentaber and others added some commits Feb 5, 2013

Remove AMD loader conflict
Reduces number of exported global vars, and lays
foundation for moving to AMD loader in future commits.
Remove requirejs from build
Not yet necessary.  Left in combined js accidentally.
Allow loading as AMD module
F2.js can be loaded as a standalone script file or via an
AMD loader like requirejs, curl, dojo require, etc.
Bundle jQuery
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.
fixing jquery/bootstrap modal bundling
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

@ghost ghost assigned markhealey Feb 27, 2013

@markhealey markhealey referenced this pull request Feb 27, 2013

Closed

AMD, jQuery bundled #25

markhealey pushed a commit that referenced this pull request Mar 7, 2013

@markhealey markhealey merged commit e8bbca1 into master Mar 7, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment