Merge branch 'release/r184#136#40' into develop

This commit is contained in:
stubbfel
2013-09-10 16:17:18 +02:00

View File

@@ -103,17 +103,14 @@ namespace CampusAppWP8.Pages.PlaceNews
this.places.OnFailedLoad += new PlacesFile.OnFailed(this.PlacesFileIsFail);
this.places.LoadData();
}
else if (this.spsApi == null || this.forceReqest)
// init sps Api
if (this.spsApi == null || this.forceReqest)
{
this.spsApi = new SpsApi();
this.spsApi.OnLoaded += new SpsApi.OnIO(this.SpsApiIsReady);
this.spsApi.OnFailedLoad += new SpsApi.OnFailed(this.ApiIsFail);
this.spsApi.SetupCurrentPlaceRequest(Constants.SpsDomain_Buildings);
if (this.places.Model != null)
{
this.spsApi.LoadData();
this.waitForApi++;
}
}
// init pis API
@@ -165,11 +162,15 @@ namespace CampusAppWP8.Pages.PlaceNews
/// <remarks>Stubbfel, 09.09.2013.</remarks>
private void PlacesFileIsReady()
{
if (this.spsApi != null)
if (this.spsApi == null)
{
this.spsApi.LoadData();
this.waitForApi++;
this.spsApi = new SpsApi();
this.spsApi.OnLoaded += new SpsApi.OnIO(this.SpsApiIsReady);
this.spsApi.OnFailedLoad += new SpsApi.OnFailed(this.ApiIsFail);
this.spsApi.SetupCurrentPlaceRequest(Constants.SpsDomain_Buildings);
}
this.spsApi.LoadData();
this.waitForApi++;
}
/// <summary>Pss API is ready.</summary>