Skip to content

fix for require -> requireAMD for non-CommonJS folks #454

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.

Sign up for GitHub

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

Closed
saponifi3d wants to merge 1 commit into from
Closed

fix for require -> requireAMD for non-CommonJS folks #454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shared/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ module.exports = Backbone.Model.extend({
* Initialize the `ClientRouter` on the client-side.
*/
if (!isServer) {
var ClientRouter = this.options.ClientRouter || require(defaultRouterModule);
var ClientRouter = this.options.ClientRouter || this.modelUtils._requireAMD(defaultRouterModule);
Copy link
Member

@alexindigo alexindigo Mar 26, 2015

Choose a reason for hiding this comment

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

Main problem with the signature – array + callback vs string + return.

@purusho Did it work for you in 1.0.1?

Copy link
Contributor Author

@saponifi3d saponifi3d Mar 26, 2015

Choose a reason for hiding this comment

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

hah yer too quick, yeah, i did it really quickly and went "crap, this won't work..." i renamed this to be a work in progress and added a checkbox for the task to make this a callback. i'd be realllyyy surprised if this worked at all before. This will probably require more work to get things to work, and i need to setup a requirejs env to really test.

Copy link
Member

@alexindigo alexindigo Mar 26, 2015

Choose a reason for hiding this comment

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

It worked because of this: https://github.com/rendrjs/rendr/pull/447/files#diff-a11874ca1cacb6a9ac55db82846df825L13

Copy link
Member

@alexindigo alexindigo Mar 26, 2015

Choose a reason for hiding this comment

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

Looks like we need to think it through.

Copy link
Contributor

@purusho purusho Mar 26, 2015

Choose a reason for hiding this comment

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

Yes, it was working on 1.0.1 with ClientRouter = require('app/router');.

I don't think PR is going to fix the issue


new ClientRouter({
app: this,
Expand Down