From 079a6f4e3028a4fcdc81c87a5a80c2cc8b1cf032 Mon Sep 17 00:00:00 2001
From: inssein <hussein@jafferjee.ca>
Date: Thu, 11 Jun 2015 10:55:18 -0700
Subject: [PATCH] fix styles when measuring

---
 src/shapes/itext.class.js   | 2 +-
 src/shapes/textbox.class.js | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/shapes/itext.class.js b/src/shapes/itext.class.js
index 48afcc7b..ef1b92d8 100644
--- a/src/shapes/itext.class.js
+++ b/src/shapes/itext.class.js
@@ -292,7 +292,7 @@
       var loc = this.get2DCursorLocation(index);
 
       if (!this._getLineStyle(loc.lineIndex)) {
-        this._setLineStyle(loc.lineIndex, {})
+        this._setLineStyle(loc.lineIndex, {});
       }
 
       if (!this._getStyleDeclaration(loc.lineIndex, loc.charIndex)) {
diff --git a/src/shapes/textbox.class.js b/src/shapes/textbox.class.js
index b402e2db..6aa647b3 100644
--- a/src/shapes/textbox.class.js
+++ b/src/shapes/textbox.class.js
@@ -208,9 +208,7 @@
       charOffset = charOffset || 0;
 
       for (var i = 0; i < text.length; i++) {
-        decl = this._getStyleDeclaration(lineIndex, i + charOffset);
-
-        if (decl) {
+        if (this.styles && this.styles[lineIndex] && (decl = this.styles[lineIndex][i + charOffset])) {
           ctx.save();
           width += this._applyCharStylesGetWidth(ctx, text[i], lineIndex, i, decl);
           ctx.restore();