Skip to content
This repository was archived by the owner on Aug 18, 2018. It is now read-only.

Commit b37f173

Browse files
committed
console.log removed
1 parent 5260da3 commit b37f173

File tree

2 files changed

+26
-15
lines changed

2 files changed

+26
-15
lines changed

src/library/service.ts

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ import { LocalFilter } from './services/localfilter';
1010
import { CacheMemory } from './services/cachememory';
1111
import { CacheStore } from './services/cachestore';
1212

13-
import { IService, ISchema, IResource, ICollection, IExecParams, ICacheStore, ICacheMemory,
14-
IParamsCollection, IParamsResource, IAttributes } from './interfaces';
13+
import {
14+
IService, ISchema, IResource, ICollection, IExecParams, ICacheStore, ICacheMemory,
15+
IParamsCollection, IParamsResource, IAttributes
16+
} from './interfaces';
1517

1618
export class Service extends ParentResourceService implements IService {
1719
public schema: ISchema;
@@ -95,11 +97,13 @@ export class Service extends ParentResourceService implements IService {
9597
if (this.getService().cachememory.isResourceLive(id, temporal_ttl)) {
9698
// we create a promise because we need return collection before
9799
// run success client function
98-
var deferred = Core.injectedServices.$q.defer();
100+
let deferred = Core.injectedServices.$q.defer();
99101
deferred.resolve(fc_success);
100102
deferred.promise.then(fc_success => {
101103
this.runFc(fc_success, 'cachememory');
102-
});
104+
})
105+
// .catch(() => {})
106+
;
103107
resource.is_loading = false;
104108
return resource;
105109
} else {
@@ -130,7 +134,9 @@ export class Service extends ParentResourceService implements IService {
130134
this.getService().cachememory.setResource(resource);
131135
this.getService().cachestore.setResource(resource);
132136
this.runFc(fc_success, success);
133-
},
137+
}
138+
)
139+
.catch(
134140
error => {
135141
this.runFc(fc_error, error);
136142
}
@@ -160,9 +166,9 @@ export class Service extends ParentResourceService implements IService {
160166
if (params.page.number > 1) {
161167
path.addParam(Core.injectedServices.rsJsonapiConfig.parameters.page.number + '=' + params.page.number);
162168
}
163-
if (params.page.limit) {
164-
path.addParam(Core.injectedServices.rsJsonapiConfig.parameters.page.limit + '=' + params.page.limit);
165-
}
169+
if (params.page.limit) {
170+
path.addParam(Core.injectedServices.rsJsonapiConfig.parameters.page.limit + '=' + params.page.limit);
171+
}
166172
}
167173

168174
// make request
@@ -173,9 +179,9 @@ export class Service extends ParentResourceService implements IService {
173179
let localfilter = new LocalFilter(params.localfilter);
174180
let cached_collection: ICollection;
175181
if (params.localfilter && Object.keys(params.localfilter).length > 0) {
176-
cached_collection = Base.newCollection();
182+
cached_collection = Base.newCollection();
177183
} else {
178-
cached_collection = tempororay_collection;
184+
cached_collection = tempororay_collection;
179185
}
180186

181187
// MEMORY_CACHE
@@ -200,7 +206,9 @@ export class Service extends ParentResourceService implements IService {
200206
deferred.resolve(fc_success);
201207
deferred.promise.then(fc_success => {
202208
this.runFc(fc_success, 'cachememory');
203-
});
209+
})
210+
.catch(() => {})
211+
;
204212
} else {
205213
this.getAllFromServer(path, params, fc_success, fc_error, tempororay_collection, cached_collection);
206214
}
@@ -225,7 +233,8 @@ export class Service extends ParentResourceService implements IService {
225233
} else {
226234
this.getAllFromServer(path, params, fc_success, fc_error, tempororay_collection, cached_collection);
227235
}
228-
},
236+
}
237+
).catch(
229238
error => {
230239
this.getAllFromServer(path, params, fc_success, fc_error, tempororay_collection, cached_collection);
231240
}
@@ -273,7 +282,9 @@ export class Service extends ParentResourceService implements IService {
273282
}
274283

275284
this.runFc(fc_success, success);
276-
},
285+
}
286+
)
287+
.catch(
277288
error => {
278289
// do not replace $source, because localstorage don't write if = server
279290
// tempororay_collection.$source = 'server';
@@ -295,7 +306,8 @@ export class Service extends ParentResourceService implements IService {
295306
success => {
296307
this.getService().cachememory.removeResource(id);
297308
this.runFc(fc_success, success);
298-
},
309+
}
310+
).catch(
299311
error => {
300312
this.runFc(fc_error, error);
301313
}

src/library/services/cachestore.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ export class CacheStore implements ICacheStore {
192192
// hasMany
193193
let collection = <ICollection>resource.relationships[resource_type_alias].data;
194194
angular.forEach(collection, (inc_resource: IResource) => {
195-
console.log('hasMany ress need save', inc_resource);
196195
resources_for_save[resource_type_alias + inc_resource.id] = inc_resource;
197196
});
198197
}

0 commit comments

Comments
 (0)