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

Add UMD support, fixes #10 #12

Merged
merged 8 commits into from
Sep 22, 2013
Merged

Add UMD support, fixes #10 #12

merged 8 commits into from
Sep 22, 2013

Conversation

zackbloom
Copy link
Contributor

No description provided.

@timmfin
Copy link
Member

timmfin commented Sep 22, 2013

The AMD and Common JS bits of code should have jquery as a dependency. Also, I think it makes sense to have vex dialog depend on vex too.

@zackbloom
Copy link
Contributor Author

Thanks @timmfin, any chance you can make those changes? I don't really know enough about browserify to do the jquery bit for commonjs (add a require?), and I don't know much about how AMD defines it's deps.

@adamschwartz adamschwartz mentioned this pull request Sep 22, 2013
@timmfin
Copy link
Member

timmfin commented Sep 22, 2013

Sure, I can do this. @adamschwartz do you have a buildscript for this project? If so, could you check it in so I could use it to build my changes?

Also fixed vex.dialog so that it would work under AMD (it couldn't use `vex.dialog`, it needed to refer to `dialog` instead).
* master:
  Updating combined
  grunted
  Grunt vex dialog
  Fix grunt paths
  Add package json, gruntfile, and node_modules to gitignore
  Component version to 1.2.0

Conflicts:
	js/vex.dialog.js
	js/vex.js
* origin/master:
  Compile vex.combined.min.js with grunt @tfinley
* origin/master:
  Grunt once more with feeling!

Conflicts:
	js/vex.combined.min.js
	js/vex.dialog.min.js
	js/vex.min.js
@timmfin timmfin merged commit 2e36e6e into master Sep 22, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants