Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Patch for issue #1024 (Duplicate pages created in DOM) #1456

Closed
okoskimi wants to merge 9 commits into from
Closed

Patch for issue #1024 (Duplicate pages created in DOM) #1456

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d4acf8d
Canonized urls support.
Apr 8, 2011
24b5778
Merge commit 'upstream/master'
Apr 8, 2011
01ad89c
Added missing end parenthesis
Apr 8, 2011
0bd848c
Added more complete unit tests, modified implementation comments
Apr 12, 2011
3da29da
Merge commit 'upstream/master'
Apr 12, 2011
d91c68e
Moved the modified path.clean unit tests here.
Apr 12, 2011
afc5cf0
Fixed problem with params url and added more unit tests
Apr 14, 2011
d5597db
Merge commit 'upstream/master'
Apr 14, 2011
fe93ba5
Fixed some comments
Apr 14, 2011
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
Prev Previous commit
Next Next commit
Merge commit 'upstream/master' 
Conflicts:

	js/jquery.mobile.navigation.js
	tests/unit/navigation/navigation_core.js
  • Loading branch information
Oskari Koskimies committed Apr 12, 2011
commit 3da29da31ad23cf17ddc494d6c6aaf92db5ff6e5
10 changes: 7 additions & 3 deletions js/jquery.mobile.navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@
return /\//.test(url);
},

isQuery: function( url ){
return /^\?/.test(url);
},

// There are several supported url formats, which are cleaned (converted to canonical form) in this function.
// The returned value will contain protocol and hostname part only if the url is an external url which should
// not be loaded with XHR.
Expand Down Expand Up @@ -118,11 +122,12 @@
// 3) Absolute path: example.com/a/#b/c.html + /a/ => example.com/a/# (#)
// 4) Hashed relative: example.com/a/#b/c.html + ../# => example.com/a/# (#)
// 5) Hashed absolute: example.com/a/#b/c.html + /a/# => example.com/a/# (#)
// The recommended way is hash-root (#/), because it has not depend on current url.
// The recommended way is hash-root (#/), because it does not depend on current url.
// You can of course also refer to $.mobile.firstPage using its data-url attribute
// (=== ID if not defined), e.g. "#MyFirstPageId".
// This will be handled equivalently to "#/".
// Note that the location (url bar) will always have a hash character, event when on first page.

clean: function( url ){
//console.log("clean:", url);
// Replace the protocol, host, and pathname only once at the beginning of the url to avoid
Expand Down Expand Up @@ -931,8 +936,7 @@

//prevent # urls from bubbling
//path.get() is replaced to combat abs url prefixing in IE
if( href == "#" || isCurrentPage){
//console.log("Url was:", url);
if( href == "#" ){
//for links created purely for interaction - ignore
event.preventDefault();
return;
Expand Down
157 changes: 0 additions & 157 deletions tests/unit/navigation/navigation_core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,163 +93,6 @@
}, 500);
});

test( "path.get method is working properly", function(){
window.location.hash = "foo";
same($.mobile.path.get(), "", "get method for location.hash #foo returns empty string");
same($.mobile.path.get( "#foo/bar/baz.html" ), "foo/bar/", "get method with hash arg returns path with no filename or hash prefix");
same($.mobile.path.get( "#foo/bar/baz.html/" ), "foo/bar/baz.html/", "last segment of hash is retained if followed by a trailing slash");
});

test( "path.isPath method is working properly", function(){
ok(!$.mobile.path.isPath('bar'), "anything without a slash is not a path");
ok($.mobile.path.isPath('bar/'), "anything with a slash is a path");
ok($.mobile.path.isPath('/bar'), "anything with a slash is a path");
ok($.mobile.path.isPath('a/r'), "anything with a slash is a path");
ok($.mobile.path.isPath('/'), "anything with a slash is a path");
});

test( "path.getFilePath method is working properly", function(){
same($.mobile.path.getFilePath("foo.html" + "&" + $.mobile.subPageUrlKey ), "foo.html", "returns path without sub page key");
});


