From ee675eec19f7c063adfe9d6dccae734b6b95a863 Mon Sep 17 00:00:00 2001
From: BuiDang <bdangvn@gmail.com>
Date: Thu, 24 Nov 2016 07:09:56 +0700
Subject: [PATCH] Update font

---
 app/index.html                          | 2 +-
 app/scripts/controllers/tshirtdesign.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/index.html b/app/index.html
index 3fa243e..55710b3 100644
--- a/app/index.html
+++ b/app/index.html
@@ -47,7 +47,7 @@
     <script src="bower_components/json3/lib/json3.min.js"></script>
     <![endif]-->
     <script type="text/javascript">
-        var VERSION = '24-11_02';
+        var VERSION = '24-11_03';
         var require = {
           urlArgs: "ver="+VERSION,
         };
diff --git a/app/scripts/controllers/tshirtdesign.js b/app/scripts/controllers/tshirtdesign.js
index 8d763c2..69a432e 100644
--- a/app/scripts/controllers/tshirtdesign.js
+++ b/app/scripts/controllers/tshirtdesign.js
@@ -433,7 +433,7 @@ define(['app'], function (app) {
 				$scope.iText = new fabric.IText('', {
 					left: 150,
 					top: 200,
-					fontFamily: $scope.listFontFamily[0].slug,
+					fontFamily: typeof $scope.itemFont != 'undefined' ? $scope.listFontFamily[$scope.itemFont].slug : $scope.listFontFamily[0].slug,
 					fontWeight: 'normal',
 					textAlign:  'center',
 					fontSize: 28,
@@ -444,7 +444,7 @@ define(['app'], function (app) {
 					$scope.iText = new fabric.IText('', {
 						left: 150,
 						top: 200,
-						fontFamily: $scope.listFontFamily[0].slug,
+						fontFamily: typeof $scope.itemFont != 'undefined' ? $scope.listFontFamily[$scope.itemFont].slug : $scope.listFontFamily[0].slug,
 						fontWeight: 'normal',
 						textAlign:  'center',
 						fontSize: 28,
-- 
1.8.5.3