Revision 7a0c3713 snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
b/snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js | ||
---|---|---|
36 | 36 |
var services = $('<div class="services"></div>'); |
37 | 37 |
var profile = $('<div class="profile"></div>'); |
38 | 38 |
|
39 |
var get_services_url = window.GET_SERVICES_URL || window.CLOUDBAR_SERVICES; |
|
40 |
|
|
39 | 41 |
// create services links and set the active class to the current service |
40 |
$.getJSON(window.GET_SERVICES_URL || window.CLOUDBAR_SERVICES, function(data) {
|
|
42 |
$.getJSON(get_services_url + "?callback=?", function(data) {
|
|
41 | 43 |
$.each(data, function(i, el){ |
42 | 44 |
var slink = $("<a>"); |
43 | 45 |
if (el.icon) { |
... | ... | |
58 | 60 |
var user = $('<div class="user"></div>'); |
59 | 61 |
var username = $('<a href="#"></a>'); |
60 | 62 |
var usermenu = $("<ul>"); |
61 |
var get_menu_url = (window.GET_MENU_URL || window.CLOUDBAR_MENU).concat('?location=').concat(window.location.toString());
|
|
62 |
$.getJSON(get_menu_url, function(data) { |
|
63 |
var get_menu_url = (window.GET_MENU_URL || window.CLOUDBAR_MENU) + '?callback=?&location=' + window.location.toString();
|
|
64 |
$.getJSON(get_menu_url + "&callback=?", function(data) {
|
|
63 | 65 |
$.each(data, function(i,el) { |
64 | 66 |
if (i == 0){ |
65 | 67 |
username.text(el.name); |
Also available in: Unified diff