diff -r e3d2012adcd0 -r 95902c0b991b web/data/cubicweb.ajax.js --- a/web/data/cubicweb.ajax.js Fri May 23 18:17:44 2014 +0200 +++ b/web/data/cubicweb.ajax.js Fri May 23 18:35:13 2014 +0200 @@ -88,8 +88,8 @@ }); var AJAX_PREFIX_URL = 'ajax'; -var JSON_BASE_URL = baseuri() + 'json?'; -var AJAX_BASE_URL = baseuri() + AJAX_PREFIX_URL + '?'; +var JSON_BASE_URL = BASE_URL + 'json?'; +var AJAX_BASE_URL = BASE_URL + AJAX_PREFIX_URL + '?'; jQuery.extend(cw.ajax, { @@ -122,9 +122,7 @@ * (e.g. http://..../data??resource1.js,resource2.js) */ _modconcatLikeUrl: function(url) { - var base = baseuri(); - if (!base.endswith('/')) { base += '/'; } - var modconcat_rgx = new RegExp('(' + base + 'data/([a-z0-9]+/)?)\\?\\?(.+)'); + var modconcat_rgx = new RegExp('(' + BASE_URL + 'data/([a-z0-9]+/)?)\\?\\?(.+)'); return modconcat_rgx.exec(url); }, @@ -379,8 +377,8 @@ * dictionary, `reqtype` the HTTP request type (get 'GET' or 'POST'). */ function loadRemote(url, form, reqtype, sync) { - if (!url.toLowerCase().startswith(baseuri().toLowerCase())) { - url = baseuri() + url; + if (!url.toLowerCase().startswith(BASE_URL.toLowerCase())) { + url = BASE_URL + url; } if (!sync) { var deferred = new Deferred(); @@ -592,7 +590,7 @@ var fck = new FCKeditor(this.id); fck.Config['CustomConfigurationsPath'] = fckconfigpath; fck.Config['DefaultLanguage'] = fcklang; - fck.BasePath = baseuri() + "fckeditor/"; + fck.BasePath = BASE_URL + "fckeditor/"; fck.ReplaceTextarea(); } else { cw.log('fckeditor could not be found.');