diff --git a/js/models/Lattice.js b/js/models/Lattice.js index 749801f2cf4831c8c9137863ff936f199f2564d1..1a09726e07e503563f13f40954c9beeff255f2b2 100644 --- a/js/models/Lattice.js +++ b/js/models/Lattice.js @@ -39,8 +39,7 @@ Lattice = Backbone.Model.extend({ initialize: function(){ - _.extend(this, dmaGlobals.OctaLatticeSubclasses); - _.extend(this, dmaGlobals.OtherLatticeSubclasses); + _.extend(this, OctaLatticeSubclasses, OtherLatticeSubclasses); //bind events this.listenTo(this, "change:scale", this._scaleDidChange); diff --git a/js/models/LatticeOcta.js b/js/models/LatticeOcta.js index 96fac8543a8d16e3176dc67e878cebed018fb80e..579c3d675855d92c2960ea0450e5dab60c7814bc 100644 --- a/js/models/LatticeOcta.js +++ b/js/models/LatticeOcta.js @@ -2,13 +2,12 @@ * Created by aghassaei on 3/10/15. */ -if (typeof dmaGlobals === "undefined") dmaGlobals = {}; //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////FACE CONN OCTA LATTICE//////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// -dmaGlobals.OctaLatticeSubclasses = { +OctaLatticeSubclasses = { OctaFaceLattice: { diff --git a/js/models/LatticeOther.js b/js/models/LatticeOther.js index 3fee8732734d73b44c256a8783c0fcd6b39711f7..11b33419c51c63e1bfdd99ed1fbeb5944a3b9dfe 100644 --- a/js/models/LatticeOther.js +++ b/js/models/LatticeOther.js @@ -2,13 +2,12 @@ * Created by aghassaei on 3/10/15. */ -if (typeof dmaGlobals === "undefined") dmaGlobals = {}; //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////CUBE LATTICE////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// -dmaGlobals.OtherLatticeSubclasses = { +OtherLatticeSubclasses = { CubeLattice: {