From b0bc7eb37a117cb7ab5271cd67426afdfb908a21 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 13 Nov 2016 08:31:23 +0000 Subject: [PATCH] update text function to dist --- app/bower_components/bootstrap/.bower.json | 2 +- app/bower_components/jquery/.bower.json | 2 +- app/index.html | 4 ++-- dist/bower_components/bootstrap/.bower.json | 2 +- dist/bower_components/jquery/.bower.json | 2 +- dist/index.html | 2 +- dist/scripts/controllers/tshirtdesign.js | 2 +- dist/views/design_part/text.html | 1 + dist/views/tshirt-design.html | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 dist/views/design_part/text.html diff --git a/app/bower_components/bootstrap/.bower.json b/app/bower_components/bootstrap/.bower.json index 99de6ef..4a33aa7 100644 --- a/app/bower_components/bootstrap/.bower.json +++ b/app/bower_components/bootstrap/.bower.json @@ -39,6 +39,6 @@ "commit": "0b9c4a4007c44201dce9a6cc1a38407005c26c86" }, "_source": "https://github.com/twbs/bootstrap.git", - "_target": "^3.3.7", + "_target": "~3.3.7", "_originalSource": "bootstrap" } \ No newline at end of file diff --git a/app/bower_components/jquery/.bower.json b/app/bower_components/jquery/.bower.json index ea6be44..7587cb2 100644 --- a/app/bower_components/jquery/.bower.json +++ b/app/bower_components/jquery/.bower.json @@ -20,6 +20,6 @@ "commit": "1b30f3ad466ebf2714d47eda34dbd7fdf6849fe3" }, "_source": "https://github.com/jquery/jquery-dist.git", - "_target": "^3.1.1", + "_target": "~3.1.1", "_originalSource": "jquery" } \ No newline at end of file diff --git a/app/index.html b/app/index.html index c63b7ab..579c2c2 100644 --- a/app/index.html +++ b/app/index.html @@ -10,10 +10,10 @@ - + @@ -46,7 +46,7 @@ \ No newline at end of file diff --git a/dist/scripts/controllers/tshirtdesign.js b/dist/scripts/controllers/tshirtdesign.js index 9f8161d..b267237 100644 --- a/dist/scripts/controllers/tshirtdesign.js +++ b/dist/scripts/controllers/tshirtdesign.js @@ -1 +1 @@ -define(["app"],function(app){"use strict";app.controller("TshirtdesignCtrl",function($scope,$rootScope,$illustration){function onIllustrationChange(options){}function onllustrationSelected(options){$scope.currentObject=canvas.getActiveObject(),console.log(canvas.getActiveObject())}var canvas=new fabric.Canvas("main-design-container");fabric.Object.prototype.transparentCorners=!1,canvas.on("after:render",function(){}),canvas.on({"object:moving":onIllustrationChange,"object:scaling":onIllustrationChange,"object:rotating":onIllustrationChange,"object:selected":onllustrationSelected}),$scope.currentObject=null,$scope.changeIllustrationCategory=function(currentIllustration){$scope.currentIllustrationCate=$illustration.getList(currentIllustration),console.log($scope.currentIllustrationCate)},$scope.insertSvg=function(item){fabric.loadSVGFromURL(item.path,function(objects,options){var shape=fabric.util.groupSVGElements(objects,options);canvas.add(shape.scale(.6)),shape.set({left:150,top:200}).setCoords(),canvas.renderAll(),canvas.setActiveObject(shape)})},$scope.changeColorPattern=function(color){canvas.getActiveObject().set("fill",color),canvas.renderAll()},$scope.listColorPatterns=["#000000","#ffff00","#ff6600","#ff0000","#ff6262","#ffa19c","#ff9933","#c45d01","#5d2b03","#ffffcc","#000000","#ffff00","#ff6600","#ff0000","#ff6262","#ffa19c","#ff9933","#c45d01","#5d2b03","#ffffcc","#000000","#ffff00","#ff6600","#ff0000","#ff6262","#ffa19c","#ff9933","#c45d01","#5d2b03","#ffffcc","#ffffcc"]})}); \ No newline at end of file +define(["app"],function(app){"use strict";app.controller("TshirtdesignCtrl",function($scope,$rootScope,$illustration){function onIllustrationChange(options){}function onllustrationSelected(options){$scope.currentObject=canvas.getActiveObject(),console.log(canvas.getActiveObject())}var canvas=new fabric.Canvas("main-design-container");fabric.Object.prototype.transparentCorners=!1,canvas.on("after:render",function(){}),canvas.on({"object:moving":onIllustrationChange,"object:scaling":onIllustrationChange,"object:rotating":onIllustrationChange,"object:selected":onllustrationSelected}),$scope.currentObject=null,$scope.changeIllustrationCategory=function(currentIllustration){$scope.currentIllustrationCate=$illustration.getList(currentIllustration),console.log($scope.currentIllustrationCate)},$scope.insertSvg=function(item){fabric.loadSVGFromURL(item.path,function(objects,options){var shape=fabric.util.groupSVGElements(objects,options);canvas.add(shape.scale(.6)),shape.set({left:150,top:200}).setCoords(),canvas.renderAll(),canvas.setActiveObject(shape)})},$scope.changeColorPattern=function(color){canvas.getActiveObject().set("fill",color),canvas.renderAll()},$scope.listColorPatterns=["#000000","#ffff00","#ff6600","#ff0000","#ff6262","#ffa19c","#ff9933","#c45d01","#5d2b03","#ffffcc","#000000","#ffff00","#ff6600","#ff0000","#ff6262","#ffa19c","#ff9933","#c45d01","#5d2b03","#ffffcc","#000000","#ffff00","#ff6600","#ff0000","#ff6262","#ffa19c","#ff9933","#c45d01","#5d2b03","#ffffcc","#ffffcc"],$scope.inputText=function(e){var text=e,iText=new fabric.IText(text);canvas.add(iText),canvas.renderAll(),canvas.setActiveObject(iText)}})}); \ No newline at end of file diff --git a/dist/views/design_part/text.html b/dist/views/design_part/text.html new file mode 100644 index 0000000..f4f4e8d --- /dev/null +++ b/dist/views/design_part/text.html @@ -0,0 +1 @@ +
  • Text
    • \ No newline at end of file diff --git a/dist/views/tshirt-design.html b/dist/views/tshirt-design.html index 64b4909..d78734a 100644 --- a/dist/views/tshirt-design.html +++ b/dist/views/tshirt-design.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file -- 1.8.5.3