ionic-team · joseprupi · Jun 22, 2014
diff --git a/www/index.html b/www/index.html
@@ -21,6 +21,7 @@
     <!-- your app's js -->
     <script src="js/app.js"></script>
     <script src="js/services.js"></script>
+    <script src="js/controllers.js"></script>
   </head>
   <body ng-app="starter" ng-controller="MainCtrl">
     <ion-header-bar>

diff --git a/www/js/app.js b/www/js/app.js
@@ -5,7 +5,7 @@
 // the 2nd parameter is an array of 'requires'
 // 'starter.services' is found in services.js
 // 'starter.controllers' is found in controllers.js
-angular.module('starter', ['ionic', 'starter.services'])
+angular.module('starter', ['ionic', 'starter.services', 'starter.controllers'])
 
 .config(function($compileProvider){
   $compileProvider.imgSrcSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|tel):/);
@@ -20,20 +20,4 @@ angular.module('starter', ['ionic', 'starter.services'])
   });
 })
 
-.controller('MainCtrl', function($scope, Camera) {
 
-  $scope.getPhoto = function() {
-    Camera.getPicture().then(function(imageURI) {
-      console.log(imageURI);
-      $scope.lastPhoto = imageURI;
-    }, function(err) {
-      console.err(err);
-    }, {
-      quality: 75,
-      targetWidth: 320,
-      targetHeight: 320,
-      saveToPhotoAlbum: false
-    });
-  };
-
-})
diff --git a/www/js/controllers.js b/www/js/controllers.js
@@ -1,16 +1,8 @@
 angular.module('starter.controllers', [])
 
-.config(function($compileProvider){
-  $compileProvider.imgSrcSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|tel):/);
-})
-
-.controller('DashCtrl', function($scope) {
-})
+.controller('MainCtrl', function($scope, Camera) {
 
-.controller('FriendsCtrl', function($scope, Friends, Camera) {
-  $scope.friends = Friends.all();
   $scope.getPhoto = function() {
-    console.log('Getting camera');
     Camera.getPicture().then(function(imageURI) {
       console.log(imageURI);
       $scope.lastPhoto = imageURI;
@@ -22,21 +14,6 @@ angular.module('starter.controllers', [])
       targetHeight: 320,
       saveToPhotoAlbum: false
     });
-    /*
-    navigator.camera.getPicture(function(imageURI) {
-      console.log(imageURI);
-    }, function(err) {
-    }, { 
-      quality: 50,
-      destinationType: Camera.DestinationType.DATA_URL
-    });
-    */
-  }
-})
+  };
 
-.controller('FriendDetailCtrl', function($scope, $stateParams, Friends) {
-  $scope.friend = Friends.get($stateParams.friendId);
 })
-
-.controller('AccountCtrl', function($scope) {
-});
diff --git a/www/js/services.js b/www/js/services.js
@@ -17,28 +17,3 @@ angular.module('starter.services', [])
     }
   }
 }])
-
-/**
- * A simple example service that returns some data.
- */
-.factory('Friends', function() {
-  // Might use a resource here that returns a JSON array
-
-  // Some fake testing data
-  var friends = [
-    { id: 0, name: 'Scruff McGruff' },
-    { id: 1, name: 'G.I. Joe' },
-    { id: 2, name: 'Miss Frizzle' },
-    { id: 3, name: 'Ash Ketchum' }
-  ];
-
-  return {
-    all: function() {
-      return friends;
-    },
-    get: function(friendId) {
-      // Simple index lookup
-      return friends[friendId];
-    }
-  }
-});
diff --git a/www/templates/friend-detail.html b/www/templates/friend-detail.html
diff --git a/www/templates/tab-account.html b/www/templates/tab-account.html
diff --git a/www/templates/tab-dash.html b/www/templates/tab-dash.html
diff --git a/www/templates/tab-friends.html b/www/templates/tab-friends.html
diff --git a/www/templates/tabs.html b/www/templates/tabs.html