Revert "adding new javascript function OC.generateUrl(url, params)"
This reverts commit 8e667d1934
.
This commit is contained in:
parent
5f0a22586f
commit
256dca935b
|
@ -175,30 +175,6 @@ var OC={
|
||||||
appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false,
|
appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false,
|
||||||
currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
|
currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
|
||||||
coreApps:['', 'admin','log','search','settings','core','3rdparty'],
|
coreApps:['', 'admin','log','search','settings','core','3rdparty'],
|
||||||
|
|
||||||
/**
|
|
||||||
* Generates the absolute url for the given relative url, which can contain parameters.
|
|
||||||
*
|
|
||||||
* @returns {string}
|
|
||||||
* @param {string} url
|
|
||||||
* @param params
|
|
||||||
*/
|
|
||||||
generateUrl: function(url, params) {
|
|
||||||
var _build = function (text, vars) {
|
|
||||||
return text.replace(/{([^{}]*)}/g,
|
|
||||||
function (a, b) {
|
|
||||||
var r = vars[b];
|
|
||||||
return typeof r === 'string' || typeof r === 'number' ? r : a;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
};
|
|
||||||
if (url.charAt(0) !== '/') {
|
|
||||||
url = '/' + url;
|
|
||||||
|
|
||||||
}
|
|
||||||
return OC.webroot + '/index.php' + _build(url, params);
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get an absolute url to a file in an appen
|
* get an absolute url to a file in an appen
|
||||||
* @param app the id of the app the file belongs to
|
* @param app the id of the app the file belongs to
|
||||||
|
|
Loading…
Reference in New Issue