rename properties on record array and filtered array

toranb · Jun 15, 2016 · b6eac76 · b6eac76
1 parent 93b1031
commit b6eac76
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/addon/models/filtered-record-array.js b/addon/models/filtered-record-array.js
@@ -9,8 +9,8 @@ export default RecordArray.extend({
     }),
 
     updateContent() {
-        var source = this.get("source");
-        var filter_func = this.get("filter_func");
+        var source = this.get("_source");
+        var filter_func = this.get("_filter_func");
 
         return Ember.A(source.filter(filter_func));
     },
@@ -21,7 +21,7 @@ export default RecordArray.extend({
     },
 
     _unregisterRecordArray() {
-        var store = this.get("store");
+        var store = this.get("_store");
         store._unsubscribe(this);
     }
 });
diff --git a/addon/models/record-array.js b/addon/models/record-array.js
@@ -3,20 +3,20 @@ import Ember from 'ember';
 const { ArrayProxy, computed } = Ember;
 
 export default ArrayProxy.extend({
-    store: null,
-    type: null,
+    _store: null,
+    _type: null,
 
     content: computed(function () {
-        return Ember.A(this.get("source"));
+        return Ember.A(this.get("_source"));
     }),
 
     push(data) {
-        var type = this.get('type');
-        return this.get('store').push(type, data);
+        var type = this.get('_type');
+        return this.get('_store').push(type, data);
     },
 
     remove(id) {
-        var type = this.get('type');
-        this.get('store').remove(type, id);
+        var type = this.get('_type');
+        this.get('_store').remove(type, id);
     }
 });
diff --git a/addon/store.js b/addon/store.js
@@ -171,18 +171,18 @@ var Store = ServiceType.extend({
     },
     _findAllProxy(type) {
         return RecordArray.create({
-            type: type,
-            store: this,
-            source: this._findAll(type)
+            _type: type,
+            _store: this,
+            _source: this._findAll(type)
         });
     },
     _findWithFilterFunc(type, filter_func) {
         var func = FilteredRecordArray.create({
-            type: type,
-            store: this,
-            id: Ember.uuid(),
-            filter_func: filter_func,
-            source: this._findAll(type)
+            _type: type,
+            _store: this,
+            _id: Ember.uuid(),
+            _filter_func: filter_func,
+            _source: this._findAll(type)
         });
         var filtersMap = this.get("filtersMap");
         var filters = filtersMap[type] || [];

diff --git a/tests/acceptance/filters-test.js b/tests/acceptance/filters-test.js
@@ -78,7 +78,7 @@ test('filters can be thrown out when you navigate away from a given route', func
   });
 });
 
-test('filters on models with custom primary keys can be thrown out when you leave a route', function(assert) {
+test('xxx filters on models with custom primary keys can be thrown out when you leave a route', function(assert) {
   visit('/custom-key');
   andThen(function() {
       assert.equal(currentURL(), '/custom-key');