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

minimal changes to upgrade to angular.js 1.3.8 the prophetic narwhal #56

Merged
merged 2 commits into from Jan 12, 2015

Conversation

pedantix
Copy link

  1. upgraded the angular libraries from 1.2.X to release edge which is 1.3.8
  2. tested the example project both with jasmine/test'em and protractor
  3. there was one incompatibility in the router's html5 settings there were two solutions however the route seemed to change the code the lease by not setting a base URL.

@searls
Copy link
Member

searls commented Jan 12, 2015

@davemo does this look good?

@@ -1,6 +1,6 @@
angular.module("app").config(function($routeProvider, $locationProvider) {

$locationProvider.html5Mode(true);
$locationProvider.html5Mode({enabled:true, requireBase: false});
Copy link
Member

Choose a reason for hiding this comment

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

I think it would make more sense to add the required <base href="/"> to pages/index.us instead of switching this off. :)

@davemo
Copy link
Member

davemo commented Jan 12, 2015

If you can make the change to pages/index.us it looks good @pedantix :)

@pedantix
Copy link
Author

@davemo I am on it

On Jan 12, 2015, at 10:26 AM, David Mosher notifications@github.com wrote:

If you can make the change to pages/index.us it looks good @pedantix https://github.com/pedantix :)


Reply to this email directly or view it on GitHub #56 (comment).

@davemo
Copy link
Member

davemo commented Jan 12, 2015

Looks good, thanks @pedantix :)

davemo added a commit that referenced this pull request Jan 12, 2015
minimal changes to upgrade to angular.js 1.3.8 the prophetic narwhal
@davemo davemo merged commit b8d9218 into linemanjs:master Jan 12, 2015
@pedantix
Copy link
Author

Thanks @davemo I am looking forward to learning angular on lineman

On Jan 12, 2015, at 11:14 AM, David Mosher notifications@github.com wrote:

Looks good, thanks @pedantix https://github.com/pedantix :)


Reply to this email directly or view it on GitHub #56 (comment).

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