Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 3 additions & 31 deletions app/scripts/controllers/play.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
angular.module('assignment1App')
.controller('PlayCtrl', function () {
var numbers = [ 2, 5, 23, 14, 11, 66, 3, 32, 77, 0];
var oddNumbers = odd(numbers);
var evenNumbers = even(numbers);
var sortedNumbers = sort(numbers);

this.awesomeThings = [
'HTML5 Boilerplate',
Expand All @@ -21,33 +18,8 @@ angular.module('assignment1App')
];

this.numbers = numbers;
this.oddNumbers = oddNumbers;
this.evenNumbers = evenNumbers;
this.sortedNumbers = sortedNumbers;

function odd(arr){

// TODO: remove even values
var result = arr;

return result;
}

function even(arr){

// TODO: remove odd values
var result = arr;

return result;
}

function sort(arr){

// TODO: sort the values
var result = arr;

return result;

}
this.oddNumbers = numbers.filter(function(a) { return a % 2 === 1; });
this.evenNumbers = numbers.filter(function(a) { return a % 2 === 0; });
this.sortedNumbers = numbers.sort(function(a, b){ return a - b }); //or return b-a for descending

});
53 changes: 53 additions & 0 deletions app/scripts/controllers/play2.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
'use strict';

/**
* @ngdoc function
* @name assignment1App.controller:PlayCtrl
* @description
* # PlayCtrl
* Controller of the assignment1App
*/
angular.module('assignment1App')
.controller('PlayCtrl', function () {
var numbers = [ 2, 5, 23, 14, 11, 66, 3, 32, 77, 0];
var oddNumbers = odd(numbers);
var evenNumbers = even(numbers);
var sortedNumbers = sort(numbers);

this.awesomeThings = [
'HTML5 Boilerplate',
'AngularJS',
'Karma'
];

this.numbers = numbers;
this.oddNumbers = oddNumbers;
this.evenNumbers = evenNumbers;
this.sortedNumbers = sortedNumbers;

function odd(arr){

// TODO: remove even values
var result = arr.filter(function(a) { return (a & 1) === 1; });

return result;
}

function even(arr){

// TODO: remove odd values
var result = arr.filter(function(a) { return (a & 1) === 0; });

return result;
}

function sort(arr){

// TODO: sort the values
var result = arr.sort(function(a, b){return a-b}); //or return b-a for descending

return result;

}

});