diff options
| author | ryderr <r@okfoc.us> | 2014-11-13 13:35:57 -0500 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-11-13 13:35:57 -0500 |
| commit | ab94732c54ed62e27cf63f1d2b292b7494432366 (patch) | |
| tree | c865a2b8797d52575df2f38f9c4a85428fe0a375 /public/assets/javascripts/mx | |
| parent | 61eebaa5c3ef0d839c00c4d512b402ba71f97454 (diff) | |
| parent | bb6d520f07ca5aa481cb80558dd9078f600a1d64 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/mx')
| -rw-r--r-- | public/assets/javascripts/mx/primitives/mx.text.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/public/assets/javascripts/mx/primitives/mx.text.js b/public/assets/javascripts/mx/primitives/mx.text.js index 1d975ec..a0f9283 100644 --- a/public/assets/javascripts/mx/primitives/mx.text.js +++ b/public/assets/javascripts/mx/primitives/mx.text.js @@ -38,16 +38,18 @@ MX.Text = MX.Object3D.extend({ load: function(ops){ var media = ops.media - if (media.color) this.el.style.color = media.color; if (media.font) this.setFont(media.font) this.setText( media.description ) }, setFont: function(font){ + if (! font.color || font.color[0] == "#") { font.color = [0,0,0] } + this.inner.style.fontFamily = "'" + font.family + "',sans-serif" this.el.style.fontSize = (2 * font.size) + "pt" this.el.style.textAlign = font.align + this.el.style.color = rgb_string(font.color) }, setText: function(text){ |