test( "path.set method is working properly", function(){
$.mobile.urlHistory.ignoreNextHashChange = false;
$.mobile.path.set("foo");
same("foo", window.location.hash.replace(/^#/,""), "sets location.hash properly");
});

test( "path.makeAbsolute is working properly", function(){
$.mobile.urlHistory.ignoreNextHashChange = false;
$.mobile.path.set("bar/");
same( $.mobile.path.makeAbsolute("test.html"), "bar/test.html", "prefixes path with absolute base path from hash");
$.mobile.path.set("bar");
same( $.mobile.path.makeAbsolute("test.html"), "test.html", "returns the relative path unaltered for non path hash");
});

test( "path.clean is working properly", function(){

$.testHelper.openPage("#data-url-tests/data-url.html");

var localroot = location.protocol + "//" + location.host + location.pathname,
remoteroot = "http://google.com/",
fakepath = "#foo/bar/baz.html",
pathWithParam = localroot + "bar?baz=" + localroot,
localpath = localroot + fakepath,
remotepath = remoteroot + fakepath,
relpath1 = "../foo.html",
relpath2 = "../foo/bar.html",
relpath3 = "../../foo/bar.html",
abspath1 = "/foo/bar.html",
abspath2 = location.pathname + "foo/bar.html",
hrelpath1 = "#foo.html",
hrelpath2 = "#foo/bar.html",
hrelpath3 = "#../../foo/bar.html",
hrootpath1 = "#/foo.html",
hrootpath2 = "#/foo/bar.html",
hrootpath3 = "#/../../foo/bar.html",
hashedrel1 = "../foo/#bar.html",
hashedrel2 = "../#foo/bar.html",
hashedabs1 = "/foo/#bar.html",
hashedabs2 = location.pathname + "#foo/bar.html",
segments = location.pathname.split("/"),
uppath = "#",
i;

// pathname ends and begins with slash, so first and last elements are empty
for (i=0; i<segments.length-2; i++) {
uppath += "../"
}
// We are in a subdirectory, so one more ..
uppath += "foo/bar.html";

same( $.mobile.path.clean( localpath ), fakepath,
"removes location protocol, host, port, pathname from same-domain path");
same( $.mobile.path.clean( pathWithParam ), "#bar?baz=" + localroot,
"doesn't remove params with localroot value");
// relative
same( $.mobile.path.clean( relpath1 ), "#foo.html",
".. removed from current path, no dirs left");
same( $.mobile.path.clean( relpath2 ), "#foo/bar.html",
".. removed from current path, one dir left");
same( $.mobile.path.clean( relpath3 ), "#../foo/bar.html",
".. removed from current path, one .. still left");
// hash-relative
same( $.mobile.path.clean( hrelpath1 ), "#foo.html",
"hash-relative path stays the same 1");
same( $.mobile.path.clean( hrelpath2 ), "#foo/bar.html",
"hash-relative path stays the same 2");
same( $.mobile.path.clean( hrelpath3 ), "#../../foo/bar.html",
"hash-relative path stays the same 3");
// hash-root
same( $.mobile.path.clean( hrootpath1 ), "#foo.html",
"hash-absolute path stays the same minus leading slash 1");
same( $.mobile.path.clean( hrootpath2 ), "#foo/bar.html",
"hash-absolute path stays the same minus leading slash 2");
same( $.mobile.path.clean( hrootpath3 ), "#../../foo/bar.html",
"hash-absolute path stays the same minus leading slash 3");
// absolute
same( $.mobile.path.clean( abspath1 ), uppath,
"absolute path above localroot");
same( $.mobile.path.clean( abspath2 ), "#foo/bar.html",
"absolute path below localroot");
// hashed relative
same( $.mobile.path.clean( hashedrel1 ),
location.protocol + "//" + location.host + location.pathname + "foo/#bar.html",
"hashed relative, different path: returns full url");
same( $.mobile.path.clean( hashedrel2 ), "#foo/bar.html",
"hashed relative, same path: returns hash-relative path");
// hashed absolute
same( $.mobile.path.clean( hashedabs1 ),
location.protocol + "//" + location.host + "/foo/#bar.html",
"hashed absolute, different path: return full url");
same( $.mobile.path.clean( hashedabs2 ), "#foo/bar.html",
"hashed absolute, same path: returns hash-relative path");
// hashed host-absolute
same( $.mobile.path.clean( location.protocol + "//" + location.host + hashedabs1 ),
location.protocol + "//" + location.host + "/foo/#bar.html",
"hashed host-absolute, different path: return full url");
same( $.mobile.path.clean( location.protocol + "//" + location.host + hashedabs2 ),
"#foo/bar.html",
"hashed host-absolute, same path: return hash-relative path");
same( $.mobile.path.clean( remotepath ), remotepath,
"Hashed host-absolute, different host: return full url");
});

test( "path.stripHash is working properly", function(){
same( $.mobile.path.stripHash( "#bar" ), "bar", "returns a hash without the # prefix");
});

test( "path.hasProtocol is working properly", function(){
same( $.mobile.path.hasProtocol( "tel:5559999" ), true, "value in tel protocol format has protocol" );
same( $.mobile.path.hasProtocol( location.href ), true, "location href has protocol" );
same( $.mobile.path.hasProtocol( "foo/bar/baz.html" ), false, "simple directory path has no protocol" );
same( $.mobile.path.hasProtocol( "file://foo/bar/baz.html" ), true, "simple directory path with file:// has protocol" );
});

test( "path.isRelative is working properly", function(){
same( $.mobile.path.isRelative("#foo/bar"), false, "path starting with a # is not relative" );
same( $.mobile.path.isRelative("/foo/bar"), false, "path starting with a / is not relative" );
same( $.mobile.path.isRelative("http://example.com/foo"), false, "full url path is not relative" );
same( $.mobile.path.isRelative("foo/bar.html"), true, "simple path is relative" );
});

test( "path.isExternal is working properly", function(){
same( $.mobile.path.isExternal( location.href ), false, "same domain is not external" );
same( $.mobile.path.isExternal( "http://example.com" ), true, "example.com is external" );
same($.mobile.path.isExternal("mailto:"), true, "mailto protocol");
same($.mobile.path.isExternal("http://foo.com"), true, "http protocol");
same($.mobile.path.isExternal("http://www.foo.com"), true, "http protocol with www");
same($.mobile.path.isExternal("tel:16178675309"), true, "tel protocol");
same($.mobile.path.isExternal("foo.html"), false, "filename");
same($.mobile.path.isExternal("foo/foo/foo.html"), false, "file path");
same($.mobile.path.isExternal("../../index.html"), false, "relative parent path");
same($.mobile.path.isExternal("/foo"), false, "root-relative path");
same($.mobile.path.isExternal("foo"), false, "simple string");
same($.mobile.path.isExternal("#foo"), false, "local id reference");
});


test( "urlHistory is working properly", function(){

//urlHistory
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.