diff --git a/app/scripts/controllers/tshirtdesign.js b/app/scripts/controllers/tshirtdesign.js index 11ca7c6..a13ecee 100644 --- a/app/scripts/controllers/tshirtdesign.js +++ b/app/scripts/controllers/tshirtdesign.js @@ -513,38 +513,31 @@ define(['app'], function (app) { //Design text $scope.inputText = function(e) { currentObj = canvas.getActiveObject(); - if(typeof currentObj == 'undefined' || currentObj == null) { - var _iText = new fabric.IText('', { - left: 150, - top: 200, - fontFamily: typeof $scope.itemFont != 'undefined' ? $scope.listFontFamily[$scope.itemFont].slug : $scope.listFontFamily[0].slug, - fontWeight: 'normal', - textAlign: 'center', - fontSize: 28, - fill: 'black', - editable: false - }); - } else { - if(currentObj.type != 'i-text') { - var _iText = new fabric.IText('', { - left: 150, - top: 200, - fontFamily: typeof $scope.itemFont != 'undefined' ? $scope.listFontFamily[$scope.itemFont].slug : $scope.listFontFamily[0].slug, - fontWeight: 'normal', - textAlign: 'center', - fontSize: 28, - fill: 'black', - editable: false - }); - } else{ - var _iText = currentObj; - } + var _iText = new fabric.IText('', { + left: 150, + top: 200, + fontFamily: typeof $scope.itemFont != 'undefined' ? $scope.listFontFamily[$scope.itemFont].slug : $scope.listFontFamily[0].slug, + fontWeight: 'normal', + textAlign: 'center', + fontSize: 28, + fill: 'black', + editable: false + }); + if(typeof currentObj != 'undefined' && currentObj != null) { + _iText.set({ + left: currentObj.left, + top: currentObj.top, + fontFamily: currentObj.fontFamily, + fontSize: currentObj.fontSize, + fill: currentObj.fill + }) } - _iText.set('text', e); - if(e.length > 1 && canvas.getActiveObject()) + + if(canvas.getActiveObject()) canvas.getActiveObject().remove(); + _iText.set('text', e); canvas.add(_iText); canvas.setActiveObject(_iText); canvas.renderAll();