Commit b0bc7eb37a117cb7ab5271cd67426afdfb908a21
1 parent
98acd3acd9
Exists in
master
and in
1 other branch
update text function to dist
Showing 9 changed files with 10 additions and 9 deletions Inline Diff
- app/bower_components/bootstrap/.bower.json
- app/bower_components/jquery/.bower.json
- app/index.html
- dist/bower_components/bootstrap/.bower.json
- dist/bower_components/jquery/.bower.json
- dist/index.html
- dist/scripts/controllers/tshirtdesign.js
- dist/views/design_part/text.html
- dist/views/tshirt-design.html
app/bower_components/bootstrap/.bower.json
| 1 | { | 1 | { |
| 2 | "name": "bootstrap", | 2 | "name": "bootstrap", |
| 3 | "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", | 3 | "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", |
| 4 | "keywords": [ | 4 | "keywords": [ |
| 5 | "css", | 5 | "css", |
| 6 | "js", | 6 | "js", |
| 7 | "less", | 7 | "less", |
| 8 | "mobile-first", | 8 | "mobile-first", |
| 9 | "responsive", | 9 | "responsive", |
| 10 | "front-end", | 10 | "front-end", |
| 11 | "framework", | 11 | "framework", |
| 12 | "web" | 12 | "web" |
| 13 | ], | 13 | ], |
| 14 | "homepage": "http://getbootstrap.com", | 14 | "homepage": "http://getbootstrap.com", |
| 15 | "license": "MIT", | 15 | "license": "MIT", |
| 16 | "moduleType": "globals", | 16 | "moduleType": "globals", |
| 17 | "main": [ | 17 | "main": [ |
| 18 | "less/bootstrap.less", | 18 | "less/bootstrap.less", |
| 19 | "dist/js/bootstrap.js" | 19 | "dist/js/bootstrap.js" |
| 20 | ], | 20 | ], |
| 21 | "ignore": [ | 21 | "ignore": [ |
| 22 | "/.*", | 22 | "/.*", |
| 23 | "_config.yml", | 23 | "_config.yml", |
| 24 | "CNAME", | 24 | "CNAME", |
| 25 | "composer.json", | 25 | "composer.json", |
| 26 | "CONTRIBUTING.md", | 26 | "CONTRIBUTING.md", |
| 27 | "docs", | 27 | "docs", |
| 28 | "js/tests", | 28 | "js/tests", |
| 29 | "test-infra" | 29 | "test-infra" |
| 30 | ], | 30 | ], |
| 31 | "dependencies": { | 31 | "dependencies": { |
| 32 | "jquery": "1.9.1 - 3" | 32 | "jquery": "1.9.1 - 3" |
| 33 | }, | 33 | }, |
| 34 | "version": "3.3.7", | 34 | "version": "3.3.7", |
| 35 | "_release": "3.3.7", | 35 | "_release": "3.3.7", |
| 36 | "_resolution": { | 36 | "_resolution": { |
| 37 | "type": "version", | 37 | "type": "version", |
| 38 | "tag": "v3.3.7", | 38 | "tag": "v3.3.7", |
| 39 | "commit": "0b9c4a4007c44201dce9a6cc1a38407005c26c86" | 39 | "commit": "0b9c4a4007c44201dce9a6cc1a38407005c26c86" |
| 40 | }, | 40 | }, |
| 41 | "_source": "https://github.com/twbs/bootstrap.git", | 41 | "_source": "https://github.com/twbs/bootstrap.git", |
| 42 | "_target": "^3.3.7", | 42 | "_target": "~3.3.7", |
| 43 | "_originalSource": "bootstrap" | 43 | "_originalSource": "bootstrap" |
| 44 | } | 44 | } |
app/bower_components/jquery/.bower.json
| 1 | { | 1 | { |
| 2 | "name": "jquery", | 2 | "name": "jquery", |
| 3 | "main": "dist/jquery.js", | 3 | "main": "dist/jquery.js", |
| 4 | "license": "MIT", | 4 | "license": "MIT", |
| 5 | "ignore": [ | 5 | "ignore": [ |
| 6 | "package.json" | 6 | "package.json" |
| 7 | ], | 7 | ], |
| 8 | "keywords": [ | 8 | "keywords": [ |
| 9 | "jquery", | 9 | "jquery", |
| 10 | "javascript", | 10 | "javascript", |
| 11 | "browser", | 11 | "browser", |
| 12 | "library" | 12 | "library" |
| 13 | ], | 13 | ], |
| 14 | "homepage": "https://github.com/jquery/jquery-dist", | 14 | "homepage": "https://github.com/jquery/jquery-dist", |
| 15 | "version": "3.1.1", | 15 | "version": "3.1.1", |
| 16 | "_release": "3.1.1", | 16 | "_release": "3.1.1", |
| 17 | "_resolution": { | 17 | "_resolution": { |
| 18 | "type": "version", | 18 | "type": "version", |
| 19 | "tag": "3.1.1", | 19 | "tag": "3.1.1", |
| 20 | "commit": "1b30f3ad466ebf2714d47eda34dbd7fdf6849fe3" | 20 | "commit": "1b30f3ad466ebf2714d47eda34dbd7fdf6849fe3" |
| 21 | }, | 21 | }, |
| 22 | "_source": "https://github.com/jquery/jquery-dist.git", | 22 | "_source": "https://github.com/jquery/jquery-dist.git", |
| 23 | "_target": "^3.1.1", | 23 | "_target": "~3.1.1", |
| 24 | "_originalSource": "jquery" | 24 | "_originalSource": "jquery" |
| 25 | } | 25 | } |
app/index.html
| 1 | <!doctype html> | 1 | <!doctype html> |
| 2 | <!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" id="ng-app" ng-app=""> <![endif]--> | 2 | <!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" id="ng-app" ng-app=""> <![endif]--> |
| 3 | <!--[if IE 8]> <html class="no-js lt-ie9" id="ng-app" ng-app=""> <![endif]--> | 3 | <!--[if IE 8]> <html class="no-js lt-ie9" id="ng-app" ng-app=""> <![endif]--> |
| 4 | <!--[if gt IE 8]><!--> <html class="no-js" ng-app> <!--<![endif]--> | 4 | <!--[if gt IE 8]><!--> <html class="no-js" ng-app> <!--<![endif]--> |
| 5 | <head> | 5 | <head> |
| 6 | <meta charset="utf-8"> | 6 | <meta charset="utf-8"> |
| 7 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> | 7 | <meta http-equiv="X-UA-Compatible" content="IE=edge"> |
| 8 | <title></title> | 8 | <title></title> |
| 9 | <meta name="description" content=""> | 9 | <meta name="description" content=""> |
| 10 | <meta name="viewport" content="width=device-width"> | 10 | <meta name="viewport" content="width=device-width"> |
| 11 | <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> | 11 | <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> |
| 12 | <!-- build:css styles/vendor.css --> | 12 | <!-- build:css styles/vendor.css --> |
| 13 | <!-- bower:css --> | ||
| 14 | <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" /> | 13 | <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" /> |
| 15 | <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" /> | 14 | <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" /> |
| 16 | <link rel="stylesheet" href="bower_components/select2/select2.css"> | 15 | <link rel="stylesheet" href="bower_components/select2/select2.css"> |
| 16 | <!-- bower:css --> | ||
| 17 | <!-- endbower --> | 17 | <!-- endbower --> |
| 18 | <!-- endbuild --> | 18 | <!-- endbuild --> |
| 19 | <!-- build:css({.tmp,app}) styles/main.css --> | 19 | <!-- build:css({.tmp,app}) styles/main.css --> |
| 20 | <link rel="stylesheet" href="styles/main.css"> | 20 | <link rel="stylesheet" href="styles/main.css"> |
| 21 | <!-- endbuild --> | 21 | <!-- endbuild --> |
| 22 | </head> | 22 | </head> |
| 23 | <body ng-app="tshatsApp"> | 23 | <body ng-app="tshatsApp"> |
| 24 | <!--[if lt IE 7]> | 24 | <!--[if lt IE 7]> |
| 25 | <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> | 25 | <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> |
| 26 | <![endif]--> | 26 | <![endif]--> |
| 27 | 27 | ||
| 28 | <!-- Add your site or application content here --> | 28 | <!-- Add your site or application content here --> |
| 29 | <div class="container" ng-view></div> | 29 | <div class="container" ng-view></div> |
| 30 | 30 | ||
| 31 | <!-- Google Analytics: change UA-XXXXX-X to be your site's ID --> | 31 | <!-- Google Analytics: change UA-XXXXX-X to be your site's ID --> |
| 32 | <script> | 32 | <script> |
| 33 | (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ | 33 | (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
| 34 | (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), | 34 | (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
| 35 | m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) | 35 | m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
| 36 | })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); | 36 | })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
| 37 | 37 | ||
| 38 | ga('create', 'UA-XXXXX-X'); | 38 | ga('create', 'UA-XXXXX-X'); |
| 39 | ga('send', 'pageview'); | 39 | ga('send', 'pageview'); |
| 40 | </script> | 40 | </script> |
| 41 | <script type="text/javascript" src="bower_components/jquery/dist/jquery.min.js"></script> | 41 | <script type="text/javascript" src="bower_components/jquery/dist/jquery.min.js"></script> |
| 42 | <script type="text/javascript" src="bower_components/fabric.js/dist/fabric.min.js"></script> | 42 | <script type="text/javascript" src="bower_components/fabric.js/dist/fabric.min.js"></script> |
| 43 | <script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> | 43 | <script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> |
| 44 | <!--[if lt IE 9]> | 44 | <!--[if lt IE 9]> |
| 45 | <script src="bower_components/es5-shim/es5-shim.js"></script> | 45 | <script src="bower_components/es5-shim/es5-shim.js"></script> |
| 46 | <script src="bower_components/json3/lib/json3.min.js"></script> | 46 | <script src="bower_components/json3/lib/json3.min.js"></script> |
| 47 | <![endif]--> | 47 | <![endif]--> |
| 48 | <script type="text/javascript"> | 48 | <script type="text/javascript"> |
| 49 | var VERSION = '12-11_01'; | 49 | var VERSION = '13-11_01'; |
| 50 | var require = { | 50 | var require = { |
| 51 | urlArgs: "ver="+VERSION, | 51 | urlArgs: "ver="+VERSION, |
| 52 | }; | 52 | }; |
| 53 | </script> | 53 | </script> |
| 54 | <script src="bower_components/requirejs/require.js" data-main="scripts/main"></script> | 54 | <script src="bower_components/requirejs/require.js" data-main="scripts/main"></script> |
| 55 | </body> | 55 | </body> |
| 56 | </html> | 56 | </html> |
dist/bower_components/bootstrap/.bower.json
| 1 | { | 1 | { |
| 2 | "name": "bootstrap", | 2 | "name": "bootstrap", |
| 3 | "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", | 3 | "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", |
| 4 | "keywords": [ | 4 | "keywords": [ |
| 5 | "css", | 5 | "css", |
| 6 | "js", | 6 | "js", |
| 7 | "less", | 7 | "less", |
| 8 | "mobile-first", | 8 | "mobile-first", |
| 9 | "responsive", | 9 | "responsive", |
| 10 | "front-end", | 10 | "front-end", |
| 11 | "framework", | 11 | "framework", |
| 12 | "web" | 12 | "web" |
| 13 | ], | 13 | ], |
| 14 | "homepage": "http://getbootstrap.com", | 14 | "homepage": "http://getbootstrap.com", |
| 15 | "license": "MIT", | 15 | "license": "MIT", |
| 16 | "moduleType": "globals", | 16 | "moduleType": "globals", |
| 17 | "main": [ | 17 | "main": [ |
| 18 | "less/bootstrap.less", | 18 | "less/bootstrap.less", |
| 19 | "dist/js/bootstrap.js" | 19 | "dist/js/bootstrap.js" |
| 20 | ], | 20 | ], |
| 21 | "ignore": [ | 21 | "ignore": [ |
| 22 | "/.*", | 22 | "/.*", |
| 23 | "_config.yml", | 23 | "_config.yml", |
| 24 | "CNAME", | 24 | "CNAME", |
| 25 | "composer.json", | 25 | "composer.json", |
| 26 | "CONTRIBUTING.md", | 26 | "CONTRIBUTING.md", |
| 27 | "docs", | 27 | "docs", |
| 28 | "js/tests", | 28 | "js/tests", |
| 29 | "test-infra" | 29 | "test-infra" |
| 30 | ], | 30 | ], |
| 31 | "dependencies": { | 31 | "dependencies": { |
| 32 | "jquery": "1.9.1 - 3" | 32 | "jquery": "1.9.1 - 3" |
| 33 | }, | 33 | }, |
| 34 | "version": "3.3.7", | 34 | "version": "3.3.7", |
| 35 | "_release": "3.3.7", | 35 | "_release": "3.3.7", |
| 36 | "_resolution": { | 36 | "_resolution": { |
| 37 | "type": "version", | 37 | "type": "version", |
| 38 | "tag": "v3.3.7", | 38 | "tag": "v3.3.7", |
| 39 | "commit": "0b9c4a4007c44201dce9a6cc1a38407005c26c86" | 39 | "commit": "0b9c4a4007c44201dce9a6cc1a38407005c26c86" |
| 40 | }, | 40 | }, |
| 41 | "_source": "https://github.com/twbs/bootstrap.git", | 41 | "_source": "https://github.com/twbs/bootstrap.git", |
| 42 | "_target": "^3.3.7", | 42 | "_target": "~3.3.7", |
| 43 | "_originalSource": "bootstrap" | 43 | "_originalSource": "bootstrap" |
| 44 | } | 44 | } |
dist/bower_components/jquery/.bower.json
| 1 | { | 1 | { |
| 2 | "name": "jquery", | 2 | "name": "jquery", |
| 3 | "main": "dist/jquery.js", | 3 | "main": "dist/jquery.js", |
| 4 | "license": "MIT", | 4 | "license": "MIT", |
| 5 | "ignore": [ | 5 | "ignore": [ |
| 6 | "package.json" | 6 | "package.json" |
| 7 | ], | 7 | ], |
| 8 | "keywords": [ | 8 | "keywords": [ |
| 9 | "jquery", | 9 | "jquery", |
| 10 | "javascript", | 10 | "javascript", |
| 11 | "browser", | 11 | "browser", |
| 12 | "library" | 12 | "library" |
| 13 | ], | 13 | ], |
| 14 | "homepage": "https://github.com/jquery/jquery-dist", | 14 | "homepage": "https://github.com/jquery/jquery-dist", |
| 15 | "version": "3.1.1", | 15 | "version": "3.1.1", |
| 16 | "_release": "3.1.1", | 16 | "_release": "3.1.1", |
| 17 | "_resolution": { | 17 | "_resolution": { |
| 18 | "type": "version", | 18 | "type": "version", |
| 19 | "tag": "3.1.1", | 19 | "tag": "3.1.1", |
| 20 | "commit": "1b30f3ad466ebf2714d47eda34dbd7fdf6849fe3" | 20 | "commit": "1b30f3ad466ebf2714d47eda34dbd7fdf6849fe3" |
| 21 | }, | 21 | }, |
| 22 | "_source": "https://github.com/jquery/jquery-dist.git", | 22 | "_source": "https://github.com/jquery/jquery-dist.git", |
| 23 | "_target": "^3.1.1", | 23 | "_target": "~3.1.1", |
| 24 | "_originalSource": "jquery" | 24 | "_originalSource": "jquery" |
| 25 | } | 25 | } |
dist/index.html
| 1 | <!doctype html><!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" id="ng-app" ng-app=""> <![endif]--><!--[if IE 8]> <html class="no-js lt-ie9" id="ng-app" ng-app=""> <![endif]--><!--[if gt IE 8]><!--><html class="no-js" ng-app=""><!--<![endif]--><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><title></title><meta name="description" content=""><meta name="viewport" content="width=device-width"><!-- Place favicon.ico and apple-touch-icon.png in the root directory --><link rel="stylesheet" href="styles/271347a9.vendor.css"><link rel="stylesheet" href="styles/16689cdc.main.css"><body ng-app="tshatsApp"><!--[if lt IE 7]> | 1 | <!doctype html><!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" id="ng-app" ng-app=""> <![endif]--><!--[if IE 8]> <html class="no-js lt-ie9" id="ng-app" ng-app=""> <![endif]--><!--[if gt IE 8]><!--><html class="no-js" ng-app=""><!--<![endif]--><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><title></title><meta name="description" content=""><meta name="viewport" content="width=device-width"><!-- Place favicon.ico and apple-touch-icon.png in the root directory --><link rel="stylesheet" href="styles/271347a9.vendor.css"><link rel="stylesheet" href="styles/16689cdc.main.css"><body ng-app="tshatsApp"><!--[if lt IE 7]> |
| 2 | <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> | 2 | <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> |
| 3 | <![endif]--><!-- Add your site or application content here --><div class="container" ng-view=""></div><!-- Google Analytics: change UA-XXXXX-X to be your site's ID --><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ | 3 | <![endif]--><!-- Add your site or application content here --><div class="container" ng-view=""></div><!-- Google Analytics: change UA-XXXXX-X to be your site's ID --><script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
| 4 | (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), | 4 | (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
| 5 | m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) | 5 | m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
| 6 | })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); | 6 | })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
| 7 | 7 | ||
| 8 | ga('create', 'UA-XXXXX-X'); | 8 | ga('create', 'UA-XXXXX-X'); |
| 9 | ga('send', 'pageview');</script><script type="text/javascript" src="bower_components/jquery/dist/jquery.min.js"></script><script type="text/javascript" src="bower_components/fabric.js/dist/fabric.min.js"></script><script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script><!--[if lt IE 9]> | 9 | ga('send', 'pageview');</script><script type="text/javascript" src="bower_components/jquery/dist/jquery.min.js"></script><script type="text/javascript" src="bower_components/fabric.js/dist/fabric.min.js"></script><script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script><!--[if lt IE 9]> |
| 10 | <script src="bower_components/es5-shim/es5-shim.js"></script> | 10 | <script src="bower_components/es5-shim/es5-shim.js"></script> |
| 11 | <script src="bower_components/json3/lib/json3.min.js"></script> | 11 | <script src="bower_components/json3/lib/json3.min.js"></script> |
| 12 | <![endif]--><script type="text/javascript">var VERSION = '12-11_01'; | 12 | <![endif]--><script type="text/javascript">var VERSION = '13-11_01'; |
| 13 | var require = { | 13 | var require = { |
| 14 | urlArgs: "ver="+VERSION, | 14 | urlArgs: "ver="+VERSION, |
| 15 | };</script><script src="bower_components/requirejs/require.js" data-main="scripts/main"></script> | 15 | };</script><script src="bower_components/requirejs/require.js" data-main="scripts/main"></script> |
dist/scripts/controllers/tshirtdesign.js
| 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"]})}); | 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"],$scope.inputText=function(e){var text=e,iText=new fabric.IText(text);canvas.add(iText),canvas.renderAll(),canvas.setActiveObject(iText)}})}); |
dist/views/design_part/text.html
| File was created | 1 | <li><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> Text</div><div class="content clearfix"><input type="text" class="form-control" ng-keyup="inputText(design_text)" ng-model="design_text"></div></li> |
dist/views/tshirt-design.html
| 1 | <!-- Modal --><div class="modal fade" id="tshirt-design" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" ng-controller="TshirtdesignCtrl"><div class="modal-dialog" role="document"><div class="modal-content"><div class="modal-header"><button class="black" ng-click="modalClose()"><i class="fa fa-times" aria-hidden="true"></i> キャンセル</button> <button class="black"><i class="fa fa-angle-right" aria-hidden="true"></i> はじめての方へ</button></div><div class="modal-body"><header class="clearfix"><ul class="nav pull-left"><li ng-class="{'active': isShowLeftPanel=='default'}" ng-click="showIllustration('default')"><i class="fa fa-jpy" aria-hidden="true"></i> 文字</li><li ng-class="{'active': isShowLeftPanel=='illustration'}" ng-click="showIllustration('illustration')"><i class="fa fa-btc" aria-hidden="true"></i> イラスト・イメージ</li><li><i class="fa fa-money" aria-hidden="true"></i> 自分の画像・写真</li><li><i class="fa fa-minus-circle" aria-hidden="true"></i> 全消去</li></ul><div class="action pull-right"><button class="white">アルバムを開く</button> <button class="white">アルバムに入れる</button></div></header><section class="tshirt-design-container clearfix"><div class="aside col-xs-4"><ul id="choice-design-option" ng-show="isShowLeftPanel=='default'"><li><div class="hover"></div><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> 文字を追加</div><div class="content clearfix"><div class="col-xs-2 text-center"><i class="fa fa-jpy" aria-hidden="true"></i></div><div class="col-xs-10 des padding-left-0">書体を選んでお好きな文字を入力できます</div></div></li><li><div class="hover"></div><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> イラストやイメージを追加</div><div class="content clearfix"><div class="col-xs-2 text-center"><i class="fa fa-btc" aria-hidden="true"></i></div><div class="col-xs-10 des padding-left-0">自由にお使いいただけるデザイン画像をご用意しました</div></div></li><li><div class="hover"></div><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> 自分の画像・写真を追加</div><div class="content clearfix"><div class="col-xs-2 text-center"><i class="fa fa-jpy" aria-hidden="true"></i></div><div class="col-xs-10 des padding-left-0">ご自分で用意した画像をアップロードして使えます</div></div></li><li><div class="hover"></div><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> おすすめデザインを使う</div><div class="content clearfix"><div class="col-xs-2 text-center"><i class="fa fa-jpy" aria-hidden="true"></i></div><div class="col-xs-10 des padding-left-0">おすすめデザインデータをご自由にカスタマイズしてお使いください</div></div></li></ul><ul id="choice-illustration" ng-show="isShowLeftPanel=='illustration'"><li><div class="hover"></div><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> items</div><div class="content clearfix"><select id="illustration-select-category" ui-select2="illustrationSelectConfig" ng-model="currentIllustration" ng-change="changeIllustrationCategory(currentIllustration)" data-placeholder="Choose category" style="width: 100%"><option ng-repeat="(key,cate) in IllustrationList" value="{{key}}">{{cate.name}}</select><div class="illustration-list"><div class="illstration-item" ng-repeat="item in currentIllustrationCate.list" ng-click="insertSvg(item)"><img ng-src="{{item.path}}"></div><div class="clearfix"></div></div></div></li><li><div class="hover"></div><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> Color to fill</div><div class="content clearfix"><div class="color-patterns"><div class="color-pattern-item" ng-repeat="color in listColorPatterns track by $index" ng-click="changeColorPattern(color)" ng-style="{'background-color': color}"></div><div class="clearfix"></div></div></div></li><li><div class="hover"></div><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> Layer option</div><div class="content clearfix"></div></li></ul></div><div class="design-content col-xs-8"><div class="content" ng-style="{'background-color' : tShirtColorCode}"><canvas id="main-design-container" width="510px" height="620px" class="selection-design lower-canvas"></canvas></div><div class="agree-design"><img src="images/agree-design.png" alt="agree design"></div><div class="trash-design"><img src="images/trash.png" alt="trash design"></div></div></section></div></div></div></div> | 1 | <!-- Modal --><div class="modal fade" id="tshirt-design" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" ng-controller="TshirtdesignCtrl"><div class="modal-dialog" role="document"><div class="modal-content"><div class="modal-header"><button class="black" ng-click="modalClose()"><i class="fa fa-times" aria-hidden="true"></i> キャンセル</button> <button class="black"><i class="fa fa-angle-right" aria-hidden="true"></i> はじめての方へ</button></div><div class="modal-body"><header class="clearfix"><ul class="nav pull-left"><li ng-class="{'active': isShowLeftPanel=='text'}" ng-click="showIllustration('text')"><i class="fa fa-jpy" aria-hidden="true"></i> 文字</li><li ng-class="{'active': isShowLeftPanel=='illustration'}" ng-click="showIllustration('illustration')"><i class="fa fa-btc" aria-hidden="true"></i> イラスト・イメージ</li><li><i class="fa fa-money" aria-hidden="true"></i> 自分の画像・写真</li><li><i class="fa fa-minus-circle" aria-hidden="true"></i> 全消去</li></ul><div class="action pull-right"><button class="white">アルバムを開く</button> <button class="white">アルバムに入れる</button></div></header><section class="tshirt-design-container clearfix"><div class="aside col-xs-4"><ul id="choice-design-option" ng-show="isShowLeftPanel=='default'"><li><div class="hover"></div><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> 文字を追加</div><div class="content clearfix"><div class="col-xs-2 text-center"><i class="fa fa-jpy" aria-hidden="true"></i></div><div class="col-xs-10 des padding-left-0">書体を選んでお好きな文字を入力できます</div></div></li><li><div class="hover"></div><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> イラストやイメージを追加</div><div class="content clearfix"><div class="col-xs-2 text-center"><i class="fa fa-btc" aria-hidden="true"></i></div><div class="col-xs-10 des padding-left-0">自由にお使いいただけるデザイン画像をご用意しました</div></div></li><li><div class="hover"></div><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> 自分の画像・写真を追加</div><div class="content clearfix"><div class="col-xs-2 text-center"><i class="fa fa-jpy" aria-hidden="true"></i></div><div class="col-xs-10 des padding-left-0">ご自分で用意した画像をアップロードして使えます</div></div></li><li><div class="hover"></div><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> おすすめデザインを使う</div><div class="content clearfix"><div class="col-xs-2 text-center"><i class="fa fa-jpy" aria-hidden="true"></i></div><div class="col-xs-10 des padding-left-0">おすすめデザインデータをご自由にカスタマイズしてお使いください</div></div></li></ul><ul id="choice-illustration" ng-show="isShowLeftPanel=='illustration'"><li><div class="hover"></div><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> items</div><div class="content clearfix"><select id="illustration-select-category" ui-select2="illustrationSelectConfig" ng-model="currentIllustration" ng-change="changeIllustrationCategory(currentIllustration)" data-placeholder="Choose category" style="width: 100%"><option ng-repeat="(key,cate) in IllustrationList" value="{{key}}">{{cate.name}}</select><div class="illustration-list"><div class="illstration-item" ng-repeat="item in currentIllustrationCate.list" ng-click="insertSvg(item)"><img ng-src="{{item.path}}"></div><div class="clearfix"></div></div></div></li><li><div class="hover"></div><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> Color to fill</div><div class="content clearfix"><div class="color-patterns"><div class="color-pattern-item" ng-repeat="color in listColorPatterns track by $index" ng-click="changeColorPattern(color)" ng-style="{'background-color': color}"></div><div class="clearfix"></div></div></div></li><li><div class="hover"></div><div class="title"><i class="fa fa-chevron-circle-right" aria-hidden="true"></i> Layer option</div><div class="content clearfix"></div></li></ul><!-- Text design--><ul id="choice-text" ng-show="isShowLeftPanel=='text'" ng-include="'views/design_part/text.html'"></ul></div><div class="design-content col-xs-8"><div class="content" ng-style="{'background-color' : tShirtColorCode}"><canvas id="main-design-container" width="510px" height="620px" class="selection-design lower-canvas"></canvas></div><div class="agree-design"><img src="images/agree-design.png" alt="agree design"></div><div class="trash-design"><img src="images/trash.png" alt="trash design"></div></div></section></div></div></div></div> |