Updated web dependencies versions.

radcortez · radcortez · commit b24911cbcf55 · 2014-07-18T18:18:37.000+01:00
Simplified JS business code.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -126,7 +126,7 @@ module.exports = function (grunt) {
     );
 
     // Task: Build production version ready for deployment
-    grunt.registerTask('build', [
+    grunt.registerTask('install', [
         'clean:build',
         'bower-install-simple',
         //'concat:styles',
@@ -140,7 +140,12 @@ module.exports = function (grunt) {
         'htmlmin'
     ]);
 
+    grunt.registerTask('process-resources', [
+        'bower-install-simple',
+        'wiredep',
+    ]);
+
     grunt.registerTask('default', [
-        'build'
+        'install'
     ]);
 };
diff --git a/bower.json b/bower.json
@@ -8,9 +8,10 @@
     "description": "javaee7-angular JavaScript dependencies.",
     "private": true,
     "dependencies": {
-        "angular": "1.2.0",
-        "jquery": "1.9.1",
-        "angular-bootstrap": "0.10.0",
-        "angular-grid": "2.0.7"
+        "angular": "~1.2.20",
+        "angular-resource": "~1.2.20",
+        "jquery": "~1.9.1",
+        "angular-bootstrap": "~0.11.0",
+        "angular-grid": "~2.0.11"
     }
 }
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -20,6 +20,7 @@
     <!-- bower:js -->
     <script src="lib/bower/jquery/jquery.js"></script>
     <script src="lib/bower/angular/angular.js"></script>
+    <script src="lib/bower/angular-resource/angular-resource.js"></script>
     <script src="lib/bower/angular-bootstrap/ui-bootstrap-tpls.js"></script>
     <script src="lib/bower/angular-grid/build/ng-grid.js"></script>
     <!-- endbower -->
@@ -42,8 +43,8 @@
 
         <!--  Bind the pagination component to be displayed. -->
         <pagination direction-links="true" boundary-links="true"
-                    total-items="persons.totalResults" page="persons.currentPage" items-per-page="persons.pageSize"
-                    on-select-page="refreshGrid(page)">
+                    total-items="persons.totalResults" items-per-page="persons.pageSize"
+                    ng-model="persons.currentPage" ng-change="refreshGrid()">
         </pagination>
     </div>
 </div>
diff --git a/src/main/webapp/script/person.js b/src/main/webapp/script/person.js
@@ -1,12 +1,18 @@
-var app = angular.module('persons', ['ngGrid', 'ui.bootstrap']);
+var app = angular.module('persons', ['ngResource', 'ngGrid', 'ui.bootstrap']);
 
 // Create a controller with name personsList to bind to the html page.
 app.controller('personsList', function ($scope, personService) {
     // Refresh the grid, calling the appropriate service method.
-    $scope.refreshGrid = function (page) {
-        personService.getAll(page, $scope.sortInfo.fields[0], $scope.sortInfo.directions[0]).success(function (data) {
+    $scope.refreshGrid = function () {
+        var listPersonsArgs = {
+            page: $scope.persons.currentPage,
+            sortFields: $scope.sortInfo.fields[0],
+            sortDirections: $scope.sortInfo.directions[0]
+        };
+
+        personService.get(listPersonsArgs, function(data) {
             $scope.persons = data;
-        });
+        })
     };
 
     // Do something when the grid is sorted.
@@ -19,7 +25,7 @@ app.controller('personsList', function ($scope, personService) {
     // Watch the sortInfo variable. If changes are detected than we need to refresh the grid.
     // This also works for the first page access, since we assign the initial sorting in the initialize section.
     $scope.$watch('sortInfo.fields[0]', function () {
-        $scope.refreshGrid($scope.persons.currentPage);
+        $scope.refreshGrid();
     }, true);
 
     // Initialize required information: sorting, the first page to show and the grid options.
@@ -33,14 +39,6 @@ app.controller('personsList', function ($scope, personService) {
 });
 
 // Service that provides persons operations
-app.service('personService', function ($http) {
-    // Makes the REST request to get the data to populate the grid.
-    this.getAll = function (page, sortFields, sortDirections) {
-        return $http.get('resources/persons', {
-            params: {
-                page: page,
-                sortFields: sortFields,
-                sortDirections: sortDirections
-            }});
-    }
+app.factory('personService', function ($resource) {
+    return $resource('resources/persons');
 });
