Skip to content

Update path.js #90

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update path.js #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
88 changes: 44 additions & 44 deletions path.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
var Path = {
'version': "0.8.4",
'map': function (path) {
version: '0.8.4',
map: function (path) {
if (Path.routes.defined.hasOwnProperty(path)) {
return Path.routes.defined[path];
} else {
return new Path.core.route(path);
}
},
'root': function (path) {
root: function (path) {
Path.routes.root = path;
},
'rescue': function (fn) {
rescue: function (fn) {
Path.routes.rescue = fn;
},
'history': {
'initial':{}, // Empty container for "Initial Popstate" checking variables.
'pushState': function(state, title, path){
if(Path.history.supported){
if(Path.dispatch(path)){
history: {
initial:{}, // Empty container for "Initial Popstate" checking variables.
pushState: function(state, title, path) {
if (Path.history.supported) {
if (Path.dispatch(path)) {
history.pushState(state, title, path);
}
} else {
if(Path.history.fallback){
window.location.hash = "#" + path;
if(Path.history.fallback) {
window.location.hash = '#' + path;
}
}
},
'popState': function(event){
popState: function(event) {
var initialPop = !Path.history.initial.popped && location.href == Path.history.initial.URL;
Path.history.initial.popped = true;
if(initialPop) return;
Path.dispatch(document.location.pathname);
},
'listen': function(fallback){
listen: function(fallback) {
Path.history.supported = !!(window.history && window.history.pushState);
Path.history.fallback = fallback;

if(Path.history.supported){
if (Path.history.supported) {
Path.history.initial.popped = ('state' in window.history), Path.history.initial.URL = location.href;
window.onpopstate = Path.history.popState;
} else {
if(Path.history.fallback){
for(route in Path.routes.defined){
if(route.charAt(0) != "#"){
Path.routes.defined["#"+route] = Path.routes.defined[route];
Path.routes.defined["#"+route].path = "#"+route;
if (Path.history.fallback){
for (route in Path.routes.defined) {
if (route.charAt(0) != '#') {
Path.routes.defined['#'+route] = Path.routes.defined[route];
Path.routes.defined['#'+route].path = "#"+route;
}
}
Path.listen();
}
}
}
},
'match': function (path, parameterize) {
match: function (path, parameterize) {
var params = {}, route = null, possible_routes, slice, i, j, compare;
for (route in Path.routes.defined) {
if (route !== null && route !== undefined) {
Expand All @@ -62,10 +62,10 @@ var Path = {
slice = possible_routes[j];
compare = path;
if (slice.search(/:/) > 0) {
for (i = 0; i < slice.split("/").length; i++) {
if ((i < compare.split("/").length) && (slice.split("/")[i].charAt(0) === ":")) {
params[slice.split('/')[i].replace(/:/, '')] = compare.split("/")[i];
compare = compare.replace(compare.split("/")[i], slice.split("/")[i]);
for (i = 0; i < slice.split('/').length; i++) {
if ((i < compare.split('/').length) && (slice.split('/')[i].charAt(0) === ':')) {
params[slice.split('/')[i].replace(/:/, '')] = compare.split('/')[i];
compare = compare.replace(compare.split('/')[i], slice.split('/')[i]);
}
}
}
Expand All @@ -80,7 +80,7 @@ var Path = {
}
return null;
},
'dispatch': function (passed_route) {
dispatch: function (passed_route) {
var previous_route, matched_route;
if (Path.routes.current !== passed_route) {
Path.routes.previous = Path.routes.current;
Expand All @@ -104,29 +104,29 @@ var Path = {
}
}
},
'listen': function () {
listen: function () {
var fn = function(){ Path.dispatch(location.hash); }

if (location.hash === "") {
if (location.hash === '') {
if (Path.routes.root !== null) {
location.hash = Path.routes.root;
}
}

// The 'document.documentMode' checks below ensure that PathJS fires the right events
// even in IE "Quirks Mode".
if ("onhashchange" in window && (!document.documentMode || document.documentMode >= 8)) {
if ('onhashchange' in window && (!document.documentMode || document.documentMode >= 8)) {
window.onhashchange = fn;
} else {
setInterval(fn, 50);
}

if(location.hash !== "") {
if (location.hash !== '') {
Path.dispatch(location.hash);
}
},
'core': {
'route': function (path) {
core: {
route: function (path) {
this.path = path;
this.action = null;
this.do_enter = [];
Expand All @@ -135,32 +135,32 @@ var Path = {
Path.routes.defined[path] = this;
}
},
'routes': {
'current': null,
'root': null,
'rescue': null,
'previous': null,
'defined': {}
routes: {
current: null,
root: null,
rescue: null,
previous: null,
defined: {}
}
};
Path.core.route.prototype = {
'to': function (fn) {
to: function (fn) {
this.action = fn;
return this;
},
'enter': function (fns) {
enter: function (fns) {
if (fns instanceof Array) {
this.do_enter = this.do_enter.concat(fns);
} else {
this.do_enter.push(fns);
}
return this;
},
'exit': function (fn) {
exit: function (fn) {
this.do_exit = fn;
return this;
},
'partition': function () {
partition: function () {
var parts = [], options = [], re = /\(([^}]+?)\)/g, text, i;
while (text = re.exec(this.path)) {
parts.push(text[1]);
Expand All @@ -171,10 +171,10 @@ Path.core.route.prototype = {
}
return options;
},
'run': function () {
run: function () {
var halt_execution = false, i, result, previous;

if (Path.routes.defined[this.path].hasOwnProperty("do_enter")) {
if (Path.routes.defined[this.path].hasOwnProperty('do_enter')) {
if (Path.routes.defined[this.path].do_enter.length > 0) {
for (i = 0; i < Path.routes.defined[this.path].do_enter.length; i++) {
result = Path.routes.defined[this.path].do_enter[i].apply(this, null);
Expand All @@ -189,4 +189,4 @@ Path.core.route.prototype = {
Path.routes.defined[this.path].action();
}
}
};
};