Changeset 1514029

Timestamp:

10/13/2016 03:03:59 PM (9 years ago)

Author:

ibcl

Message:

version 1.2.2

Location:

web-to-printq/trunk

Files:

• assets/js/designer.min.js (modified) (6 diffs)
• assets/js/fabric.1.4.5.39.min.js (modified) (5 diffs)
• printq_designer.php (modified) (2 diffs)
• readme.txt (modified) (3 diffs)
• views/head.php (modified) (1 diff)

web-to-printq/trunk/assets/js/designer.min.js

@@ -5 +5 @@
 e.extend(t,{defaults:{},_O:function(t){return e.extend({},ODD.defaults,t)},init:function(){t.connectHooks()
 var e=setInterval(function(){"undefined"!=typeof WhichBrowser&&clearInterval(e)},100)},connectHooks:function(){},addHook:function(e,t,a){printqPluggable.PluginHooks.add(e,t,ODSE,a)},addHookOnce:function(e,t,a){printqPluggable.PluginHooks.once(e,t,ODSE,a)},removeHook:function(e,t,a){printqPluggable.PluginHooks.remove(e,t,ODSE,a)},addGlobalHook:function(e,t,a){printqPluggable.PluginHooks.add(e,t,!1,a)},runHooks:function(e,t,a,n,o,i,r){return printqPluggable.PluginHooks.run(ODSE,e,t,a,n,o,i,r)},onAfterWhichBrowserDetectHookCallback:function(){}})}(window.jQuery),!function(e){var t=e.designerStartEditor={}
-e.extend(t,{defaults:{droppable:"#edit_tab #canvasAreaDesigner .droppable",tempCanvas:".tempCanvas",containerCanvas:"#edit_tab div#canvasAreaDesigner",designerMaxWidth:1200,designerMaxHeight:800,zoomTextContainer:".zoom_text_group",goBackEditor:"#close",backgroundImageColorContainer:".backgroundImageColors",saveProjectAdminButton:".savePersonalization",optionsFreeDrawing:{},textBox:null},getDefaults:function(a){return e.extend(t.defaults,a)},addHook:function(e,a,n){printqPluggable.PluginHooks.add(e,a,t,n)},addHookOnce:function(e,a,n){printqPluggable.PluginHooks.once(e,a,t,n)},removeHook:function(e,a,n){printqPluggable.PluginHooks.remove(e,a,t,n)},addGlobalHook:function(e,t,a){printqPluggable.PluginHooks.add(e,t,!1,a)},runHooks:function(e,a,n,o,i,r,s){return printqPluggable.PluginHooks.run(t,e,a,n,o,i,r,s)},connectHooks:function(){t.addGlobalHook("loadCanvas",t.loadCanvas),t.addGlobalHook("getCanvasPageForPreview",t.getCanvasPageForPreview),t.addGlobalHook("updateSizeAndPositionBackground",t.updateSizeAndPositionBackground),t.addGlobalHook("deleteObject",t.deleteObject),t.addGlobalHook("cloneObject",t.cloneObject),t.addGlobalHook("groupObjects",t.groupObjects),t.addGlobalHook("unGroupObjects",t.unGroupObjects),t.addGlobalHook("addPage",t.addPage),t.addGlobalHook("deletePage",t.deletePage),t.addGlobalHook("addCurvedText",t.addCurvedText),t.addGlobalHook("addTextBox",t.addTextBox),t.addGlobalHook("disableAddTextBox",t.disableAddTextBox),t.addGlobalHook("disableCurvedText",t.disableCurvedText),t.addGlobalHook("zoomIn",t.zoomIn),t.addGlobalHook("zoomOut",t.zoomOut),t.addGlobalHook("calculateInitialZoom",t.calculateInitialZoom),t.addGlobalHook("mouseZoomInit",t.mouseZoomInit),t.addGlobalHook("clearSelection",t.clearSelection),t.addGlobalHook("confirmTextEditMobile",t.confirmTextEditMobile),t.addGlobalHook("notConfirmTextEditMobile",t.notConfirmTextEditMobile),t.addGlobalHook("addTextBoxInCanvas",t.addTextBoxInCanvas),t.addGlobalHook("goBack",t.goBack)},confirmTextEditMobile:function(e){var a=canvas.getActiveObject()
+e.extend(t,{defaults:{droppable:"#edit_tab #canvasAreaDesigner .droppable",tempCanvas:".tempCanvas",containerCanvas:"#edit_tab div#canvasAreaDesigner",designerMaxWidth:1200,designerMaxHeight:800,zoomTextContainer:".zoom_text_group",goBackEditor:"#close",backgroundImageColorContainer:".backgroundImageColors",saveProjectAdminButton:".savePersonalization",optionsFreeDrawing:{},textBox:null,adjustDimensionsCanvas:40},getDefaults:function(a){return e.extend(t.defaults,a)},addHook:function(e,a,n){printqPluggable.PluginHooks.add(e,a,t,n)},addHookOnce:function(e,a,n){printqPluggable.PluginHooks.once(e,a,t,n)},removeHook:function(e,a,n){printqPluggable.PluginHooks.remove(e,a,t,n)},addGlobalHook:function(e,t,a){printqPluggable.PluginHooks.add(e,t,!1,a)},runHooks:function(e,a,n,o,i,r,s){return printqPluggable.PluginHooks.run(t,e,a,n,o,i,r,s)},connectHooks:function(){t.addGlobalHook("loadCanvas",t.loadCanvas),t.addGlobalHook("getCanvasPageForPreview",t.getCanvasPageForPreview),t.addGlobalHook("updateSizeAndPositionBackground",t.updateSizeAndPositionBackground),t.addGlobalHook("deleteObject",t.deleteObject),t.addGlobalHook("cloneObject",t.cloneObject),t.addGlobalHook("groupObjects",t.groupObjects),t.addGlobalHook("unGroupObjects",t.unGroupObjects),t.addGlobalHook("addPage",t.addPage),t.addGlobalHook("deletePage",t.deletePage),t.addGlobalHook("addCurvedText",t.addCurvedText),t.addGlobalHook("addTextBox",t.addTextBox),t.addGlobalHook("disableAddTextBox",t.disableAddTextBox),t.addGlobalHook("disableCurvedText",t.disableCurvedText),t.addGlobalHook("zoomIn",t.zoomIn),t.addGlobalHook("zoomOut",t.zoomOut),t.addGlobalHook("calculateInitialZoom",t.calculateInitialZoom),t.addGlobalHook("mouseZoomInit",t.mouseZoomInit),t.addGlobalHook("clearSelection",t.clearSelection),t.addGlobalHook("confirmTextEditMobile",t.confirmTextEditMobile),t.addGlobalHook("notConfirmTextEditMobile",t.notConfirmTextEditMobile),t.addGlobalHook("addTextBoxInCanvas",t.addTextBoxInCanvas),t.addGlobalHook("goBack",t.goBack)},confirmTextEditMobile:function(e){var a=canvas.getActiveObject()
 if(a&&["text","i-text","textbox"].indexOf(a.type)>-1){var n=a.text
 a.text=e.text(),canvas.renderAll(),fabric.IText.prototype.exitEditingOnOthers(canvas),e.remove(),canvas.fire("text:editing:exited"),t.runHooks("pushUndoData"[{objectID:a.objectID,oldStage:{text:n},newStage:{text:a.text}}])}},notConfirmTextEditMobile:function(e){fabric.IText.prototype.exitEditingOnOthers(canvas),e.remove(),canvas.fire("text:editing:exited"),canvas.renderAll()},disableAddTextBox:function(){var a=t.getDefaults()
@@ -21 +21 @@
 e("body").toggleClass("loading_canvas"),setTimeout(function(e,a,n){return function(){t.getCanvasPageForPreview(a),n.splice(i,0,e),n.forEach(function(e,t){t>i&&(e.page_number=parseInt(e.page_number)+1)}),t.loadCanvas(n[i])}}(o,n,themePageContent),100)},deletePage:function(a){if(themePageContent.length>1){var n=themePageContent.indexOf(themePageContent[a.currentPage])
 themePageContent.splice(n,1),themePageContent.forEach(function(e,t){e.page_number=t+1}),e("body").toggleClass("loading_canvas"),setTimeout(function(){t.loadCanvas(themePageContent[a.newPageNumber])},100)}},bindEvents:function(a){var n=t.getDefaults()
-e(n.droppable+">.canvas-container").bind("contextmenu",function(e){return!1}),t.runHooks("bindEventsDefaultToolbar"),t.runHooks("bindEventsImageToolbar"),t.runHooks("bindEventsTextToolbar")},unbindEvents:function(e){t.runHooks("unbindEventsDefaultToolbar"),t.runHooks("unbindEventsImageToolbar"),t.runHooks("unbindEventsTextToolbar")},calculateInitialZoom:function(){var a,n,o=t.getDefaults(),i=e(o.containerCanvas).width(),r=e(o.containerCanvas).height()-60,s=canvas.getWidth()-2*canvasOffsetWidth,c=canvas.getHeight()-2*canvasOffsetHeight
+e(n.droppable+">.canvas-container").bind("contextmenu",function(e){return!1}),t.runHooks("bindEventsDefaultToolbar"),t.runHooks("bindEventsImageToolbar"),t.runHooks("bindEventsTextToolbar")},unbindEvents:function(e){t.runHooks("unbindEventsDefaultToolbar"),t.runHooks("unbindEventsImageToolbar"),t.runHooks("unbindEventsTextToolbar")},calculateInitialZoom:function(){var a,n,o=t.getDefaults(),i=e(o.containerCanvas).width()-o.adjustDimensionsCanvas,r=e(o.containerCanvas).height()-o.adjustDimensionsCanvas,s=canvas.getWidth()-2*canvasOffsetWidth,c=canvas.getHeight()-2*canvasOffsetHeight
 a=i<o.designerMaxWidth?1-i/s:1-o.designerMaxWidth/s,n=r<o.designerMaxHeight?1-r/c:1-o.designerMaxHeight/c,t.setInitialZoom(a>n?a:n),canvas.renderAll()},setInitialZoom:function(e){t.getDefaults(),canvas.getWidth()*(canvasScale-e)
 if(canvasScale-=e,t.updateCanvasSize(Math.round(canvas.getWidth()*canvasScale),Math.round(canvas.getHeight()*canvasScale)),canvas.backgroundImage){var a=canvas.backgroundImage.scaleX*(canvasScale/(canvasScale+e)),n=canvas.backgroundImage.scaleY*(canvasScale/(canvasScale+e)),o=canvas.backgroundImage.left*(canvasScale/(canvasScale+e))
@@ -34 +34 @@
 return t&&"undefined"!=typeof t.backgroundImage&&"undefined"!=typeof t.backgroundImage.src&&t.backgroundImage.src.length?t.backgroundImage.src:defaultBackgroundName},loadCanvas:function(e){t.getDefaults()
 if(t.unbindEvents(),canvas.clear(),canvas.setWidth(parseInt(e.width)),canvas.setHeight(parseInt(e.height)),canvasScale=1,e)switch(canvas.setViewportTransform([1,0,0,1,0,0]),canvas.viewportTransformOld=[1,0,0,1,0,0],t.resetZoomText(),e.content_type){case"json":canvas.loadFromJSON(e.content,function(){if(t.calculateInitialZoom(),t.runHooks("updateScrollerDimensions"),t.bindEvents(),e.content){var a=t.getBackgroundImage(e.content),n={pageNumber:e.page_number,defaultBackgroundName:a}
-t.loadBackground(n,function(){t.updateSizeAndPositionBackground(),t.runHooks("fitPage"),canvas.renderAll(),t.runHooks("updateIframe"),t.runHooks("makeBackgroundImageSelected"),t.changeBodyState()})}else t.runHooks("fitPage"),canvas.renderAll(),t.runHooks("updateIframe"),t.changeBodyState()
+t.loadBackground(n,function(){t.updateSizeAndPositionBackground(),t.runHooks("fitPage"),canvas.renderAll(),t.runHooks("updateIframe"),t.runHooks("makeBackgroundImageSelected"),t.changeBodyState()})}else t.runHooks("fitPage"),canvas.renderAll(),setTimeout(function(){t.runHooks("updateIframe")},300),t.changeBodyState()
 t.runHooks("runClearUndoRedo")})
 break
@@ -75 +75 @@
 a.objectID=Math.floor(1e4*Math.random()),a.setHelper=s.setHelper,a.set({left:a.left+o,top:a.top+i}),e.push({objectID:a.objectID,added:a}),a.opacity=0,canvas.insertAt(a,canvas.getObjects().length-canvas.helpersInCanvas,!1),setTimeout(function(e,a){return function(){canvas.getObjectByID(e).length&&(canvas.getObjectByID(e)[0].opacity=a,canvas.renderAll(),t.runHooks("updateIframe"))}}(a.objectID,n),10)}),r==n.length-1&&(e.push({objectID:canvas.getActiveObject().objectID,removed:canvas.getActiveObject()}),t.runHooks("pushUndoData",e),canvas.remove(canvas.getActiveObject()))}canvas.renderAll(),canvas.discardActiveObject()}},zoomIn:function(e){var a=(t.getDefaults(),canvas.getZoom()+.04)
 canvas.zoomToPoint({x:canvas.getCenter().left,y:canvas.getCenter().top},a),e.length&&e.find("span").html(parseInt(100*a)+"%")},zoomOut:function(e){var a=(t.getDefaults(),canvas.getZoom()+-.04)
-a<.1||(canvas.zoomToPoint({x:canvas.getCenter().left,y:canvas.getCenter().top},a),e.length&&e.find("span").html(parseInt(100*a)+"%"))},mouseZoomInit:function(a){var n=t.getDefaults()
-e(canvas.getElement().parentNode).on("mousewheel",function(e,a){return function(e){if(parseInt(allowMouseZoomHandler)){t.runHooks("stopImageToolbar"),t.runHooks("stopDefaultToolbar"),t.runHooks("stopTextToolbar")
-var n=canvas.getZoom()+e.originalEvent.deltaY/2500
-if(n<.1)return
-canvas.zoomToPoint({x:canvas.getCenter().left,y:canvas.getCenter().top},n),a.length&&a.find("span").html(parseInt(100*n)+"%")}}}(n,a))},resetZoomText:function(){var a=t.getDefaults()
+a<.1||(canvas.zoomToPoint({x:canvas.getCenter().left,y:canvas.getCenter().top},a),e.length&&e.find("span").html(parseInt(100*a)+"%"))},mouseZoomInit:function(a){var n=t.getDefaults(),o=/Firefox/i.test(navigator.userAgent)?"DOMMouseScroll":"mousewheel",i=e(canvas.getElement().parentNode)
+i.length&&(i=i[0],i.addEventListener(o,function(e,a,n){return function(e){if(parseInt(allowMouseZoomHandler)){t.runHooks("stopImageToolbar"),t.runHooks("stopDefaultToolbar"),t.runHooks("stopTextToolbar")
+var o,i,r=navigator.userAgent.toLowerCase(),s=!!navigator.userAgent.match(/Trident.*/)||r.indexOf("safari/")!==-1&&r.indexOf("windows")!==-1
+if("mousewheel"==n?s?(o=-e.wheelDelta,i=canvas.getZoom()+o/3e3):(o=e.deltaY,i=canvas.getZoom()+o/2500):(o=e.detail,i=canvas.getZoom()+o/150),i<.1)return
+canvas.zoomToPoint({x:canvas.getCenter().left,y:canvas.getCenter().top},i),a.length&&a.find("span").html(parseInt(100*i)+"%"),e.preventDefault()}}}(n,a,o)))},resetZoomText:function(){var a=t.getDefaults()
 e(a.zoomTextContainer).find("span").html("100%")},verifytd:function(){t.getDefaults()
 "tdpreview"===previewType&&window.innerWidth>900&&(e("#tdIframe").css({display:"inline-block"}),e("#edit_tab").css({width:"60% "}),e("#preview_tab").css({width:"60% "}))},clearSelection:function(){canvas.discardActiveObject(),canvas.discardActiveGroup()},checkEvents:function(){e(window).on("resize",function(){clearTimeout(resizeWindowID),resizeWindowID=setTimeout(function(){window.innerWidth<900?(t.runHooks("unbindEventsDefaultToolbar"),t.runHooks("unbindEventsTextToolbar"),t.runHooks("unbindEventsImageToolbar")):(t.runHooks("bindEventsDefaultToolbar"),t.runHooks("bindEventsTextToolbar"),t.runHooks("bindEventsImageToolbar"))},500)})},goBack:function(){admin?window.parent.jQuery.fancybox.close():window.history.back()},adminSaveProject:function(){var a=t.getDefaults(),n=e(a.droppable).data("page")
@@ -827 +827 @@
 this.runHooks("hideShowUndoRedo"),this.changeBodyState("edit_area"),o.parent().removeClass(this.active),n.parent().addClass(this.active),i.parent().removeClass(this.active),t.removeClass(this.active),a.addClass(this.active),this.runHooks("resetPagination"),this.runHooks("unbindPreviewTriggerPagination"),this.runHooks("bindEditTriggerPagination"),e.editorCustomPagination.init({page:1}),this.runHooks("loadCanvas",themePageContent[0])},changeBodyState:function(t){e(this.body).removeClass(this.bodyStates),t&&e(this.body).addClass(t)},init:function(){var t=this.getElement("previewButton"),a=this.getElement("editButton"),n=this.getElement("addCart")
 this.getElement("saveAdminEditOrder")
-t.off("click").on("click",function(t){return function(){e(this).parent().hasClass("active")||t.previewAction()}}(this)),a.off("click").on("click",function(t){return function(){e(this).parent().hasClass("active")||t.editAction()}}(this)),n.off("click").on("click",function(e){return function(){e.addToCart()}}(this))}})}(window.jQuery),!function(e){e.widget("printq.scrollerDesignerWidget",e.printq.persBaseWidget,{version:"1.0.0",canvasContainer:[],scroller:[],scrollDesign:[],ignoreScroll:!1,centerZoomOffset:{},options:{canvasContainer:".droppable > .canvas-container",scrollDesign:".scrollDesign"},_create:function(){this.init(),this.eventLister()},init:function(){this.connectHooks()},updateScrollerDimensions:function(){var e=this.getElement("canvasContainer"),t=e[0].getBoundingClientRect(),a={width:this.element.width(),height:this.element.height()},n={width:this.element.prop("clientWidth"),height:this.element.prop("clientHeight")}
-t&&this.element.css({width:t.width+Math.abs(parseFloat(a.width)-parseFloat(n.width)),height:t.height+Math.abs(parseFloat(a.height)-parseFloat(n.height))})
-var o=this.getElement("scrollDesign",!0)
-o&&(o.css({width:0,height:0}),this.element.hide())},eventLister:function(){canvas.on("zoom_canvas",function(e){return function(t){var a=t.target
+t.off("click").on("click",function(t){return function(){e(this).parent().hasClass("active")||t.previewAction()}}(this)),a.off("click").on("click",function(t){return function(){e(this).parent().hasClass("active")||t.editAction()}}(this)),n.off("click").on("click",function(e){return function(){e.addToCart()}}(this))}})}(window.jQuery),!function(e){e.widget("printq.scrollerDesignerWidget",e.printq.persBaseWidget,{version:"1.0.0",canvasContainer:[],scroller:[],scrollDesign:[],ignoreScroll:!1,centerZoomOffset:{},offset:17,options:{canvasContainer:".droppable > .canvas-container",scrollDesign:".scrollDesign"},_create:function(){this.init(),this.eventLister()},init:function(){this.connectHooks()},updateScrollerDimensions:function(){var e=this.getElement("canvasContainer"),t=e[0].getBoundingClientRect()
+this.element.css({width:0,height:0}),t&&this.element.css({width:t.width+this.offset,height:t.height+this.offset})
+var a=this.getElement("scrollDesign",!0)
+a&&a.css({width:0,height:0}),this.element.hide()},eventLister:function(){canvas.on("zoom_canvas",function(e){return function(t){var a=t.target,a=t.target
 if(a){var n=a.viewportTransform,o=fabric.util.transformPoint({x:a.getWidth(),y:a.getHeight()},n,!0)
 e.element.find(".scrollDesign").css({width:o.x,height:o.y}),n[4]<0&&n[5]<0?e.element.show():e.element.hide(),e.ignoreScroll=!0,e.element.scrollLeft(Math.abs(n[4])),e.element.scrollTop(Math.abs(n[5]))}}}(this)),this.element.on("scroll",function(e){return function(t){var a=e.ignoreScroll
@@ -837 +837 @@
 canvas.viewportTransform[4]=-n,canvas.viewportTransform[5]=-o,canvas.renderAll()
 var r=canvas.getObjects()
-for(i=0;i<r.length;i++)r[i].setCoords()}}}(this))},connectHooks:function(){this.addGlobalHook("updateScrollerDimensions",this.updateScrollerDimensions,this)}})}(window.jQuery),!function(e){e.widget("printq.downloadWidget",e.printq.persBaseWidget,{version:"1.0.0",active:"active",imageCanvasId:"imagePlaceHolder",mask:[],dropDown:[],triggerMenu:[],downloadImg:[],blurSelectors:".downloadPdfAction, .downloadOptions li, .downloadOptions li a, .downloadPdfAction span ",options:{triggerMenu:".downloadPdfAction",dropDown:".downloadOptions",mask:"#loading-mask"},init:function(){this.connectHooks(),this.blurThis()
+for(var i=0;i<r.length;i++)r[i].setCoords()}}}(this))},connectHooks:function(){this.addGlobalHook("updateScrollerDimensions",this.updateScrollerDimensions,this)}})}(window.jQuery),!function(e){e.widget("printq.downloadWidget",e.printq.persBaseWidget,{version:"1.0.0",active:"active",imageCanvasId:"imagePlaceHolder",mask:[],dropDown:[],triggerMenu:[],downloadImg:[],blurSelectors:".downloadPdfAction, .downloadOptions li, .downloadOptions li a, .downloadPdfAction span ",options:{triggerMenu:".downloadPdfAction",dropDown:".downloadOptions",mask:"#loading-mask"},init:function(){this.connectHooks(),this.blurThis()
 var t=this.getElement("triggerMenu")
 t.off("click").on("click",function(t){return function(){var a=t.getElement("dropDown")

web-to-printq/trunk/assets/js/fabric.1.4.5.39.min.js

@@ -1061 +1061 @@
 var a=e.Object.prototype.stateProperties.concat()
 a.push("fontFamily","fontWeight","fontSize","text","textDecoration","textAlign","fontStyle","lineHeight","letterSpace","textBackgroundColor"),e.Text=e.util.createClass(e.Object,{_dimensionAffectingProps:{fontSize:!0,fontWeight:!0,fontFamily:!0,fontStyle:!0,lineHeight:!0,stroke:!0,strokeWidth:!0,text:!0,textAlign:!0,letterSpace:!0},_reNewline:/\r?\n/,_reSpacesAndTabs:/[ \t\r]+/g,type:"text",fontSize:40,fontWeight:"normal",fontFamily:"Times New Roman",textDecoration:"",textAlign:"left",fontStyle:"",lineHeight:1.16,textBackgroundColor:"",stateProperties:a,stroke:null,shadow:null,_fontSizeFraction:.25,_fontSizeMult:1.13,curvedText:!1,reverse:!1,spacing:0,radius:60,arcWidth:0,objectID:"",backgroundColorId:null,fillColorId:null,strokeColorId:null,initialize:function(t,e){e=e||{},"undefined"==typeof e.objectID&&(this.objectID=Math.floor(1e4*Math.random())),this.text=t,this.__skipDimension=!0,this.setOptions(e),this.__skipDimension=!1,this._initDimensions()},_initDimensions:function(t){this.__skipDimension||(t||(t=e.util.createCanvasElement().getContext("2d"),this._setTextStyles(t)),this._textLines=this._splitTextIntoLines(),this._clearCache(),this._cacheLinesWidth="justify"!==this.textAlign,this.width=this._getTextWidth(t),this._cacheLinesWidth=!0,this.height=this._getTextHeight(t),this.curvedText&&(this._measureCurvedText(t,this._textLines[0]),this.height=parseInt(2*(this.radius+this.fontSize)),this.width=parseInt(2*(this.radius+this.fontSize))))},toString:function(){return"#<fabric.Text ("+this.complexity()+'): { "text": "'+this.text+'", "fontFamily": "'+this.fontFamily+'" }>'},_render:function(t){this.clipTo&&e.util.clipContext(this,t),this._setOpacity(t),this._setShadow(t),this._setupCompositeOperation(t),this._renderTextBackground(t),this._setStrokeStyles(t),this._setFillStyles(t),this._renderText(t),this._renderTextDecoration(t),this.clipTo&&t.restore()},_renderText:function(t){this._translateForTextAlign(t),this._renderTextFill(t),this._renderTextStroke(t),this._translateForTextAlign(t,!0)},_translateForTextAlign:function(t,e){if("left"!==this.textAlign&&"justify"!==this.textAlign&&!this.curvedText){var i=e?-1:1
-t.translate("center"===this.textAlign?i*this.width/2:i*this.width,0)}},_setTextStyles:function(t){t.textBaseline="alphabetic",this.skipTextAlign||(t.textAlign=this.textAlign),t.font=this._getFontDeclaration()},_getTextHeight:function(){return this._textLines.length*this._getHeightOfLine()},_getTextWidth:function(t){for(var e=this._getLineWidth(t,0),i=1,r=this._textLines.length;i<r;i++){var s=this._getLineWidth(t,i)
+t.translate("center"===this.textAlign?i*this.width/2:i*this.width,0)}"justify"==this.textAlign&&(t.textAlign="left")},_setTextStyles:function(t){t.textBaseline="alphabetic",this.skipTextAlign||(t.textAlign=this.textAlign),t.font=this._getFontDeclaration()},_getTextHeight:function(){return this._textLines.length*this._getHeightOfLine()},_getTextWidth:function(t){for(var e=this._getLineWidth(t,0),i=1,r=this._textLines.length;i<r;i++){var s=this._getLineWidth(t,i)
 s>e&&(e=s)}return e},_renderChars:function(t,e,i,r,s){e[t](i,r,s)},_measureCurvedText:function(t,i){for(var r=0,s=0,n=0;n<i.length;n++){var o=e.util.radiansToDegrees(t.measureText(i.substr(n,1)).width/this.radius)
 " "==i.substr(n,1)&&(s=1),r-=parseInt(o+this.spacing+s),s=0}this.arcWidth=Math.abs(r)},_renderCurvedText:function(t,i,r,s,n,o){var a=180,h=0,c=0,l=[],u=0,f=0,d=0
@@ -1085 +1085 @@
 var i,r,s=this._textLines[e]
 return""===s?i=0:"justify"===this.textAlign&&this._cacheLinesWidth?(r=s.split(" "),i=r.length>1?this.width:t.measureText(s).width):i=t.measureText(s).width,this._cacheLinesWidth&&(this.__lineWidths[e]=i),i},_renderTextDecoration:function(t){function i(i){var n,o,a,h,c=0
-if(s.curvedText){new e.Circle({radius:20,left:100,top:100,angle:45,startAngle:0,endAngle:Math.PI,stroke:"#000",strokeWidth:3,fill:""})}else for(n=0,o=s._textLines.length;n<o;n++){var l=s._getLineWidth(t,n),u=s._getLineLeftOffset(l),f=s._getHeightOfLine(t,n)
+if(s.curvedText){new e.Circle({radius:20,left:100,top:100,angle:45,startAngle:0,endAngle:Math.PI,stroke:"#000",strokeWidth:3,fill:""})}else for(n=0,o=s._textLines.length;n<o;n++){var l
+l="justify"==s.textAlign?s.width:s._getLineWidth(t,n)
+var u=s._getLineLeftOffset(l),f=s._getHeightOfLine(t,n)
 for(a=0,h=i.length;a<h;a++)t.fillRect(s._getLeftOffset()+u,c+(s._fontSizeMult-1+i[a])*s.fontSize-r,l,s.fontSize/15)
 c+=f}}if(this.textDecoration){var r=this.height/2,s=this,n=[]
@@ -1133 +1135 @@
 for(var r=this.get2DCursorLocation(this.selectionStart),s=this.get2DCursorLocation(this.selectionEnd),n=r.lineIndex,o=s.lineIndex,a=n;a<=o;a++){var h=this._getCachedLineOffset(a)||0,c=this._getHeightOfLine(this.ctx,a),l=0,u=this._textLines[a]
 if(a===n)for(var f=0,d=u.length;f<d;f++)f>=r.charIndex&&(a!==o||f<s.charIndex)&&(l+=this._getWidthOfChar(i,u[f],a,f)),f<r.charIndex&&(h+=this._getWidthOfChar(i,u[f],a,f))
-else if(a>n&&a<o)l+=this._getLineWidth(i,a)||5
-else if(a===o)for(var g=0,p=s.charIndex;g<p;g++)l+=this._getWidthOfChar(i,u[g],a,g)
+else if(a>n&&a<o)l+="justify"==this.textAlign?this.width:this._getLineWidth(i,a)||5
+else if(a===o)if("justify"==this.textAlign)l+=this.width
+else for(var g=0,p=s.charIndex;g<p;g++)l+=this._getWidthOfChar(i,u[g],a,g)
 i.fillRect(e.left+h,e.top+e.topOffset,l,c),e.topOffset+=c}},_renderChars:function(t,e,i,r,s,n){if(this.isEmptyStyles())return this._renderCharsFast(t,e,i,r,s)
 this.skipTextAlign=!0,r-="center"===this.textAlign?this.width/2:"right"===this.textAlign?this.width:0
@@ -1231 +1234 @@
 else{if(!(t.keyCode in this._ctrlKeysMap&&(t.ctrlKey||t.metaKey)))return
 this[this._ctrlKeysMap[t.keyCode]](t)}t.stopImmediatePropagation(),t.preventDefault(),this.canvas&&this.canvas.renderAll()}},onInput:function(t){if(!this.isEditing||this._cancelOnInput)return void(this._cancelOnInput=!1)
-var e=this.selectionStart||0,i=this.text.length,r=this.hiddenTextarea.value.length,s=r-i,n=this.hiddenTextarea.value.slice(e,e+s)
+var e,i=this.selectionStart||0,r=this.text.length,s=this.hiddenTextarea.value.length
+e=s>r?s-r:1
+var n=this.hiddenTextarea.value.slice(i,i+e)
 this.insertChars(n),t.stopPropagation()},forwardDelete:function(t){if(this.selectionStart===this.selectionEnd){if(this.selectionStart===this.text.length)return
 this.moveCursorRight(t)}this.removeChars(t)},copy:function(t){var e=this.getSelectedText(),i=this._getClipboardData(t)
@@ -1267 +1272 @@
 for(var o=0,a=0;a<i.length;a++)a>0&&(o+=this.letterSpace+e.measureText(i.charAt(a-1)).width),e[t](i.charAt(a),r-o,s)}else if("center"==this.textAlign){for(var h=0,a=0;a<n.length;a++)h+=e.measureText(n[a]).width+this.letterSpace
 for(var c=r+(this.width-h)/2,o=0,a=0;a<i.length;a++)o+=this.letterSpace+e.measureText(i.charAt(a-1)).width,e[t](i.charAt(a),c+r+o,s)}},_getLineWidth:function(t,e){if(this.curvedText&&this.__lineWidths[e])return this.__lineWidths[e]
+this._setTextStyles(t)
 var i=this._textLines[e].length,r=0
 return i>0&&(r=this.letterSpace*i),this.__lineWidths[e]=t.measureText(this._textLines[e]).width+r,this.__lineWidths[e]},_renderExtended:function(t){this.clipTo&&fabric.util.clipContext(this,t),this.extendedRender=!0,this._renderTextBackground(t),this._renderText(t),this._renderTextDecoration(t),this.clipTo&&t.restore()}}),function(){var t=fabric.util.toFixed,e=fabric.Object.NUM_FRACTION_DIGITS

web-to-printq/trunk/printq_designer.php

@@ -3 +3 @@
     
     /*
-    * Plugin Name: Web To PrintQ
+    * Plugin Name: Web To PrintQ - Product Designer
     * Plugin URI: http://en.web-to-printq.com/wp-designer/
     * Description: Plugin for integrating printQ Designer into WooCommerce
     * Author: CloudLab AG
-    * Version: 1.2.1
+    * Version: 1.2.2
     * Author URI: http://www.printq.eu
     * Requires at least: 4.4
@@ -17 +17 @@
     */
 
-    define( 'PRINTQ_DESIGNER_VERSION', '1.2.1' );
+    define( 'PRINTQ_DESIGNER_VERSION', '1.2.2' );
     
     define( 'PRINTQ_ROOT', dirname( __FILE__ ) . DIRECTORY_SEPARATOR );

web-to-printq/trunk/readme.txt

@@ -1 @@
-=== Web To PrintQ ===
+=== Web To PrintQ - Product Designer ===
 Contributors: CloudLab AG
 Donate link: http://en.web-to-printq.com/contact/
@@ -5 +5 @@
 Requires at least: 4.4
 Tested up to: 4.6
-Stable tag: 1.2.1
+Stable tag: 1.2.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -139 +139 @@
 == Changelog ==
 
+= 1.2.2 =
+* Various bug fixes
+
 = 1.2.1 =
 * Added helpers, static blocks, various bug fixes

web-to-printq/trunk/views/head.php

@@ -417 +417 @@
 iframe_update = true,
 previewType = '<?php echo isset( $tmpl_data['enable_3d_preview'] ) && $tmpl_data['enable_3d_preview'] == 1 ? 'tdpreview' : '' ?>',
-rd_texture = '',
+rd_texture = '<?php echo isset( $tmpl_data['3d_texture'] ) ? $tmpl_data['3d_texture'] : '' ?>',
 isFrontEndUser = <?php echo $is_admin ? 'false' : 'true' ?>,
 admin = <?php echo $is_admin ? 'true' : 'false' ?>,