kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-05-28 16:15:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix($location): don't initialize hash url unnecessarily

Browse Source 
After a recent refactoring using $location in the default hashbang mode would result
in hash url being initialized unnecessarily in cases when the base url didn't end
with a slash.

for example http://localhost:8000/temp.html would get rewritten as
http://location:8000/temp.html#/temp.html by error.
This commit is contained in:
Igor Minar
2013-08-12 10:34:01 -07:00
parent 04cebcc133
commit d4d34aba6e
2 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
test/ng/locationSpec.js
View File

@@ -627,7 +627,7 @@ describe('$location', function() {
);
});
it('should correctly convert html5 url with path matching basepath to hashbang url', function () {
it('should correctly convert html5 url with path matching basepath to hashbang url', function () {
initService(true, '!', false);
inject(
initBrowser('http://domain.com/base/index.html', '/base/index.html'),
@@ -1422,16 +1422,39 @@ describe('$location', function() {
describe('LocationHashbangUrl', function() {
var location;
beforeEach(function() {
location = new LocationHashbangUrl('http://server/pre/', 'http://server/pre/#/path');
});
it('should rewrite URL', function() {
location = new LocationHashbangUrl('http://server/pre/', '#');
expect(location.$$rewrite('http://other')).toEqual(undefined);
expect(location.$$rewrite('http://server/pre/')).toEqual('http://server/pre/');
expect(location.$$rewrite('http://server/pre/#otherPath')).toEqual('http://server/pre/#otherPath');
expect(location.$$rewrite('javascript:void(0)')).toEqual(undefined);
});
it("should not set hash if one was not originally specified", function() {
location = new LocationHashbangUrl('http://server/pre/index.html', '#');
location.$$parse('http://server/pre/index.html')
expect(location.url()).toBe('');
expect(location.absUrl()).toBe('http://server/pre/index.html');
});
it("should parse hash if one was specified", function() {
location = new LocationHashbangUrl('http://server/pre/index.html', '#');
location.$$parse('http://server/pre/index.html#/foo/bar')
expect(location.url()).toBe('/foo/bar');
expect(location.absUrl()).toBe('http://server/pre/index.html#/foo/bar');
});
it("should prefix hash url with / if one was originally missing", function() {
location = new LocationHashbangUrl('http://server/pre/index.html', '#');
location.$$parse('http://server/pre/index.html#not-starting-with-slash')
expect(location.url()).toBe('/not-starting-with-slash');
expect(location.absUrl()).toBe('http://server/pre/index.html#/not-starting-with-slash');
});
});