From a803adcdee27efdcc6099ac86c34de3726eb8295 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 12 Jun 2015 00:22:14 -0700
Subject: [PATCH] eod
---
js/cells/supercells/DMASuperCell.js | 4 ++--
js/cells/supercells/GIKSuperCell.js | 4 ++--
js/menus/CompositeMenu.js | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/js/cells/supercells/DMASuperCell.js b/js/cells/supercells/DMASuperCell.js
index fc4dba85..3cf1bb40 100644
--- a/js/cells/supercells/DMASuperCell.js
+++ b/js/cells/supercells/DMASuperCell.js
@@ -30,14 +30,14 @@ define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'cell'],
for (var z=0;z<range.z;z++){
//child cells add themselves to object3D
if (material.cells && material.cells[x][y][z]) cells[x][y].push(this._makeSubCellForIndex(new THREE.Vector3(x, y, z), this, material.cells[x][y][z].material));
- else cells[x][y].push(this._makeSubCellForIndex(new THREE.Vector3(x, y, z), this, material));
+ else cells[x][y].push(this._makeSubCellForIndex({index: new THREE.Vector3(x, y, z), material:this.material}));
}
}
}
return cells;
};
- DMASuperCell.prototype._makeSubCellForIndex = function(index, supercell, material){
+ DMASuperCell.prototype._makeSubCellForIndex = function(json){
return null;//override in subclasses
};
diff --git a/js/cells/supercells/GIKSuperCell.js b/js/cells/supercells/GIKSuperCell.js
index 1b69218b..4d28f4b0 100644
--- a/js/cells/supercells/GIKSuperCell.js
+++ b/js/cells/supercells/GIKSuperCell.js
@@ -21,8 +21,8 @@ define(['underscore', 'three', 'threeModel', 'lattice', 'appState', 'superCell',
};
GIKSuperCell.prototype = Object.create(DMASuperCell.prototype);
- GIKSuperCell.prototype._makeSubCellForIndex = function(index, material){
- return new GIKCell(index, material, this);
+ GIKSuperCell.prototype._makeSubCellForIndex = function(json){
+ return new GIKCell(json, this);
};
GIKSuperCell.prototype._rotateCell = function(object3D){
diff --git a/js/menus/CompositeMenu.js b/js/menus/CompositeMenu.js
index 5c464084..9764504e 100644
--- a/js/menus/CompositeMenu.js
+++ b/js/menus/CompositeMenu.js
@@ -105,7 +105,7 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'lattice', 'globals'], fu
<span><%= materials.compositeMaterials[key].name %></span></div>\
</label>\
<% }); %><br/>\
- <a id="finishComposite" href="#" class="btn btn-block btn-lg btn-success">Finish Composite</a><br/>\
+ <a id="finishComposite" href="#" class="btn btn-block btn-lg btn-success">Save Composite</a><br/>\
<a id="cancelComposite" href="#" class="btn btn-halfWidth btn-lg btn-default">Cancel / Exit</a>\
<a id="deleteComposite" href="#" class="btn btn-halfWidth pull-right btn-lg btn-default"><span class="fui-trash"></span> Delete</a><br/>\
')
--
GitLab