diff --git a/src/app/services/backend.service.ts b/src/app/services/backend.service.ts index c79658a..11c94ff 100644 --- a/src/app/services/backend.service.ts +++ b/src/app/services/backend.service.ts @@ -14,7 +14,7 @@ export class BackendService { constructor( private $http: ng.IHttpService, private $q: ng.IQService, - private $log: ng.ILogService, + private $log: ng.ILogService, private SettingsService: SettingsService) { } @@ -29,12 +29,14 @@ export class BackendService { //alright let's make this query! this.previousCall = word; - return this.$http.get(`${this.SettingsService.senseQueryUrl}/${word}`) + return this.SettingsService.loadSettings() + .then(loadedSettings => this.$http.get(`${loadedSettings.tagitSenseQueryUrl}/${word}`)) } sendTaggedDataToServer(senseTag: ISenseTag) { this.$log.debug('sendTaggedDataToServer() was called'); - return this.$http.post(this.SettingsService.senseDestinationUrl, senseTag) + return this.SettingsService.loadSettings() + .then(loadedSettings => this.$http.post(loadedSettings.tagitSenseDestinationUrl, senseTag)) } } \ No newline at end of file diff --git a/src/app/services/settings.service.ts b/src/app/services/settings.service.ts index 78a1ef1..7041a91 100644 --- a/src/app/services/settings.service.ts +++ b/src/app/services/settings.service.ts @@ -61,12 +61,15 @@ export class SettingsService { //use default value if no setting specified. .then((loadedSettings: saveableSettings) => { + /** + * tagitSenseQueryUrl is not configurable yet so we just use + * the default instead + */ + loadedSettings.tagitSenseQueryUrl = this._defaultSenseQueryUrl + if (!loadedSettings.tagitSenseDestinationUrl) { loadedSettings.tagitSenseDestinationUrl = this._defaultSenseDestinationUrl } - if (!loadedSettings.tagitSenseQueryUrl) { - loadedSettings.tagitSenseQueryUrl = this._defaultSenseQueryUrl - } if (!loadedSettings.emailToTagWith) { loadedSettings.emailToTagWith = '' }