Author: simoneg
Date: Mon Jul 19 14:57:02 2010
New Revision: 965514
URL: http://svn.apache.org/viewvc?rev=965514&view=rev
Log:
Unified function for building urls
Modified:
labs/magma/trunk/website-autoajax/src/main/resources/org/apache/magma/website/autoajax/autoajax.js
Modified:
labs/magma/trunk/website-autoajax/src/main/resources/org/apache/magma/website/autoajax/autoajax.js
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-autoajax/src/main/resources/org/apache/magma/website/autoajax/autoajax.js?rev=965514&r1=965513&r2=965514&view=diff
==============================================================================
---
labs/magma/trunk/website-autoajax/src/main/resources/org/apache/magma/website/autoajax/autoajax.js
(original)
+++
labs/magma/trunk/website-autoajax/src/main/resources/org/apache/magma/website/autoajax/autoajax.js
Mon Jul 19 14:57:02 2010
@@ -23,6 +23,24 @@ magma.autoajax = new function() {
*/
this.serverurl = "";
+ this._buildUrl = function(rel, postfix) {
+ var ret = "";
+ if (this.serverurl.match('/$')) {
+ if (rel.match('^/')) {
+ ret = this.serverurl + (rel.substr(1));
+ } else {
+ ret = this.serverurl + rel;
+ }
+ } else {
+ if (rel.match('^/')) {
+ ret = this.serverurl + rel;
+ } else {
+ ret = this.serverurl + '/' + rel;
+ }
+ }
+ if (postfix) ret += postfix;
+ return ret;
+ }
/**
* Initialize the state
@@ -188,7 +206,7 @@ magma.autoajax = new function() {
event.state = stategrp;
jqele.trigger(event);
var url = stategrp.localurl;
- var real = this.serverurl + url + ".ajax";
+ var real = me._buildUrl(url,".ajax");
jQuery.ajax({
url: real,
type: "GET",
@@ -310,7 +328,7 @@ magma.autoajax = new function() {
var me = this;
// TODO send the request, parse the resulting
// head and directives.
- var real = this.serverurl + rel + ".ajaxbu";
+ var real = me._buildUrl(rel,".ajaxbu");
var state = this.getState();
if (otherparams) {
otherparams[otherparams.length] =
{name:'state',value:state};
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
