wro4j update

pom.xml

@@ -334,7 +334,7 @@
 		<dependency>
 			<groupId>ro.isdc.wro4j</groupId>
 			<artifactId>wro4j-extensions</artifactId>
-			<version>1.6.3</version>
+			<version>1.7.0</version>
 		</dependency>
 
 		<dependency>
@@ -380,7 +380,7 @@
 					<plugin>
 						<groupId>ro.isdc.wro4j</groupId>
 						<artifactId>wro4j-maven-plugin</artifactId>
-						<version>1.6.3</version>
+						<version>1.7.0</version>
 						<executions>
 							<execution>
 								<id>js</id>
@@ -517,7 +517,7 @@
 					<plugin>
 						<groupId>ro.isdc.wro4j</groupId>
 						<artifactId>wro4j-maven-plugin</artifactId>
-						<version>1.6.3</version>
+						<version>1.7.0</version>
 						<executions>
 							<execution>
 								<goals>

src/main/webapp/js/controllers.js

@@ -614,8 +614,7 @@ function($scope, $state, $filter, $timeout, CategoryService) {
 		$state.transitionTo('feeds.view', {
 			_type : 'feed', 
 			_id : id
-			}
-		);
+		});
 	};
 	
 	$scope.open = function() {

src/main/webapp/js/directives.js

@@ -316,7 +316,8 @@ module.directive('category', [ function() {
 						collapse : !category.expanded
 					});
 				};
-				} ]
+			}
+		]
 	};
 } ]);
 
@@ -373,7 +374,8 @@ module.directive('draggable', function() {
 	};
 });
 
-module.directive('droppable', [ 'CategoryService', 'FeedService', function(CategoryService, FeedService) {
+module.directive('droppable', [ 'CategoryService', 'FeedService',
+		function(CategoryService, FeedService) {
 			return {
 				restrict : 'A',
 				link : function(scope, element, attrs) {
@@ -400,22 +402,6 @@ module.directive('droppable', [ 'CategoryService', 'FeedService', function(Categ
 							if (source.children) {
 								// source is a category
 
-						/*
-						 * TODO better handling of category dragging
-						 * 
-						if (target.children) {
-							// target is a category
-							data.parentId = target.id;
-							data.position = 0;
-						} else {
-							// target is a feed
-							data.parentId = target.categoryId;
-						}
-						
-						CategoryService.modify(data, function() {
-							CategoryService.init();
-						});
-						*/
 							} else {
 								// source is a feed
 
@@ -433,7 +419,6 @@ module.directive('droppable', [ 'CategoryService', 'FeedService', function(Categ
 									CategoryService.init();
 								});
 							}
-					
 							scope.$apply();
 						}
 					});