From dd97d532beda0a32121f3faa2fae92508284a326 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Wed, 12 Mar 2014 15:31:48 +0100
Subject: [PATCH] Remove OC.Router usage
---
settings/js/personal.js | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 26c50f8fa5..fe8c21aa4f 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -284,13 +284,14 @@ $(document).ready(function(){
// does the user have a custom avatar? if he does hide #removeavatar
// needs to be this complicated because we can't check yet if an avatar has been loaded, because it's async
- OC.Router.registerLoadedCallback(function() {
- var url = OC.Router.generate('core_avatar_get', {user: OC.currentUser, size: 1})+'?requesttoken='+oc_requesttoken;
- $.get(url, function(result) {
- if (typeof(result) === 'object') {
- $('#removeavatar').addClass('hidden');
- }
- });
+ var url = OC.generateUrl(
+ '/avatar/{user}/{size}',
+ {user: OC.currentUser, size: 1}
+ ) + '?requesttoken=' + oc_requesttoken;
+ $.get(url, function(result) {
+ if (typeof(result) === 'object') {
+ $('#removeavatar').addClass('hidden');
+ }
});
} );
--
GitLab