diff --git a/app/scripts/app.js b/app/scripts/app.js index 1303596..b312911 100644 --- a/app/scripts/app.js +++ b/app/scripts/app.js @@ -22,13 +22,6 @@ define(['angular','routes']/*deps*/, function (angular, configRoutes)/*invoke*/ app.filter = $filterProvider.register; app.factory = $provide.factory; app.service = $provide.service; - - // enable below line for enable html5 mode - // $locationProvider.html5Mode({ - // enabled: true, - // requireBase: false - // }); - /* resolve controller function for lazyload */ var resolveController = function (dependencies){ return { @@ -54,7 +47,9 @@ define(['angular','routes']/*deps*/, function (angular, configRoutes)/*invoke*/ if (configRoutes.defaultRoutePaths !== undefined){ $routeProvider.otherwise({redirectTo: configRoutes.defaultRoutePaths}); } + } + // ]); return app; }); diff --git a/app/scripts/controllers/about.js b/app/scripts/controllers/about.js index 4c97e83..a3c6927 100644 --- a/app/scripts/controllers/about.js +++ b/app/scripts/controllers/about.js @@ -1,10 +1,6 @@ define(['app'], function (app) { 'use strict'; app.controller('AboutCtrl', function ($scope) { - $scope.awesomeThings = [ - 'HTML5 Boilerplate', - 'AngularJS', - 'Karma' - ]; + console.log('about page') }); }); diff --git a/app/scripts/controllers/tshirtdesign.js b/app/scripts/controllers/tshirtdesign.js index 9dd9428..6de8679 100644 --- a/app/scripts/controllers/tshirtdesign.js +++ b/app/scripts/controllers/tshirtdesign.js @@ -22,15 +22,9 @@ define(['app'], function (app) { setSizeCanvas(); }); - //Custom control fabric.Object.prototype.transparentCorners = true; fabric.Object.prototype.hasRotatingPoint = false; - // fabric.Object.prototype.selectable = false; - - // fabric.Canvas.prototype.__onMouseDown = function (e) { - // // return false; - // }; var ctrVisible = {tl: false, ml:false, bl:false, mb: false, br: true, mr: false, tr: true, mt: true, mtr: false}; for(key in ctrVisible) { @@ -78,9 +72,6 @@ define(['app'], function (app) { } }); - canvas.on('after:render', function() { - // console.log('after render'); - }); canvas.on({ 'object:added' : onIllustrationAdded, 'object:moving' : onIllustrationMoving, @@ -101,7 +92,6 @@ define(['app'], function (app) { var spacingNum = 0; $scope.itemFont = 0; - $scope.showDesignTab = function(tab){ canvas.deactivateAll().renderAll(); $rootScope.isShowLeftPanel = tab; @@ -118,7 +108,6 @@ define(['app'], function (app) { placement: 'bottom', html: true }); - // console.log('here'); },1000); break; } @@ -132,7 +121,6 @@ define(['app'], function (app) { function onIllustrationAdded(options){ var object = options.target; - // console.log('object:added'); if (actionObj === true) { stateObj = [stateObj[indexCurr2]]; @@ -176,7 +164,6 @@ define(['app'], function (app) { } var object = options.target; - // console.log('object:modified'); if (actionObj === true) { stateObj = [stateObj[indexCurr2]]; listObj = [listObj[indexCurr2]]; @@ -196,11 +183,7 @@ define(['app'], function (app) { } function onIllustrationChange(options) { - // options.target.setCoords(); - // canvas.forEachObject(function(obj) { - // if (obj === options.target) return; - // obj.setOpacity(options.target.intersectsWithObject(obj) ? 0.5 : 1); - // }); + } function onIllustrationMoving(options) { @@ -286,7 +269,6 @@ define(['app'], function (app) { function onObjectSelected(options) { var currentObj = options.target; - $scope.typeObject = currentObj.type; switch ($scope.typeObject) { case 'i-text' : @@ -316,13 +298,11 @@ define(['app'], function (app) { // Illustration process $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); - //shape.setFill('green'); canvas.add(shape.scale(0.6)); shape.set({ left: 150, top: 200 }).setCoords(); canvas.renderAll(); @@ -352,10 +332,6 @@ define(['app'], function (app) { obj.fill = color; } canvas.renderAll(); - // if (canvas.getActiveObject()){ - // canvas.getActiveObject().set("fill", color); - // canvas.renderAll(); - // } }; //Font @@ -435,19 +411,15 @@ define(['app'], function (app) { if (activeObject){ switch (mode) { case 1: - // canvas.bringForward(activeObject); activeObject.bringForward(); break; case 2: - // canvas.sendBackwards(activeObject); activeObject.sendBackwards(); break; case 3: - // canvas.bringToFront(activeObject); activeObject.bringToFront(); break; case 4: - // canvas.sendToBack(activeObject); activeObject.sendToBack(); break; } diff --git a/app/scripts/main.js b/app/scripts/main.js index c4e3610..65adfd8 100644 --- a/app/scripts/main.js +++ b/app/scripts/main.js @@ -2,8 +2,8 @@ require.config({ waitSeconds: 0, paths: { - 'angular' : '../bower_components/angular/angular', - 'angular-mocks': '../bower_components/angular-mocks/angular-mocks', + 'angular' : '../bower_components/angular/angular', + 'angular-mocks': '../bower_components/angular-mocks/angular-mocks', 'angular-route': '../bower_components/angular-route/angular-route', 'angular-cookies': '../bower_components/angular-cookies/angular-cookies', 'select2': '../bower_components/select2/select2', diff --git a/app/scripts/routes.js b/app/scripts/routes.js index fc7e345..75f6670 100644 --- a/app/scripts/routes.js +++ b/app/scripts/routes.js @@ -12,6 +12,12 @@ define([], function(){ 'scripts/services/illustration.js', 'scripts/services/tshirt.js' ] + }, + '/:id' : { + templateUrl: 'views/about.html', + dependencies: [ + 'scripts/controllers/about.js', + ] } } }; diff --git a/app/views/about.html b/app/views/about.html index d21bf89..2f506d8 100644 --- a/app/views/about.html +++ b/app/views/about.html @@ -1 +1,2 @@ -
This is the about view.
+