From 27ca82eba6ff838afbfccc72870208e63d551bb2 Mon Sep 17 00:00:00 2001 From: Amanda Ghassaei <amandaghassaei@gmail.com> Date: Tue, 10 Mar 2015 01:56:33 -0400 Subject: [PATCH] mobing stuff --- js/models/Lattice.js | 3 +-- js/models/LatticeOcta.js | 3 +-- js/models/LatticeOther.js | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/js/models/Lattice.js b/js/models/Lattice.js index 749801f2..1a09726e 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 96fac854..579c3d67 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 3fee8732..11b33419 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: { -- GitLab