diff --git a/app/assets/javascripts/app/collections/aspects.js b/app/assets/javascripts/app/collections/aspect_selections.js similarity index 93% rename from app/assets/javascripts/app/collections/aspects.js rename to app/assets/javascripts/app/collections/aspect_selections.js index 7b25d33b5..49ea754e4 100644 --- a/app/assets/javascripts/app/collections/aspects.js +++ b/app/assets/javascripts/app/collections/aspect_selections.js @@ -1,6 +1,6 @@ // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later -app.collections.Aspects = Backbone.Collection.extend({ +app.collections.AspectSelections = Backbone.Collection.extend({ model: app.models.AspectSelection, selectedAspects: function(attribute){ diff --git a/app/assets/javascripts/app/models/stream_aspects.js b/app/assets/javascripts/app/models/stream_aspects.js index 319fe106c..a3d18a5c7 100644 --- a/app/assets/javascripts/app/models/stream_aspects.js +++ b/app/assets/javascripts/app/models/stream_aspects.js @@ -26,8 +26,8 @@ app.models.StreamAspects = app.models.Stream.extend({ fetchDone: function() { this.triggerFetchedEvents(); - if (app.aspects) { - app.aspects.trigger('aspectStreamFetched'); + if (app.aspectSelections) { + app.aspectSelections.trigger("aspectStreamFetched"); } } }); diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js index 8f65548aa..9a62b707d 100644 --- a/app/assets/javascripts/app/router.js +++ b/app/assets/javascripts/app/router.js @@ -134,14 +134,15 @@ app.Router = Backbone.Router.extend({ }, aspects: function() { - app.aspects = app.aspects || new app.collections.Aspects(app.currentUser.get("aspects")); - this.aspectsList = this.aspectsList || new app.views.AspectsList({ collection: app.aspects }); + app.aspectSelections = app.aspectSelections || + new app.collections.AspectSelections(app.currentUser.get("aspects")); + this.aspectsList = this.aspectsList || new app.views.AspectsList({collection: app.aspectSelections}); this.aspectsList.render(); this.aspects_stream(); }, aspects_stream : function(){ - var ids = app.aspects.selectedAspects("id"); + var ids = app.aspectSelections.selectedAspects("id"); app.stream = new app.models.StreamAspects([], { aspects_ids: ids }); app.stream.fetch(); this._initializeStreamView(); diff --git a/spec/javascripts/app/collections/aspects_spec.js b/spec/javascripts/app/collections/aspect_selections_spec.js similarity index 88% rename from spec/javascripts/app/collections/aspects_spec.js rename to spec/javascripts/app/collections/aspect_selections_spec.js index cb06018a6..446f50813 100644 --- a/spec/javascripts/app/collections/aspects_spec.js +++ b/spec/javascripts/app/collections/aspect_selections_spec.js @@ -1,11 +1,11 @@ -describe("app.collections.Aspects", function(){ +describe("app.collections.AspectSelections", function(){ beforeEach(function(){ var my_aspects = [ { name: 'Work', selected: true }, { name: 'Friends', selected: false }, { name: 'Acquaintances', selected: false } ]; - this.aspects = new app.collections.Aspects(my_aspects); + this.aspects = new app.collections.AspectSelections(my_aspects); }); describe("#selectAll", function(){ @@ -41,7 +41,7 @@ describe("app.collections.Aspects", function(){ describe("#toSentence", function(){ describe('without aspects', function(){ beforeEach(function(){ - this.aspects = new app.collections.Aspects([{ name: 'Work', selected: false }]); + this.aspects = new app.collections.AspectSelections([{ name: 'Work', selected: false }]); }); it("returns the name of the aspect", function(){ @@ -51,7 +51,7 @@ describe("app.collections.Aspects", function(){ describe("with one aspect", function(){ beforeEach(function(){ - this.aspects = new app.collections.Aspects([{ name: 'Work', selected: true }]); + this.aspects = new app.collections.AspectSelections([{ name: 'Work', selected: true }]); }); it("returns the name of the aspect", function(){ diff --git a/spec/javascripts/app/router_spec.js b/spec/javascripts/app/router_spec.js index e29a56e58..26fcb6692 100644 --- a/spec/javascripts/app/router_spec.js +++ b/spec/javascripts/app/router_spec.js @@ -39,7 +39,7 @@ describe('app.Router', function () { it('hides the aspects list', function(){ setFixtures('
'); - aspects = new app.collections.Aspects([ + aspects = new app.collections.AspectSelections([ factory.aspectAttrs({selected:true}), factory.aspectAttrs() ]); diff --git a/spec/javascripts/app/views/aspects_list_view_spec.js b/spec/javascripts/app/views/aspects_list_view_spec.js index 165ee7bc7..522f5dfd2 100644 --- a/spec/javascripts/app/views/aspects_list_view_spec.js +++ b/spec/javascripts/app/views/aspects_list_view_spec.js @@ -4,7 +4,7 @@ describe("app.views.AspectsList", function(){ var aspects = [{ name: 'Work', selected: true }, { name: 'Friends', selected: false }, { name: 'Acquaintances', selected: false }]; - this.aspects = new app.collections.Aspects(aspects); + this.aspects = new app.collections.AspectSelections(aspects); this.view = new app.views.AspectsList({ collection: this.aspects }); });