summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/mx/primitives/mx.text.js
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/mx/primitives/mx.text.js')
-rw-r--r--public/assets/javascripts/mx/primitives/mx.text.js19
1 files changed, 15 insertions, 4 deletions
diff --git a/public/assets/javascripts/mx/primitives/mx.text.js b/public/assets/javascripts/mx/primitives/mx.text.js
index b4089f3..8db28d0 100644
--- a/public/assets/javascripts/mx/primitives/mx.text.js
+++ b/public/assets/javascripts/mx/primitives/mx.text.js
@@ -37,11 +37,22 @@ MX.Text = MX.Object3D.extend({
},
load: function(ops){
- if (ops.color) this.el.style.color = ops.color;
- if (ops.fontFamily) this.el.style.fontFamily = "'" + ops.fontFamily + "',sans-serif";
- if (ops.fontSize) this.el.style.fontSize = ops.fontSize + "px";
+ var media = ops.media
+ if (media.color) this.el.style.color = media.color;
+ if (media.font) this.setFont(media.font)
+ if (media.align) this.setAlign(media.align)
- this.inner.innerHTML = marked( ops.media.description || "" )
+ this.setText( media.description )
+ },
+
+ setAlign: function(align) {
+ this.el.style.textAlign = "align"
+ },
+
+ setFont: function(font){
+ console.log(font)
+ this.inner.style.fontFamily = "'" + font.family + "',sans-serif"
+ this.el.style.fontSize = (2 * font.size) + "pt"
},
setText: function(text){