Commit ee675eec19f7c063adfe9d6dccae734b6b95a863

Authored by DANG
1 parent 2c5a581859
Exists in master and in 1 other branch develop

Update font

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

... ... @@ -47,7 +47,7 @@
47 47 <script src="bower_components/json3/lib/json3.min.js"></script>
48 48 <![endif]-->
49 49 <script type="text/javascript">
50   - var VERSION = '24-11_02';
  50 + var VERSION = '24-11_03';
51 51 var require = {
52 52 urlArgs: "ver="+VERSION,
53 53 };
app/scripts/controllers/tshirtdesign.js
... ... @@ -433,7 +433,7 @@
433 433 $scope.iText = new fabric.IText('', {
434 434 left: 150,
435 435 top: 200,
436   - fontFamily: $scope.listFontFamily[0].slug,
  436 + fontFamily: typeof $scope.itemFont != 'undefined' ? $scope.listFontFamily[$scope.itemFont].slug : $scope.listFontFamily[0].slug,
437 437 fontWeight: 'normal',
438 438 textAlign: 'center',
439 439 fontSize: 28,
... ... @@ -444,7 +444,7 @@
444 444 $scope.iText = new fabric.IText('', {
445 445 left: 150,
446 446 top: 200,
447   - fontFamily: $scope.listFontFamily[0].slug,
  447 + fontFamily: typeof $scope.itemFont != 'undefined' ? $scope.listFontFamily[$scope.itemFont].slug : $scope.listFontFamily[0].slug,
448 448 fontWeight: 'normal',
449 449 textAlign: 'center',
450 450 fontSize: 28,