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

Made it play nice with RequireJS powered setup. #7

Merged
merged 4 commits into from
Dec 4, 2013

Conversation

alexindigo
Copy link
Member

Take 2 on RequreJs support,
this time with smaller set of changes.

Related to rendrjs/rendr#173

/cc @jskulski

modelUtils = modelUtils || require('rendr/shared/modelUtils');
// Another lazy-loading attempt
var lazyRequire_baseView = 'rendr/shared/base/view';
var lazyRequire_modelUtils = 'rendr/shared/modelUtils';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious, this doesn't break the Require.js stuff? It needs these modules -- or is it okay, because they're already bundled by other modules that require them?

@spikebrehm
Copy link
Member

LGTM 👍

Conflicts:
	index.js
	server/layoutFinder.js
	shared/helpers.js
	shared/templateFinder.js
	test/shared/templateFinder.test.js
@alexindigo
Copy link
Member Author

@spikebrehm I merged in changes from the current master, so it would work with latest rendr.

spikebrehm pushed a commit that referenced this pull request Dec 4, 2013
Made it play nice with RequireJS powered setup.
@spikebrehm spikebrehm merged commit 4e7696e into rendrjs:master Dec 4, 2013
@spikebrehm
Copy link
Member

👍

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.

2 participants