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

No longer reading the URL parameter if the config specifies a main module #15

Closed
wants to merge 2 commits into from

Conversation

divdavem
Copy link
Member

This pull request changes the order in which configurations are merged. If a main module is already defined (either in the packaged configuration, or in the script tag configuration), the URL parameter is now ignored (i.e. what's after the question mark is not interpreted as the main module).
Said in another way, this means that the URL parameter is now interpreted as the main module only if the configuration (after merging both the packaged one or the one from the script tag) does not specify a main module.
This solves an issue in the integration of noder-js with Aria Templates when using the Aria Templates CDN:

Note that if you use a question mark to pass parameters to the CDN (for example dev or skin), they are currently also interpreted by noder-js as the main file to be executed (instead of the default aria/bootstrap file).

This pull request also contains a small unrelated commit which changes the way the error handler is called (to be more intuitive).

Instead of calling it with the error as the scope, it is now called with
the error as a parameter, which is more intuitive.
@flongo
Copy link
Collaborator

flongo commented Jun 12, 2014

Both commits looks fine to me! You can integrate.

@flongo flongo self-assigned this Jun 12, 2014
@divdavem
Copy link
Member Author

Integrated in master as commits 3c6266b and 6ab79c1

@divdavem divdavem closed this Jun 12, 2014
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