garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

added needed fields in models and needed libraries for frontend (#67)

Browse Source
This commit is contained in:
Athou
2013-06-01 21:00:10 +02:00
parent 33eb99b8c6
commit 7ffd044a86
11 changed files with 195 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/webapp/WEB-INF/wro.xml
View File

@@ -3,6 +3,7 @@
<group name="lib">
<js minimize="false">/vendor/jquery/*.js</js>
<js minimize="false">/vendor/jqueryui/*.js</js>
<js minimize="false">/vendor/jquery-mousewheel/*.js</js>
<js minimize="false">/vendor/bootstrap/*.js</js>
<js minimize="false">/vendor/angularjs/*.js</js>

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

@@ -145,9 +145,9 @@ function($scope, $timeout, $stateParams, $window, $location, $state, $route, Cat
$timeout(function refreshTree() {
AnalyticsService.track();
CategoryService.init(function() {
$timeout(refreshTree, 15000);
$timeout(refreshTree, 30000);
}, function() {
$timeout(refreshTree, 15000);
$timeout(refreshTree, 30000);
});
}, 15000);

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

@@ -15,34 +15,44 @@ module.directive('focus', [ '$timeout', function($timeout) {
};
} ]);
/**
* Open a popup window pointing to the url in the href attribute
*/
module.directive('popup', function() {
return {
link : function(scope, elm, attrs) {
elm.bind('click', function(event) {
window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=800');
event.preventDefault();
});
}
};
});
module
.directive(
'popup',
function() {
return {
link : function(scope, elm, attrs) {
elm
.bind(
'click',
function(event) {
window
.open(this.href, '',
'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=800');
event.preventDefault();
});
}
};
});
/**
* Reusable favicon component
*/
module.directive('favicon', function() {
return {
restrict : 'E',
scope : {
url : '='
},
replace : true,
template : '<img ng-src="{{url}}" class="favicon" onError="this.src=\'images/default_favicon.gif\'"></img>'
};
});
module
.directive(
'favicon',
function() {
return {
restrict : 'E',
scope : {
url : '='
},
replace : true,
template : '<img ng-src="{{url}}" class="favicon" onError="this.src=\'images/default_favicon.gif\'"></img>'
};
});
/**
* Support for the blur event
@@ -61,11 +71,11 @@ module.directive('ngBlur', function() {
/**
* Fired when the top of the element is not visible anymore
*/
module.directive('onScrollMiddle', function () {
module.directive('onScrollMiddle', function() {
return {
restrict : 'A',
link : function(scope, element, attrs) {
var w = $(window);
var e = $(element);
var d = $(document);
@@ -75,7 +85,8 @@ module.directive('onScrollMiddle', function () {
return;
var docTop = w.scrollTop();
var elemTop = e.offset().top;
var threshold = docTop === 0 ? elemTop - 1 : docTop + w.height() / 3;
var threshold = docTop === 0 ? elemTop - 1 : docTop
+ w.height() / 3;
return (elemTop > threshold) ? 'below' : 'above';
};
var up = function() {
@@ -84,27 +95,31 @@ module.directive('onScrollMiddle', function () {
var docTop = w.scrollTop();
var elemTop = e.offset().top;
var elemBottom = elemTop + e.height();
var threshold = docTop === 0 ? elemBottom - 1 : docTop + w.height() / 3;
var threshold = docTop === 0 ? elemBottom - 1 : docTop
+ w.height() / 3;
return (elemBottom > threshold) ? 'below' : 'above';
};
w.data.scrollPosition = d.scrollTop();
w.data.scrollDirection = 'down';
if(!w.data.scrollInit){
w.bind('scroll', function(e) {
var scroll = d.scrollTop();
w.data.scrollDirection = (scroll - w.data.scrollPosition > 0) ? 'down' : 'up';
w.data.scrollPosition = scroll;
scope.$apply();
});
if (!w.data.scrollInit) {
w.bind('scroll',
function(e) {
var scroll = d.scrollTop();
w.data.scrollDirection = (scroll
- w.data.scrollPosition > 0) ? 'down'
: 'up';
w.data.scrollPosition = scroll;
scope.$apply();
});
w.data.scrollInit = true;
}
scope.$watch(down, function downCallback(value, oldValue) {
if(value && value != oldValue && value == 'above')
if (value && value != oldValue && value == 'above')
scope.$eval(attrs.onScrollMiddle);
});
scope.$watch(up, function upCallback(value, oldValue) {
if(value && value != oldValue && value == 'below')
if (value && value != oldValue && value == 'below')
scope.$eval(attrs.onScrollMiddle);
});
}
@@ -145,7 +160,8 @@ module.directive('scrollTo', [ '$timeout', function($timeout) {
} ]);
/**
* Prevent mousewheel scrolling from propagating to the parent when scrollbar reaches top or bottom
* Prevent mousewheel scrolling from propagating to the parent when scrollbar
* reaches top or bottom
*/
module.directive('mousewheelScrolling', function() {
return {
@@ -168,7 +184,8 @@ module.directive('mousewheelScrolling', function() {
});
/**
* Needed to use recursive directives. Wrap a recursive element with a <recursive> tag
* Needed to use recursive directives. Wrap a recursive element with a
* <recursive> tag
*/
module.directive('recursive', [ '$compile', function($compile) {
return {
@@ -196,7 +213,7 @@ module.directive('category', [ function() {
return {
scope : {
node : '=',
level: '=',
level : '=',
selectedType : '=',
selectedId : '=',
showLabel : '=',
@@ -217,15 +234,16 @@ module.directive('category', [ function() {
function($scope, $state, $dialog, FeedService, CategoryService,
SettingsService, MobileService) {
$scope.settingsService = SettingsService;
$scope.getClass = function(level) {
if ($scope.showLabel){
if ($scope.showLabel) {
return 'indent' + level;
}
};
$scope.categoryLabel = function(category) {
return $scope.showLabel !== true ? $scope.showLabel : category.name;
return $scope.showLabel !== true ? $scope.showLabel
: category.name;
};
$scope.categoryCountLabel = function(category) {
@@ -272,16 +290,16 @@ module.directive('category', [ function() {
});
}
};
$scope.showFeedDetails = function(feed) {
$state.transitionTo('feeds.feed_details', {
_id: feed.id
_id : feed.id
});
};
$scope.showCategoryDetails = function(category) {
$state.transitionTo('feeds.category_details', {
_id: category.id
_id : category.id
});
};
@@ -340,3 +358,39 @@ module.directive('spinner', function() {
}
};
});
module.directive('draggable', function() {
return {
restrict : 'A',
link : function(scope, element, attrs) {
element.draggable({
revert: true
}).data('source', scope.$eval(attrs.draggable));
}
};
});
module.directive('droppable', function($compile) {
return {
restrict : 'A',
link : function(scope, element, attrs) {
element.droppable({
tolerance: 'pointer',
over: function(event, ui) {
console.log(scope.$eval(attrs.droppable));
},
drop : function(event, ui) {
var draggable = angular.element(ui.draggable);
var index = draggable.data('index');
var source = draggable.data('source');
console.log(source)
scope.$apply();
}
});
}
};
});

6
src/main/webapp/templates/_category.html
View File

@@ -1,5 +1,5 @@
<li>
<div class="pointer tree-item" ui-if="showLabel" ng-class="getClass(level - 1)">
<div class="pointer tree-item" ui-if="showLabel" ng-class="getClass(level - 1)" draggable="node" droppable="node">
<div class="dropdown pull-right">
<div class="pull-right" ng-click="showCategoryDetails(node)">
<i class="icon-wrench config pointer"></i>
@@ -11,7 +11,7 @@
<i ng-class="{'icon-star' : node.id == 'starred', 'icon-inbox': node.id == 'all'}" ng-show="!showChildren"></i>
</span>
<span ng-class="{selected: (node.id == selectedId && selectedType == 'category'), unread: unreadCount({category:node})}">
{{categoryLabel(node)}} {{categoryCountLabel(node)}}
{{categoryLabel(node)}} {{categoryCountLabel(node)}}
</span>
</div>
</div>
@@ -23,7 +23,7 @@
unread-count="unreadCount({category:category})">
</category>
</recursive>
<li ng-repeat="feed in node.feeds" ng-class="getClass(level)" class="tree-item"
<li ng-repeat="feed in node.feeds" ng-class="getClass(level)" class="tree-item" draggable="feed" droppable="feed"
ng-show="settingsService.settings.showRead == true || feed.unread > 0">
<div class="pull-right" ng-click="showFeedDetails(feed)">
<i class="icon-wrench config pointer"></i>

12
src/main/webapp/vendor/jqueryui/jquery-ui.1.10.3.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long