Skip to content

Commit

Permalink
Merge pull request #1753 from jhawthorn/js_namespaces
Browse files Browse the repository at this point in the history
Create JS namespaces in centralized file
  • Loading branch information
jhawthorn authored Mar 6, 2017
2 parents 663aee0 + 6610c5c commit 15928c6
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 24 deletions.
1 change: 1 addition & 0 deletions backend/app/assets/javascripts/spree/backend.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
//= require solidus_admin/bootstrap
//= require prism
//= require spree
//= require spree/backend/namespaces
//= require spree/backend/translation
//= require spree/backend/backbone-overrides
//= require spree/backend/spree-select2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//= require spree/backend/models/line_item

Spree.Collections = (Spree.Collections || {})

Spree.Collections.LineItems = Backbone.Collection.extend({
model: Spree.Models.LineItem,

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//= require spree/backend/routes

Spree.Models = (Spree.Models || {})

Spree.Models.LineItem = Backbone.Model.extend({
initialize: function(options) {
this.order = this.collection.parent;
Expand Down
2 changes: 0 additions & 2 deletions backend/app/assets/javascripts/spree/backend/models/order.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//= require spree/backend/routes
//= require spree/backend/collections/line_items

Spree.Models || (Spree.Models = {});

Spree.Models.Order = Backbone.Model.extend({
urlRoot: Spree.routes.orders_api,
idAttribute: "number",
Expand Down
8 changes: 8 additions & 0 deletions backend/app/assets/javascripts/spree/backend/namespaces.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
_.extend(window.Spree, {
Models: {},
Collections: {},
Views: {
Order: {},
Cart: {}
}
})
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
Spree.Views = (Spree.Views || {})
Spree.Views.Cart = (Spree.Views.Cart || {})

Spree.Views.Cart.AddLineItemButton = Backbone.View.extend({
initialize: function() {
this.listenTo(this.collection, 'update', this.render);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
Spree.Views = (Spree.Views || {})
Spree.Views.Cart = (Spree.Views.Cart || {})

Spree.Views.Cart.LineItemRow = Backbone.View.extend({
tagName: 'tr',
className: 'line-item',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
Spree.Views = (Spree.Views || {})
Spree.Views.Cart = (Spree.Views.Cart || {})

Spree.Views.Cart.LineItemTable = Backbone.View.extend({
initialize: function() {
this.listenTo(this.collection, 'add', this.add);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
Spree.Views = (Spree.Views || {})
Spree.Views.Order = (Spree.Views.Order || {})

Spree.Views.Order.DetailsAdjustments = Backbone.View.extend({
initialize: function() {
this.listenTo(this.model, "change", this.render);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
Spree.Views = (Spree.Views || {})
Spree.Views.Order = (Spree.Views.Order || {})

Spree.Views.Order.DetailsTotal = Backbone.View.extend({
initialize: function() {
this.listenTo(this.model, "change", this.render);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
Spree.Views || (Spree.Views = {});
Spree.Views.Order || (Spree.Views.Order = {});

Spree.Views.Order.Summary = Backbone.View.extend({
initialize: function () {
this.listenTo(this.model, "change", this.render);
Expand Down

0 comments on commit 15928c6

Please sign in to comment.