nitweb: move index model to index module

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/share/nitweb/javascripts/index.js b/share/nitweb/javascripts/index.js
index c45ccbf..14550b1 100644 (file)
--- a/share/nitweb/javascripts/index.js
+++ b/share/nitweb/javascripts/index.js
@@ -16,7 +16,7 @@
 
 (function() {
        angular
-               .module('index', ['model', 'ngSanitize'])
+               .module('index', ['ngSanitize'])
 
                .config(function($stateProvider, $locationProvider) {
                        $stateProvider
@@ -28,6 +28,40 @@
                                })
                })
 
+               .factory('Catalog', [ '$http', function($http) {
+                       return {
+                               loadHightlighted: function(cb, cbErr) {
+                                       $http.get('/api/catalog/highlighted')
+                                               .success(cb)
+                                               .error(cbErr);
+                               },
+
+                               loadMostRequired: function(cb, cbErr) {
+                                       $http.get('/api/catalog/required')
+                                               .success(cb)
+                                               .error(cbErr);
+                               },
+
+                               loadByTags: function(cb, cbErr) {
+                                       $http.get('/api/catalog/bytags')
+                                               .success(cb)
+                                               .error(cbErr);
+                               },
+
+                               loadStats: function(cb, cbErr) {
+                                       $http.get('/api/catalog/stats')
+                                               .success(cb)
+                                               .error(cbErr);
+                               },
+
+                               loadContributors: function(cb, cbErr) {
+                                       $http.get('/api/catalog/contributors')
+                                               .success(cb)
+                                               .error(cbErr);
+                               },
+                       }
+               }])
+
                .controller('IndexCtrl', function(Catalog, $sce, $scope, $location, $anchorScroll) {
                        this.loadHighlighted = function() {
                                Catalog.loadHightlighted(

diff --git a/share/nitweb/javascripts/model.js b/share/nitweb/javascripts/model.js
index fb2c008..f29ac4c 100644 (file)
--- a/share/nitweb/javascripts/model.js
+++ b/share/nitweb/javascripts/model.js
@@ -61,40 +61,6 @@
                        };
                }])
 
-               .factory('Catalog', [ '$http', function($http) {
-                       return {
-                               loadHightlighted: function(cb, cbErr) {
-                                       $http.get(apiUrl + '/catalog/highlighted')
-                                               .success(cb)
-                                               .error(cbErr);
-                               },
-
-                               loadMostRequired: function(cb, cbErr) {
-                                       $http.get(apiUrl + '/catalog/required')
-                                               .success(cb)
-                                               .error(cbErr);
-                               },
-
-                               loadByTags: function(cb, cbErr) {
-                                       $http.get(apiUrl + '/catalog/bytags')
-                                               .success(cb)
-                                               .error(cbErr);
-                               },
-
-                               loadStats: function(cb, cbErr) {
-                                       $http.get(apiUrl + '/catalog/stats')
-                                               .success(cb)
-                                               .error(cbErr);
-                               },
-
-                               loadContributors: function(cb, cbErr) {
-                                       $http.get(apiUrl + '/catalog/contributors')
-                                               .success(cb)
-                                               .error(cbErr);
-                               },
-                       }
-               }])
-
                .factory('Feedback', [ '$http', function($http) {
                        return {
                                loadEntityStars: function(id, cb, cbErr) {