Don't fire create page twice

This commit is contained in:
Ruud
2012-04-30 11:49:27 +02:00
parent e319371ba5
commit fd6b08d73e
+10 -6
View File
@@ -117,15 +117,15 @@ var CouchPotato = new Class({
openPage: function(url) { openPage: function(url) {
var self = this; var self = this;
var current_url = url.replace(/^\/+|\/+$/g, '');
if(current_url == self.current_url)
return;
self.route.parse(); self.route.parse();
var page_name = self.route.getPage().capitalize(); var page_name = self.route.getPage().capitalize();
var action = self.route.getAction(); var action = self.route.getAction();
var params = self.route.getParams(); var params = self.route.getParams();
var current_url = self.route.getCurrentUrl();
if(current_url == self.current_url)
return;
if(self.current_page) if(self.current_page)
self.current_page.hide() self.current_page.hide()
@@ -287,8 +287,8 @@ var Route = new Class({
var self = this; var self = this;
var path = History.getPath().replace(Api.getOption('url'), '/').replace(App.getOption('base_url'), '/') var path = History.getPath().replace(Api.getOption('url'), '/').replace(App.getOption('base_url'), '/')
var current = path.replace(/^\/+|\/+$/g, '') self.current = path.replace(/^\/+|\/+$/g, '')
var url = current.split('/') var url = self.current.split('/')
self.page = (url.length > 0) ? url.shift() : self.defaults.page self.page = (url.length > 0) ? url.shift() : self.defaults.page
self.action = (url.length > 0) ? url.shift() : self.defaults.action self.action = (url.length > 0) ? url.shift() : self.defaults.action
@@ -324,6 +324,10 @@ var Route = new Class({
return this.params return this.params
}, },
getCurrentUrl: function(){
return this.current
},
get: function(param){ get: function(param){
return this.params[param] return this.params[param]
} }