From 1e5db4998c6ae7709be1221cadd063aeed44387c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josep=20Rubi=C3=B3?= Date: Sun, 22 Jun 2014 22:01:47 +0200 Subject: [PATCH] reorder Deleted html templates as all is rendered at index.html Deleted friends factory from services.js Moved MainCtrl to controllers.js Added controllers.js to index.html --- www/index.html | 1 + www/js/app.js | 18 +----------------- www/js/controllers.js | 27 ++------------------------- www/js/services.js | 25 ------------------------- www/templates/friend-detail.html | 10 ---------- www/templates/tab-account.html | 5 ----- www/templates/tab-dash.html | 5 ----- www/templates/tab-friends.html | 10 ---------- www/templates/tabs.html | 27 --------------------------- 9 files changed, 4 insertions(+), 124 deletions(-) mode change 100644 => 100755 www/index.html mode change 100644 => 100755 www/js/app.js mode change 100644 => 100755 www/js/controllers.js mode change 100644 => 100755 www/js/services.js delete mode 100644 www/templates/friend-detail.html delete mode 100644 www/templates/tab-account.html delete mode 100644 www/templates/tab-dash.html delete mode 100644 www/templates/tab-friends.html delete mode 100644 www/templates/tabs.html diff --git a/www/index.html b/www/index.html old mode 100644 new mode 100755 index 47901ea..e759656 --- a/www/index.html +++ b/www/index.html @@ -21,6 +21,7 @@ + diff --git a/www/js/app.js b/www/js/app.js old mode 100644 new mode 100755 index 8e5035c..719850d --- 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 old mode 100644 new mode 100755 index 33bdec7..ed7f3d7 --- 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 old mode 100644 new mode 100755 index 0eac208..ad6ec7c --- 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 deleted file mode 100644 index 816aedc..0000000 --- a/www/templates/friend-detail.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/www/templates/tab-account.html b/www/templates/tab-account.html deleted file mode 100644 index 8c880bf..0000000 --- a/www/templates/tab-account.html +++ /dev/null @@ -1,5 +0,0 @@ - - -

Account

- - diff --git a/www/templates/tab-dash.html b/www/templates/tab-dash.html deleted file mode 100644 index b5e35a0..0000000 --- a/www/templates/tab-dash.html +++ /dev/null @@ -1,5 +0,0 @@ - - -

Dash

- - diff --git a/www/templates/tab-friends.html b/www/templates/tab-friends.html deleted file mode 100644 index 3a52f06..0000000 --- a/www/templates/tab-friends.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - {{friend.name}} - - - - diff --git a/www/templates/tabs.html b/www/templates/tabs.html deleted file mode 100644 index b328446..0000000 --- a/www/templates/tabs.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -