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

Play221 Update #7

Closed
wants to merge 6 commits into from
Closed

Play221 Update #7

wants to merge 6 commits into from

Conversation

nob13
Copy link
Contributor

@nob13 nob13 commented Jan 16, 2014

  • Update Play to 2.2.1
  • Update Angular.js to 1.2.8
  • Update require.js to 2.1.8

Contains a workaround to add dependency to angular.routes.

@nob13
Copy link
Contributor Author

nob13 commented Jan 20, 2014

I updated angular.js/require.js as the dependecy bug is now fixed.

@@ -8,12 +8,13 @@ define('angular', ['webjars!angular-locale_en-us.js'], function() {
return angular;
});

require(['angular', './controllers', './directives', './filters', './services'],

require(['angular', './controllers', './directives', './filters', './services', 'webjars!angular-route.js'],
Copy link
Contributor

Choose a reason for hiding this comment

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

Hey @huntc, how does just angular work? I thought the webjars! prefix was needed.

Copy link
Contributor

Choose a reason for hiding this comment

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

It is defined above:

https://github.com/typesafehub/angular-seed-play/pull/7/files#diff-f5260081ec80c28a01bd5809279dbfa4L7

I've found it good practice to do this in order to:

  • not have webjars! throughout my code (and thus keep it portable); and
  • have the module return something that makes sense rather than rely on globals throughout my code.

Copy link
Contributor

Choose a reason for hiding this comment

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

Cool. Thanks.

@jamesward
Copy link
Contributor

LGTM. @huntc?

@@ -0,0 +1,14 @@
name := "angularjs_sample"
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we please keep the name as "angular-seed-play"?

@huntc
Copy link
Contributor

huntc commented Jan 21, 2014

@nob13 Can you please squash your commits?

@nob13
Copy link
Contributor Author

nob13 commented Jan 26, 2014

I added a new pull request with squashed content.

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.

None yet

3 participants