You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/01/22 00:49:42 UTC
svn commit: r1436693 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js:
archiva/main.js redback/redback.js
Author: olamy
Date: Mon Jan 21 23:49:41 2013
New Revision: 1436693
URL: http://svn.apache.org/viewvc?rev=1436693&view=rev
Log:
doh wtf jquery 1.9.0 do not call success if ajax call return 204 not content
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/redback.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js?rev=1436693&r1=1436692&r2=1436693&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js Mon Jan 21 23:49:41 2013
@@ -173,15 +173,17 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
success: function(data) {
//var disableRegistration=data.disableRegistration;
var topbarMenu=$("#topbar-menu");
+ var organisationLogo=topbarMenu.find("#organisation-logo");
if( data){
$.log("disableRegistration");
topbarMenu.find("#register-link" ).hide();
+
}
$.ajax("restServices/archivaServices/archivaAdministrationService/getOrganisationInformation", {
type: "GET",
dataType: 'json',
success: function(data) {
- var organisationLogo=topbarMenu.find("#organisation-logo");
+
if(data.url){
var url = data.url.startsWith("http://") || data.url.startsWith("https://") ? data.url : "http://"+data.url;
var link="<a href='"+url+"' class='brand'>";
@@ -769,6 +771,7 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
};
checkSecurityLinks=function(){
+ $.log("checkSecurityLinks");
userLogged(userLoggedCallbackFn);
};
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/redback.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/redback.js?rev=1436693&r1=1436692&r2=1436693&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/redback.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/redback.js Mon Jan 21 23:49:41 2013
@@ -43,6 +43,7 @@ define("redback",["jquery","utils","jque
$.ajax("restServices/redbackServices/loginService/isLogged", {
type: "GET",
success: function(data) {
+ $.log("isLogged:"+data);
var user = data ? mapUser(data):null;
window.user=user;
if(user){
@@ -57,6 +58,16 @@ define("redback",["jquery","utils","jque
notLoggedFn();
}
}
+ },
+ statusCode: {
+ 204: function() {
+ if (successFn){
+ successFn(null);
+ }
+ if(notLoggedFn){
+ notLoggedFn();
+ }
+ }
}
});
}