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

Merge pull request #59 from joshmatz/master

Browse Source 
Make AngularJS minification compatible
This commit is contained in:
Athou
2013-04-22 21:51:50 -07:00
parent 6011411dc4 e620988fc3
commit 9cb56557be
5 changed files with 128 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -14,3 +14,6 @@ deployments/ROOT.war
.settings
.factorypath
/target
# Sublime
*.sublime*

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

@@ -1,6 +1,6 @@
var module = angular.module('commafeed.controllers', []);
module.run(function($rootScope) {
module.run(['$rootScope', function($rootScope) {
$rootScope.$on('emitMark', function(event, args) {
// args.entry - the entry
$rootScope.$broadcast('mark', args);
@@ -14,10 +14,10 @@ module.run(function($rootScope) {
$rootScope.$on('emitReload', function(event, args) {
$rootScope.$broadcast('reload');
});
});
}]);
module.controller('SubscribeCtrl', function($scope, FeedService,
CategoryService) {
module.controller('SubscribeCtrl', ['$scope', 'FeedService', 'CategoryService',
function($scope, FeedService, CategoryService) {
$scope.opts = {
backdropFade : true,
@@ -87,10 +87,11 @@ module.controller('SubscribeCtrl', function($scope, FeedService,
CategoryService.add($scope.cat);
$scope.closeCategory();
};
});
}]);
module.controller('CategoryTreeCtrl', function($scope, $timeout, $stateParams,
$window, $location, $state, $route, CategoryService) {
module.controller('CategoryTreeCtrl', ['$scope', '$timeout', '$stateParams', '$window',
'$location', '$state', '$route', 'CategoryService',
function($scope, $timeout, $stateParams, $window, $location, $state, $route, CategoryService) {
$scope.selectedType = $stateParams._type;
$scope.selectedId = $stateParams._id;
@@ -197,86 +198,88 @@ module.controller('CategoryTreeCtrl', function($scope, $timeout, $stateParams,
$scope.$on('mark', function(event, args) {
mark($scope.CategoryService.subscriptions, args.entry);
});
});
}]);
module.controller('ToolbarCtrl',
function($scope, $http, $state, $stateParams, $route, $location,
SettingsService, EntryService, ProfileService) {
module.controller('ToolbarCtrl', ['$scope', '$http', '$state', '$stateParams',
'$route', '$location', 'SettingsService', 'EntryService', 'ProfileService',
function($scope, $http, $state, $stateParams, $route, $location,
SettingsService, EntryService, ProfileService) {
function totalActiveAjaxRequests() {
return ($http.pendingRequests.length + $.active);
}
function totalActiveAjaxRequests() {
return ($http.pendingRequests.length + $.active);
}
$scope.session = ProfileService.get();
$scope.session = ProfileService.get();
$scope.loading = true;
$scope.$watch(totalActiveAjaxRequests, function() {
$scope.loading = (totalActiveAjaxRequests() !== 0);
});
$scope.loading = true;
$scope.$watch(totalActiveAjaxRequests, function() {
$scope.loading = (totalActiveAjaxRequests() !== 0);
});
$scope.settingsService = SettingsService;
$scope.$watch('settingsService.settings.readingMode', function(
newValue, oldValue) {
if (newValue && oldValue && newValue != oldValue) {
SettingsService.save();
}
});
$scope.$watch('settingsService.settings.readingOrder', function(
newValue, oldValue) {
if (newValue && oldValue && newValue != oldValue) {
SettingsService.save();
}
});
$scope.refresh = function() {
$scope.$emit('emitReload');
};
$scope.markAllAsRead = function() {
$scope.$emit('emitMarkAll', {
type : $stateParams._type,
id : $stateParams._id,
read : true
});
};
$scope.keywords = $stateParams._keywords;
$scope.search = function() {
if ($scope.keywords == $stateParams._keywords) {
$scope.refresh();
} else {
$state.transitionTo('feeds.search', {
_keywords : $scope.keywords
});
}
};
$scope.showButtons = function() {
return !$stateParams._keywords;
};
$scope.toggleOrder = function() {
var settings = $scope.settingsService.settings;
settings.readingOrder = settings.readingOrder == 'asc' ? 'desc'
: 'asc';
};
$scope.toAdmin = function() {
$location.path('admin');
};
$scope.toSettings = function() {
$location.path('settings');
};
$scope.toProfile = function() {
$location.path('profile');
};
$scope.toHelp = function() {
$state.transitionTo('feeds.help');
};
$scope.toDonate = function() {
$state.transitionTo('feeds.help');
};
$scope.settingsService = SettingsService;
$scope.$watch('settingsService.settings.readingMode', function(
newValue, oldValue) {
if (newValue && oldValue && newValue != oldValue) {
SettingsService.save();
}
});
$scope.$watch('settingsService.settings.readingOrder', function(
newValue, oldValue) {
if (newValue && oldValue && newValue != oldValue) {
SettingsService.save();
}
});
$scope.refresh = function() {
$scope.$emit('emitReload');
};
$scope.markAllAsRead = function() {
$scope.$emit('emitMarkAll', {
type : $stateParams._type,
id : $stateParams._id,
read : true
});
};
module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
$window, EntryService, SettingsService, FeedService, CategoryService) {
$scope.keywords = $stateParams._keywords;
$scope.search = function() {
if ($scope.keywords == $stateParams._keywords) {
$scope.refresh();
} else {
$state.transitionTo('feeds.search', {
_keywords : $scope.keywords
});
}
};
$scope.showButtons = function() {
return !$stateParams._keywords;
};
$scope.toggleOrder = function() {
var settings = $scope.settingsService.settings;
settings.readingOrder = settings.readingOrder == 'asc' ? 'desc'
: 'asc';
};
$scope.toAdmin = function() {
$location.path('admin');
};
$scope.toSettings = function() {
$location.path('settings');
};
$scope.toProfile = function() {
$location.path('profile');
};
$scope.toHelp = function() {
$state.transitionTo('feeds.help');
};
$scope.toDonate = function() {
$state.transitionTo('feeds.help');
};
}]);
module.controller('FeedListCtrl', ['$scope', '$stateParams', '$http', '$route',
'$window', 'EntryService', 'SettingsService', 'FeedService', 'CategoryService',
function($scope, $stateParams, $http, $route, $window, EntryService, SettingsService, FeedService, CategoryService) {
$scope.selectedType = $stateParams._type;
$scope.selectedId = $stateParams._id;
@@ -506,9 +509,10 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
$scope.hasMore = true;
$scope.loadMoreEntries();
});
});
}]);
module.controller('ManageUsersCtrl', function($scope, $state, $location,
module.controller('ManageUsersCtrl', ['$scope', '$state', '$location',
function($scope, $state, $location,
AdminUsersService) {
$scope.users = AdminUsersService.getAll();
$scope.selection = [];
@@ -529,9 +533,10 @@ module.controller('ManageUsersCtrl', function($scope, $state, $location,
$scope.back = function() {
$location.path('/admin');
};
});
}]);
module.controller('ManageUserCtrl', function($scope, $state, $stateParams,
module.controller('ManageUserCtrl', ['$scope', '$state', '$stateParams', '$dialog', 'AdminUsersService',
function($scope, $state, $stateParams,
$dialog, AdminUsersService) {
$scope.user = $stateParams._id ? AdminUsersService.get({
id : $stateParams._id
@@ -580,9 +585,10 @@ module.controller('ManageUserCtrl', function($scope, $state, $stateParams,
}
});
};
});
}]);
module.controller('SettingsCtrl', function($scope, $location, SettingsService) {
module.controller('SettingsCtrl', ['$scope', '$location', 'SettingsService',
function($scope, $location, SettingsService) {
$scope.settingsService = SettingsService;
$scope.$watch('settingsService.settings', function(value) {
$scope.settings = angular.copy(value);
@@ -599,9 +605,10 @@ module.controller('SettingsCtrl', function($scope, $location, SettingsService) {
$location.path('/');
});
};
});
}]);
module.controller('ProfileCtrl', function($scope, $location, ProfileService) {
module.controller('ProfileCtrl', ['$scope', '$location', 'ProfileService',
function($scope, $location, ProfileService) {
$scope.user = ProfileService.get();
$scope.cancel = function() {
@@ -621,9 +628,10 @@ module.controller('ProfileCtrl', function($scope, $location, ProfileService) {
});
};
});
}]);
module.controller('ManageSettingsCtrl', function($scope, $location, $state,
module.controller('ManageSettingsCtrl', ['$scope', '$location', '$state',
function($scope, $location, $state,
AdminSettingsService) {
$scope.settings = AdminSettingsService.get();
@@ -640,4 +648,4 @@ module.controller('ManageSettingsCtrl', function($scope, $location, $state,
$scope.toUsers = function() {
$state.transitionTo('admin.userlist');
};
});
}]);

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

@@ -22,7 +22,7 @@ module.directive('ngBlur', function() {
};
});
module.directive('scrollTo', function($timeout) {
module.directive('scrollTo', ['$timeout', function($timeout) {
return {
restrict : 'A',
link : function(scope, element, attrs) {
@@ -50,9 +50,9 @@ module.directive('scrollTo', function($timeout) {
});
}
};
});
}]);
module.directive('recursive', function($compile) {
module.directive('recursive', ['$compile', function($compile) {
return {
restrict : 'E',
priority : 100000,
@@ -69,9 +69,9 @@ module.directive('recursive', function($compile) {
};
}
};
});
}]);
module.directive('category', function($compile) {
module.directive('category', ['$compile', function($compile) {
return {
scope : {
node : '=',
@@ -172,7 +172,7 @@ module.directive('category', function($compile) {
};
}
};
});
}]);
module.directive('spinner', function() {
return {

5
src/main/webapp/js/main.js
View File

@@ -2,7 +2,8 @@ var app = angular.module('commafeed', [ 'ui', 'ui.bootstrap', 'ui.state',
'commafeed.directives', 'commafeed.controllers', 'commafeed.services',
'ngSanitize', 'ngUpload', 'infinite-scroll', 'ngGrid' ]);
app.config(function($routeProvider, $stateProvider, $urlRouterProvider) {
app.config(['$routeProvider', '$stateProvider', '$urlRouterProvider',
function($routeProvider, $stateProvider, $urlRouterProvider) {
$stateProvider.state('feeds', {
abstract : true,
url : '/feeds',
@@ -65,4 +66,4 @@ app.config(function($routeProvider, $stateProvider, $urlRouterProvider) {
$urlRouterProvider.when('/admin', '/admin/settings');
$urlRouterProvider.otherwise('/');
});
}]);

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

@@ -1,10 +1,10 @@
var module = angular.module('commafeed.services', [ 'ngResource' ]);
module.factory('ProfileService', function($resource) {
module.factory('ProfileService', ['$resource', function($resource) {
return $resource('rest/user/profile/');
});
}]);
module.factory('SettingsService', function($resource) {
module.factory('SettingsService', ['$resource', function($resource) {
var res = $resource('rest/user/settings');
var s = {};
@@ -26,10 +26,10 @@ module.factory('SettingsService', function($resource) {
};
s.init();
return s;
});
module.factory('FeedService', function($resource, $http) {
}]);
module.factory('FeedService', ['$resource', '$http',
function($resource, $http) {
var actions = {
entries : {
method : 'GET',
@@ -70,10 +70,10 @@ module.factory('FeedService', function($resource, $http) {
};
var res = $resource('rest/feed/:_method', {}, actions);
return res;
});
module.factory('CategoryService', function($resource, $http) {
}]);
module.factory('CategoryService', ['$resource', '$http',
function($resource, $http) {
var flatten = function(category, parentName, array) {
if (!array)
array = [];
@@ -151,9 +151,10 @@ module.factory('CategoryService', function($resource, $http) {
res.init();
return res;
});
}]);
module.factory('EntryService', function($resource, $http) {
module.factory('EntryService', ['$resource', '$http',
function($resource, $http) {
var actions = {
search : {
method : 'GET',
@@ -170,18 +171,18 @@ module.factory('EntryService', function($resource, $http) {
};
var res = $resource('rest/entry/:_method', {}, actions);
return res;
});
}]);
module.factory('AdminUsersService', function($resource) {
module.factory('AdminUsersService', ['$resource', function($resource) {
var res = {};
res.get = $resource('rest/admin/user/get/:id').get;
res.getAll = $resource('rest/admin/user/getAll').query;
res.save = $resource('rest/admin/user/save').save;
res.remove = $resource('rest/admin/user/delete').save;
return res;
});
}]);
module.factory('AdminSettingsService', function($resource) {
module.factory('AdminSettingsService', ['$resource', function($resource) {
var res = $resource('rest/admin/settings/');
return res;
});
}]);