diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-13 13:03:20 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-13 13:03:20 -0500 |
| commit | 0f8be5bc39ca5049d3f29fe74eb423da4dcb055a (patch) | |
| tree | cc0ca9ef6810dda2a6507e50db57697c2c548e72 /public/assets/javascripts/mx/primitives/mx.text.js | |
| parent | 596dc1d15fab2f883f79f0037d5fec57e59ff1de (diff) | |
text color picker
Diffstat (limited to 'public/assets/javascripts/mx/primitives/mx.text.js')
| -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){ |