Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

wro4j update

Browse Source
This commit is contained in:
Athou
2013-06-27 14:27:00 +02:00
parent 57e08fdd36
commit 61581fd392
3 changed files with 138 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -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>

3
src/main/webapp/js/controllers.js
View File

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

33
src/main/webapp/js/directives.js
View File

@@ -316,7 +316,8 @@ module.directive('category', [ function() {
collapse : !category.expanded
});
};
} ]
}
]
};
} ]);
@@ -373,13 +374,14 @@ 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) {
element.droppable({
tolerance: 'pointer',
over: function(event, ui) {
tolerance : 'pointer',
over : function(event, ui) {
},
drop : function(event, ui) {
@@ -393,29 +395,13 @@ module.directive('droppable', [ 'CategoryService', 'FeedService', function(Categ
}
var data = {
id: source.id,
name: source.name
id : source.id,
name : source.name
};
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,10 +419,9 @@ module.directive('droppable', [ 'CategoryService', 'FeedService', function(Categ
CategoryService.init();
});
}
scope.$apply();
}
});
}
};
}]);
} ]);