diff --git a/js/baseplane/BasePlane.js b/js/baseplane/BasePlane.js index f623f112b31aa3a6d048a8f88ae27b971c3f084f..a12dbb8c2c0f20755c9e61d7fae78fd62a3aee58 100644 --- a/js/baseplane/BasePlane.js +++ b/js/baseplane/BasePlane.js @@ -2,7 +2,8 @@ * Created by aghassaei on 1/31/15. */ -define(['appState', 'threeModel'], function(appState, three){ +define(['underscore', 'backbone', 'appState', 'lattice', 'threeModel', 'three'], + function(_, Backbone, appState, lattice, three, THREE){ return Backbone.Model.extend({ diff --git a/js/baseplane/OctaBasePlane.js b/js/baseplane/OctaBasePlane.js index 1fe69bb07d86067993e69f3da89443267db52b6f..9bed1ab77d5e2e40ff260fcdbd193fa1da0cc147 100644 --- a/js/baseplane/OctaBasePlane.js +++ b/js/baseplane/OctaBasePlane.js @@ -3,7 +3,8 @@ */ -define(['baseplane', 'lattice', 'threeModel'], function(BasePlane, lattice, three){ +define(['underscore', 'backbone', 'appState', 'lattice', 'threeModel', 'three', 'baseplane'], + function(_, Backbone, appState, lattice, three, THREE, BasePlane){ return BasePlane.extend({ diff --git a/js/baseplane/RotEdgeOctaBasePlane.js b/js/baseplane/RotEdgeOctaBasePlane.js index a62057b3ad8312454986f1c8705211562d7b8db3..2c59ce3d6e9f4222d0b46717fa4185d980bce365 100644 --- a/js/baseplane/RotEdgeOctaBasePlane.js +++ b/js/baseplane/RotEdgeOctaBasePlane.js @@ -3,7 +3,8 @@ */ -define(['squareBaseplane', 'lattice'], function(SquareBasePlane, lattice){ +define(['underscore', 'backbone', 'appState', 'lattice', 'threeModel', 'three', 'squareBaseplane'], + function(_, Backbone, appState, lattice, three, THREE, SquareBasePlane){ return SquareBasePlane.extend({ diff --git a/js/baseplane/SquareBasePlane.js b/js/baseplane/SquareBasePlane.js index 7c405460afe14c312730c374dcc07d7b45dcb0e2..00021c2024d708dc6c0ba31e590801ef3b5789d1 100644 --- a/js/baseplane/SquareBasePlane.js +++ b/js/baseplane/SquareBasePlane.js @@ -3,7 +3,8 @@ */ -define(['baseplane', 'lattice', 'threeModel'], function(BasePlane, lattice, three){ +define(['underscore', 'backbone', 'appState', 'lattice', 'threeModel', 'three', 'baseplane'], + function(_, Backbone, appState, lattice, three, THREE, BasePlane){ return BasePlane.extend({ diff --git a/js/cells/KelvinCell.js b/js/cells/KelvinCell.js index 66f72c18e4388754a35e639fc6a7c22747923601..6af6054aa29fea44ae52573abebaec5f3d4ccab1 100644 --- a/js/cells/KelvinCell.js +++ b/js/cells/KelvinCell.js @@ -2,7 +2,6 @@ * Created by aghassaei on 5/26/15. */ - define(['truncatedCubeCell'], function(TruncatedCubeCell){ var truncOctaRad = Math.sqrt(2); diff --git a/js/highlighter/CubeHighlighter.js b/js/highlighter/CubeHighlighter.js index 6eec813f4c2e3de4cca9f909859241194607031a..86598f46d8298e8518427ad003f99eba993dc5ad 100644 --- a/js/highlighter/CubeHighlighter.js +++ b/js/highlighter/CubeHighlighter.js @@ -3,7 +3,8 @@ */ -define(['highlighter', 'three'], function(Highlighter, THREE){ +define(['underscore', 'backbone', 'threeModel', 'appState', 'lattice', 'cell', 'three', 'highlighter'], + function(_, Backbone, three, appState, lattice, DMACell, THREE, Highlighter){ return Highlighter.extend({ diff --git a/js/highlighter/DefaultHighlighter.js b/js/highlighter/DefaultHighlighter.js index 8d4bc019f97cabf0169f72dc0f38299a23841f3e..0983144e5961ec0871cea79833db98ad48c61c1d 100644 --- a/js/highlighter/DefaultHighlighter.js +++ b/js/highlighter/DefaultHighlighter.js @@ -3,7 +3,8 @@ */ -define(['highlighter', 'three'], function(Highlighter, THREE){ +define(['underscore', 'backbone', 'threeModel', 'appState', 'lattice', 'cell', 'three', 'highlighter'], + function(_, Backbone, three, appState, lattice, DMACell, THREE, Highlighter){ return Highlighter.extend({ diff --git a/js/highlighter/GIKHighlighter.js b/js/highlighter/GIKHighlighter.js index c438a96fd1dac4720d150fa3a8612214f0e12cf1..e674fedf0df4a081c7851c8bc07dffdd9bdb736f 100644 --- a/js/highlighter/GIKHighlighter.js +++ b/js/highlighter/GIKHighlighter.js @@ -2,7 +2,8 @@ * Created by aghassaei on 6/2/15. */ -define(['highlighter', 'three', 'appState', 'lattice', 'threeModel'], function(Highlighter, THREE, appState, lattice, three){ +define(['underscore', 'backbone', 'threeModel', 'appState', 'lattice', 'cell', 'three', 'highlighter'], + function(_, Backbone, three, appState, lattice, DMACell, THREE, Highlighter){ return Highlighter.extend({ diff --git a/js/highlighter/Highlighter.js b/js/highlighter/Highlighter.js index 2b239f77031768d0c9cd6a0ce3995458c2407a99..411dbcb39523c754c5c78eaefb14c1e4ada2d98a 100644 --- a/js/highlighter/Highlighter.js +++ b/js/highlighter/Highlighter.js @@ -3,7 +3,8 @@ */ -define(['threeModel', 'appState', 'lattice', 'cell'], function(three, appState, lattice, DMACell){ +define(['underscore', 'backbone', 'threeModel', 'appState', 'lattice', 'cell', 'three'], + function(_, Backbone, three, appState, lattice, DMACell, THREE){ return Backbone.View.extend({ diff --git a/js/highlighter/OctaFaceHighlighter.js b/js/highlighter/OctaFaceHighlighter.js index 9e8fbe8e934a99e31f7c96e86d012fabadb55da4..826c4a484d7ec247f3a4645cf444060c0c98136f 100644 --- a/js/highlighter/OctaFaceHighlighter.js +++ b/js/highlighter/OctaFaceHighlighter.js @@ -3,7 +3,8 @@ */ -define(['highlighter', 'three'], function(Highlighter, THREE){ +define(['underscore', 'backbone', 'threeModel', 'appState', 'lattice', 'cell', 'three', 'highlighter'], + function(_, Backbone, three, appState, lattice, DMACell, THREE, Highlighter){ return Highlighter.extend({ diff --git a/js/highlighter/TruncatedCubeHighlighter.js b/js/highlighter/TruncatedCubeHighlighter.js index 5664815a0285bf00916e867e1238a33299300e8f..3b6fe803c83fb71435e42557da90c6a3d3589856 100644 --- a/js/highlighter/TruncatedCubeHighlighter.js +++ b/js/highlighter/TruncatedCubeHighlighter.js @@ -3,7 +3,8 @@ */ -define(['highlighter', 'three'], function(Highlighter, THREE){ +define(['underscore', 'backbone', 'threeModel', 'appState', 'lattice', 'cell', 'three', 'highlighter'], + function(_, Backbone, three, appState, lattice, DMACell, THREE, Highlighter){ return Highlighter.extend({ diff --git a/js/lattice/CubeLattice.js b/js/lattice/CubeLattice.js index 4d37a2a4b22b0aa63e32ca485a30e06d4852343a..222d5612b4318834f91c9266504447dc5d432fc5 100644 --- a/js/lattice/CubeLattice.js +++ b/js/lattice/CubeLattice.js @@ -2,7 +2,8 @@ * Created by aghassaei on 5/26/15. */ -define(['lattice', 'globals'], function(lattice, globals){ +define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'three', 'threeModel'], + function(_, Backbone, appState, lattice, globals, plist, THREE, three){ var CubeLattice = { diff --git a/js/lattice/GIKLattice.js b/js/lattice/GIKLattice.js index 068c27ff11d632bb387c1ddfbd07f262b0d9f678..0acb937d256272d0e64f6e459fcc1ffa8a406d57 100644 --- a/js/lattice/GIKLattice.js +++ b/js/lattice/GIKLattice.js @@ -2,7 +2,8 @@ * Created by aghassaei on 5/26/15. */ -define(['lattice', 'globals'], function(lattice, globals){ +define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'three', 'threeModel'], + function(_, Backbone, appState, lattice, globals, plist, THREE, three){ var GIKLattice = { diff --git a/js/lattice/KelvinLattice.js b/js/lattice/KelvinLattice.js index f24876340fe984d4da0e63d37d09f8afaaa39c29..917af049f8c4f9333653524637191bd42366e0b8 100644 --- a/js/lattice/KelvinLattice.js +++ b/js/lattice/KelvinLattice.js @@ -3,7 +3,8 @@ */ -define(['lattice', 'globals'], function(lattice, globals){ +define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'three', 'threeModel'], + function(_, Backbone, appState, lattice, globals, plist, THREE, three){ var KelvinLattice = { diff --git a/js/lattice/Lattice.js b/js/lattice/Lattice.js index 888e7067a23dcf59e042b8b7579994bcf4f6ffd1..2b7bf1cb733889ad150abfc29234450710260563 100644 --- a/js/lattice/Lattice.js +++ b/js/lattice/Lattice.js @@ -3,7 +3,8 @@ */ -define(['appState', 'plist', 'three', 'threeModel', 'globals'], function(appState, plist, THREE, three, globals){ +define(['underscore', 'backbone', 'appState', 'globals', 'plist', 'three', 'threeModel'], + function(_, Backbone, appState, globals, plist, THREE, three){ var Lattice = Backbone.Model.extend({ diff --git a/js/lattice/OctaEdgeLattice.js b/js/lattice/OctaEdgeLattice.js index ea4f237da3738d4dd347b2e7a20de8251ab91d31..94f88b558bb1b2043662c3e753fe09795a89368c 100644 --- a/js/lattice/OctaEdgeLattice.js +++ b/js/lattice/OctaEdgeLattice.js @@ -2,7 +2,8 @@ * Created by aghassaei on 5/26/15. */ -define(['lattice', 'globals'], function(lattice, globals){ +define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'three', 'threeModel'], + function(_, Backbone, appState, lattice, globals, plist, THREE, three){ var OctaEdgeLattice = { diff --git a/js/lattice/OctaFaceLattice.js b/js/lattice/OctaFaceLattice.js index ffb96ab8b25e362d284fb0e8b8a928da5040f760..b2667cd42cb3e8a08175e4bca732192d34f85e54 100644 --- a/js/lattice/OctaFaceLattice.js +++ b/js/lattice/OctaFaceLattice.js @@ -2,7 +2,8 @@ * Created by aghassaei on 5/26/15. */ -define(['lattice', 'globals'], function(lattice, globals){ +define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'three', 'threeModel'], + function(_, Backbone, appState, lattice, globals, plist, THREE, three){ var OctaFaceLattice = { diff --git a/js/lattice/OctaFreeFormFaceLattice.js b/js/lattice/OctaFreeFormFaceLattice.js index 6beeea843cacaa3e17be72f05c0482cc0b3a2918..dff105fe61bcde56825102f7080844e4ff650738 100644 --- a/js/lattice/OctaFreeFormFaceLattice.js +++ b/js/lattice/OctaFreeFormFaceLattice.js @@ -2,7 +2,8 @@ * Created by aghassaei on 5/26/15. */ -define(['lattice', 'globals'], function(lattice, globals){ +define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'three', 'threeModel'], + function(_, Backbone, appState, lattice, globals, plist, THREE, three){ var OctaFreeFormFaceLattice = { diff --git a/js/lattice/OctaRotEdgeLattice.js b/js/lattice/OctaRotEdgeLattice.js index 211533e8e21687e3a8e8db1b1479d6b13b3b1038..ed8a0cd5b285095ac2557dfaf2869f78934b6450 100644 --- a/js/lattice/OctaRotEdgeLattice.js +++ b/js/lattice/OctaRotEdgeLattice.js @@ -2,7 +2,8 @@ * Created by aghassaei on 5/26/15. */ -define(['lattice', 'globals'], function(lattice, globals){ +define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'three', 'threeModel'], + function(_, Backbone, appState, lattice, globals, plist, THREE, three){ var OctaRotEdgeLattice = { diff --git a/js/lattice/OctaVertexLattice.js b/js/lattice/OctaVertexLattice.js index 68a7eaeb8be5eabf41981d920865787a37777e1d..a8f254f33c9306aa5b052c54befdb4fe3f83ecd9 100644 --- a/js/lattice/OctaVertexLattice.js +++ b/js/lattice/OctaVertexLattice.js @@ -2,7 +2,8 @@ * Created by aghassaei on 5/26/15. */ -define(['lattice', 'globals'], function(lattice, globals){ +define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'three', 'threeModel'], + function(_, Backbone, appState, lattice, globals, plist, THREE, three){ var OctaVertexLattice = { diff --git a/js/lattice/TruncatedCubeLattice.js b/js/lattice/TruncatedCubeLattice.js index 3d138462336fd2e5619f5b6410031760a3a08397..485507d57e823b70837cc1068c0ebfcfb8219479 100644 --- a/js/lattice/TruncatedCubeLattice.js +++ b/js/lattice/TruncatedCubeLattice.js @@ -3,7 +3,8 @@ */ -define(['lattice', 'globals'], function(lattice, globals){ +define(['underscore', 'backbone', 'appState', 'lattice', 'globals', 'plist', 'three', 'threeModel'], + function(_, Backbone, appState, lattice, globals, plist, THREE, three){ var TruncatedCubeLattice = { diff --git a/js/main.js b/js/main.js index bc3d39ce23b9ab893127e85950ea9b785a3b37e0..eb0b60f7d943ef31f89c870435f62720f0eed6e9 100644 --- a/js/main.js +++ b/js/main.js @@ -102,6 +102,12 @@ require.config({ }); +require.onError = function (err) { + console.log(err.requireType); + console.log(err.requireModules); + throw err; +}; + //init stuff require(['appState', 'lattice', 'menuWrapper', 'navbar', 'ribbon', 'threeModel', 'threeView', 'flatUI'], function(appState, lattice, MenuWrapper, Navbar, Ribbon, three, ThreeView){ diff --git a/js/menus/AnimationMenuView.js b/js/menus/AnimationMenuView.js index f8300b2342003bd9dd7f94553a05a0fea5e62ef4..e6c25fcbe3dc8dbe04a440d73edfd38e082b47dc 100644 --- a/js/menus/AnimationMenuView.js +++ b/js/menus/AnimationMenuView.js @@ -2,7 +2,7 @@ * Created by aghassaei on 2/1/15. */ -define(['jquery', 'underscore', 'menuParent', 'cam', 'lattice', 'plist'], function($, _, MenuParentView, cam){ +define(['jquery', 'underscore', 'menuParent', 'plist', 'cam'], function($, _, MenuParentView, plist, cam){ return MenuParentView.extend({ diff --git a/js/menus/AssemblerMenuView.js b/js/menus/AssemblerMenuView.js index 4012e6d6c24b2dd376e3872eba358418b93772ff..12a305bf92ae71dce6fb5c368e973fdc9ed7b159 100644 --- a/js/menus/AssemblerMenuView.js +++ b/js/menus/AssemblerMenuView.js @@ -2,7 +2,7 @@ * Created by aghassaei on 2/25/15. */ -define(['jquery', 'underscore', 'menuParent', 'cam', 'lattice', 'plist'], function($, _, MenuParentView, cam, lattice, plist){ +define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'lattice'], function($, _, MenuParentView, plist, cam, lattice){ return MenuParentView.extend({ diff --git a/js/menus/CamMenuView.js b/js/menus/CamMenuView.js index 7abe47a195a6289456217c5d5508e5675ef4ad9c..826611d6450d16f67d52be1b54b6aab4345e2ba6 100644 --- a/js/menus/CamMenuView.js +++ b/js/menus/CamMenuView.js @@ -2,7 +2,7 @@ * Created by aghassaei on 1/26/15. */ -define(['jquery', 'underscore', 'menuParent', 'cam', 'lattice', 'plist'], function($, _, MenuParentView, cam, lattice, plist){ +define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'lattice'], function($, _, MenuParentView, plist, cam, lattice){ return MenuParentView.extend({ diff --git a/js/menus/ImportMenuView.js b/js/menus/ImportMenuView.js index e6ddbdab632d3f0be9593bcf51d0bdb7698c415c..341d6ce4d8de71c031c2fa2f98722f1e8a9865b2 100644 --- a/js/menus/ImportMenuView.js +++ b/js/menus/ImportMenuView.js @@ -2,7 +2,7 @@ * Created by aghassaei on 1/26/15. */ -define(['jquery', 'underscore', 'menuParent', 'lattice'], function($, _, MenuParentView, lattice){ +define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _, MenuParentView, plist, lattice){ return MenuParentView.extend({ diff --git a/js/menus/LatticeMenuView.js b/js/menus/LatticeMenuView.js index 15dfc6676baed809bae6ae56d47cccff2abe5f6b..42b00e67a4fb67a2106f9d979c5530bac3bc205f 100644 --- a/js/menus/LatticeMenuView.js +++ b/js/menus/LatticeMenuView.js @@ -2,7 +2,7 @@ * Created by aghassaei on 1/26/15. */ -define(['jquery', 'underscore', 'menuParent', 'lattice', 'plist'], function($, _, MenuParentView, lattice, plist){ +define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _, MenuParentView, plist, lattice){ return MenuParentView.extend({ diff --git a/js/menus/MaterialMenuView.js b/js/menus/MaterialMenuView.js index cdde55db855e29054725ef5d619af06ebf678c03..a6864247f6bf04613a6e954ec433c48829a95868 100644 --- a/js/menus/MaterialMenuView.js +++ b/js/menus/MaterialMenuView.js @@ -2,7 +2,7 @@ * Created by aghassaei on 2/25/15. */ -define(['jquery', 'underscore', 'menuParent'], function($, _, MenuParentView){ +define(['jquery', 'underscore', 'menuParent', 'plist'], function($, _, MenuParentView, plist){ return MenuParentView.extend({ diff --git a/js/menus/MenuParentView.js b/js/menus/MenuParentView.js index f1630273c89dd094e03beac30dd35f647ad619ed..d7c0847628a4662252e8f16730037612f769e605 100644 --- a/js/menus/MenuParentView.js +++ b/js/menus/MenuParentView.js @@ -3,7 +3,7 @@ */ -define(['backbone'], function(Backbone){ +define(['jquery', 'underscore', 'backbone'], function($, _, Backbone){ return Backbone.View.extend({ diff --git a/js/menus/MenuWrapperView.js b/js/menus/MenuWrapperView.js index 42a1d4b17ed18be723bd5b7c49f2cadfefbc35ff..cbb18fa57d6e659cb9ec84bf179284b4d00594da 100644 --- a/js/menus/MenuWrapperView.js +++ b/js/menus/MenuWrapperView.js @@ -3,7 +3,7 @@ */ -define(['jquery', 'underscore', 'backbone', 'lattice', 'plist'], function($, _, Backbone, lattice, plist){ +define(['jquery', 'underscore', 'plist', 'backbone', 'lattice'], function($, _, plist, Backbone, lattice){ return Backbone.View.extend({ diff --git a/js/menus/OptimizationMenuView.js b/js/menus/OptimizationMenuView.js index 7f5ab7956bc8570f3aa792bf1e99dc9ebe5bdef3..3fc6d13b193d489f5ceec7f9a8955c01474c15d5 100644 --- a/js/menus/OptimizationMenuView.js +++ b/js/menus/OptimizationMenuView.js @@ -2,7 +2,7 @@ * Created by aghassaei on 2/25/15. */ -define(['jquery', 'underscore', 'menuParent'], function($, _, MenuParentView){ +define(['jquery', 'underscore', 'menuParent', 'plist'], function($, _, MenuParentView, plist){ return MenuParentView.extend({ diff --git a/js/menus/PartMenuView.js b/js/menus/PartMenuView.js index 66d83a0805f864d2c2800d08be17d7b3cf47f772..ddf94a70597b914e422f32815cf85781dc49e08b 100644 --- a/js/menus/PartMenuView.js +++ b/js/menus/PartMenuView.js @@ -2,7 +2,7 @@ * Created by aghassaei on 1/26/15. */ -define(['jquery', 'underscore', 'menuParent', 'lattice', 'plist'], function($, _, MenuParentView, lattice, plist){ +define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice'], function($, _, MenuParentView, plist, lattice){ return MenuParentView.extend({ diff --git a/js/menus/PhysicsMenuView.js b/js/menus/PhysicsMenuView.js index c88c361d09138550ee7d4ac36ca86af6cb57e1cc..2a90443cc60735222de602da0847d82fb7c71043 100644 --- a/js/menus/PhysicsMenuView.js +++ b/js/menus/PhysicsMenuView.js @@ -2,7 +2,7 @@ * Created by aghassaei on 2/25/15. */ -define(['jquery', 'underscore', 'menuParent'], function($, _, MenuParentView){ +define(['jquery', 'underscore', 'menuParent', 'plist'], function($, _, MenuParentView, plist){ return MenuParentView.extend({ diff --git a/js/menus/Ribbon.js b/js/menus/Ribbon.js index 10169cb5ad068e02e7a9f86c19a6c4a3e8546816..f11c84c93b774b885d422e56cd4a8fe1cdcc4888 100644 --- a/js/menus/Ribbon.js +++ b/js/menus/Ribbon.js @@ -2,7 +2,7 @@ * Created by fab on 3/18/15. */ -define(['jquery', 'underscore', 'backbone', 'lattice', 'plist'], function($, _, Backbone, lattice, plist){ +define(['jquery', 'underscore', 'backbone', 'plist', 'lattice'], function($, _, Backbone, plist, lattice){ return Backbone.View.extend({ diff --git a/js/menus/SendMenuView.js b/js/menus/SendMenuView.js index b8ace078fcd3960bc97a9aa5054bc1964c211a93..4d59dabd68d7c17b1e5c47917ef0cda8d1c1f2d7 100644 --- a/js/menus/SendMenuView.js +++ b/js/menus/SendMenuView.js @@ -2,7 +2,7 @@ * Created by aghassaei on 3/11/15. */ -define(['jquery', 'underscore', 'menuParent', 'cam', 'lattice', 'plist'], function($, _, MenuParentView, cam, lattice, plist){ +define(['jquery', 'underscore', 'menuParent', 'plist', 'cam', 'lattice'], function($, _, MenuParentView, plist, cam, lattice){ return MenuParentView.extend({ diff --git a/js/menus/SketchMenuView.js b/js/menus/SketchMenuView.js index b0d2d7545814dd05a2623f0be029cdd50e346419..a36cf0adaef96a6ce90bd8f6f94f39e13b2a5730 100644 --- a/js/menus/SketchMenuView.js +++ b/js/menus/SketchMenuView.js @@ -2,7 +2,7 @@ * Created by aghassaei on 1/26/15. */ -define(['jquery', 'underscore', 'menuParent'], function($, _, MenuParentView){ +define(['jquery', 'underscore', 'menuParent', 'plist'], function($, _, MenuParentView, plist){ return MenuParentView.extend({ diff --git a/js/models/AppState.js b/js/models/AppState.js index 445327b77e23050f97525ef94be5e343ce03cc1d..a1593512d68e934ce5e7e8ab125bf4c4647f9a91 100644 --- a/js/models/AppState.js +++ b/js/models/AppState.js @@ -5,7 +5,7 @@ //a class to store global app state, model for navbar and menu wrapper //never deallocated -define(['backbone'], function(Backbone){ +define(['underscore', 'backbone'], function(_, Backbone){ var AppState = Backbone.Model.extend({ diff --git a/js/models/FileSaver.js b/js/models/FileSaver.js index c321da8b07cf2d634df01e3044594b038a85f6f0..79e275c4425dd1e4fb3a9f22a577428757b988f5 100644 --- a/js/models/FileSaver.js +++ b/js/models/FileSaver.js @@ -3,7 +3,7 @@ */ -define(['fileSaverLib'], function(saveAs){ +define(['underscore', 'fileSaverLib'], function(_, saveAs){ function _saveFile(data, name, extension){ var blob = new Blob([data], {type: "text/plain;charset=utf-8"}); diff --git a/js/three/ThreeModel.js b/js/three/ThreeModel.js index f4c55d745d608162b0c80ac16e168751ddf2ed89..2911a844b4f0dac5778c8b51facd257ca42070ae 100644 --- a/js/three/ThreeModel.js +++ b/js/three/ThreeModel.js @@ -3,7 +3,7 @@ */ -define(['three'], function(THREE){ +define(['underscore', 'three'], function(_, THREE){ var camera = new THREE.PerspectiveCamera(60, window.innerWidth/window.innerHeight, 0.01, 5000); var scene = new THREE.Scene(); diff --git a/js/three/ThreeView.js b/js/three/ThreeView.js index b5341cce9c6a651d2f6de69da10241b6bb5a6b53..9b60401461b3cbac782874a59cb1dd95aa702f76 100644 --- a/js/three/ThreeView.js +++ b/js/three/ThreeView.js @@ -2,7 +2,7 @@ * Created by aghassaei on 1/16/15. */ -define(['backbone', 'threeModel', 'orbitControls', 'appState', 'globals'], function(Backbone, three, THREE, appState, globals){ +define(['underscore', 'backbone', 'three', 'appState', 'globals', 'orbitControls'], function(_, Backbone, THREE, appState, globals){ return Backbone.View.extend({