Skip to content

Commit cf874a2

Browse files
committed
use inject to access store in service
1 parent ec9e0c2 commit cf874a2

File tree

7 files changed

+14
-17
lines changed

7 files changed

+14
-17
lines changed

app/gist/controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ export default Ember.Controller.extend({
206206
}
207207

208208
fileProperties.filePath = filePath;
209-
let file = this.store.createRecord('gistFile', fileProperties);
209+
let file = this.get('store').createRecord('gistFile', fileProperties);
210210

211211
this.get('model.files').pushObject(file);
212212
this.get('notify').info(`File ${file.get('filePath')} was added`);

app/gist/edit/route.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import GistRoute from "ember-twiddle/routes/gist-base-route";
33

44
export default GistRoute.extend({
55
model (params) {
6-
this.store.unloadAll('gistFile');
6+
this.get('store').unloadAll('gistFile');
77

8-
return this.store.find('gist', params.id);
8+
return this.get('store').find('gist', params.id);
99
},
1010

1111
setupController() {

app/gist/new/route.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ export default GistRoute.extend({
55
emberCli: Ember.inject.service('ember-cli'),
66

77
model (params) {
8-
var model = this.store.createRecord('gist', {description: 'New Twiddle'});
8+
var model = this.get('store').createRecord('gist', {description: 'New Twiddle'});
99

1010
if (params.copyCurrentTwiddle) {
11-
this.store.peekAll('gistFile').setEach('gist', model);
11+
this.get('store').peekAll('gistFile').setEach('gist', model);
1212
} else {
13-
this.store.unloadAll('gistFile');
13+
this.get('store').unloadAll('gistFile');
1414

1515
model.get('files').pushObject(this.get('emberCli').generate('controllers/application'));
1616
model.get('files').pushObject(this.get('emberCli').generate('templates/application'));

app/gist/route.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default Ember.Route.extend({
1717
deactivate () {
1818
var gist = this.controller.get('model');
1919
if (gist.get('isNew')) {
20-
this.store.unloadRecord(gist);
20+
this.get('store').unloadRecord(gist);
2121
}
2222
},
2323

app/services/ember-cli.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import config from '../config/environment';
55
import Ember from 'ember';
66
import moment from 'moment';
77

8+
const { inject } = Ember;
89
const twiddleAppName = 'demo-app';
910

1011
// These files will be included if not present
@@ -106,15 +107,11 @@ const requiredDependencies = [
106107
* source code at https://github.com/ember-cli/ember-cli
107108
*/
108109
export default Ember.Service.extend({
109-
dependencyResolver: Ember.inject.service(),
110-
111-
init (...args) {
112-
this._super(...args);
113-
this.set('store', this.container.lookup("service:store"));
114-
},
110+
dependencyResolver: inject.service(),
111+
store: inject.service(),
115112

116113
generate(type) {
117-
return this.store.createRecord('gistFile', this.buildProperties(type));
114+
return this.get('store').createRecord('gistFile', this.buildProperties(type));
118115
},
119116

120117
buildProperties(type, replacements) {
@@ -270,7 +267,7 @@ export default Ember.Service.extend({
270267
requiredFiles.forEach(filePath => {
271268
var file = gist.get('files').findBy('filePath', filePath);
272269
if(!file) {
273-
gist.get('files').pushObject(this.store.createRecord('gistFile', {
270+
gist.get('files').pushObject(this.get('store').createRecord('gistFile', {
274271
filePath: filePath,
275272
content: blueprints[filePath]
276273
}));

app/torii-adapters/application.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default Ember.Object.extend({ /**
99
*/
1010
resolveUser (token) {
1111
config.TMP_TORII_TOKEN = token;
12-
return this.store.find('user', 'current').then((user) => {
12+
return this.get('store').find('user', 'current').then((user) => {
1313
config.TMP_TORII_TOKEN = null;
1414
localStorage.setItem('fiddle_gh_session', token);
1515
return { currentUser: user, token: token };

app/twiddles/route.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default Ember.Route.extend({
1212
},
1313

1414
model() {
15-
return this.store.findAll('gist');
15+
return this.get('store').findAll('gist');
1616
},
1717

1818
actions: {

0 commit comments

Comments
 (0)