summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/mx/primitives/mx.scaleBox.js
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-06-10 19:46:53 -0400
committerJulie Lala <jules@okfoc.us>2014-06-10 19:46:53 -0400
commit4e4b5b5668835097f335efaf55dfe837eec7dc3c (patch)
tree5cd6cb12a203c5dd7c8cf9f62b9cd9235e52513c /public/assets/javascripts/mx/primitives/mx.scaleBox.js
parent3074488306e041718dec221ff9142748e2e68916 (diff)
parentb231af3e38b8f066f18031fd69b0fdb30a5e244a (diff)
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/mx/primitives/mx.scaleBox.js')
-rw-r--r--public/assets/javascripts/mx/primitives/mx.scaleBox.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/assets/javascripts/mx/primitives/mx.scaleBox.js b/public/assets/javascripts/mx/primitives/mx.scaleBox.js
index 77f45e9..f635345 100644
--- a/public/assets/javascripts/mx/primitives/mx.scaleBox.js
+++ b/public/assets/javascripts/mx/primitives/mx.scaleBox.js
@@ -7,7 +7,7 @@ MX.ScaleBox = MX.Object3D.extend({
this.type = "ScaleBox"
- var id = this.id = opt.id || guid()
+ var id = this.id = opt.id || _.uniqueId()
this.x = opt.x || 0
this.y = opt.y || 0
this.z = opt.z || 0