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

Make underscore and async globals configurable #300

Merged
merged 3 commits into from
Apr 9, 2013

Conversation

particlebanana
Copy link
Contributor

This should respect the flag in the default configuration file for globalizing underscore and async.

It also fixes the flag in waterline for globalizing models. It just needed to be moved under the collections key.

As we discussed in #295 the sails global can't be removed without breaking the controller conventions currently in use.

I didn't do anything regarding the global adapters setting because it doesn't look like its used. The adapters are attached to the sails global but the option exists in the default config file.

This should fix #299 but you may want to go through and ensure it doesn't break anything you guys are using in production apps. Let me know if you see any issues.

mikermcneil added a commit that referenced this pull request Apr 9, 2013
Make underscore and async globals configurable
@mikermcneil mikermcneil merged commit 43090f0 into balderdashy:master Apr 9, 2013
@mikermcneil
Copy link
Member

Thanks!

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

Successfully merging this pull request may close these issues.

Configurable 'globalization' of _ and async
2 participants