From 1d7a39214210a801338ce991ba8c239df86f347a Mon Sep 17 00:00:00 2001 From: achatzit Date: Fri, 8 Apr 2016 01:18:50 -0700 Subject: [PATCH 1/5] new play.js files --- app/scripts/controllers/play.js | 34 +++------------------------------ 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/app/scripts/controllers/play.js b/app/scripts/controllers/play.js index d769211..323e296 100644 --- a/app/scripts/controllers/play.js +++ b/app/scripts/controllers/play.js @@ -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', @@ -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 === 0; }); + this.evenNumbers = numbers.filter(function(a) { return a % 2 === 1; }); + this.sortedNumbers = numbers.sort(function(a, b){ return a - b }); //or return b-a for descending }); From 9fa98fb255a22ab91174240deb2f8d521344a284 Mon Sep 17 00:00:00 2001 From: achatzit Date: Fri, 8 Apr 2016 01:30:40 -0700 Subject: [PATCH 2/5] new play.js --- app/scripts/controllers/play2.js | 53 +++++++++++++++++++++++++ app/scripts/controllers/playOriginal.js | 53 +++++++++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 app/scripts/controllers/play2.js create mode 100644 app/scripts/controllers/playOriginal.js diff --git a/app/scripts/controllers/play2.js b/app/scripts/controllers/play2.js new file mode 100644 index 0000000..d9ddf1e --- /dev/null +++ b/app/scripts/controllers/play2.js @@ -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) === 0; }); + + return result; + } + + function even(arr){ + + // TODO: remove odd values + var result = arr.filter(function(a) { return (a & 1) === 1; }); + + 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; + + } + + }); diff --git a/app/scripts/controllers/playOriginal.js b/app/scripts/controllers/playOriginal.js new file mode 100644 index 0000000..d769211 --- /dev/null +++ b/app/scripts/controllers/playOriginal.js @@ -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; + + 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; + + } + + }); From 5d278013ea213204fd0ad78a449e646f9d14db74 Mon Sep 17 00:00:00 2001 From: achatzit Date: Fri, 8 Apr 2016 03:26:25 -0700 Subject: [PATCH 3/5] deleted file --- app/scripts/controllers/playOriginal.js | 53 ------------------------- 1 file changed, 53 deletions(-) delete mode 100644 app/scripts/controllers/playOriginal.js diff --git a/app/scripts/controllers/playOriginal.js b/app/scripts/controllers/playOriginal.js deleted file mode 100644 index d769211..0000000 --- a/app/scripts/controllers/playOriginal.js +++ /dev/null @@ -1,53 +0,0 @@ -'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; - - 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; - - } - - }); From b30bf75188c3990ca77f82f72b5c8bb5a924b5ae Mon Sep 17 00:00:00 2001 From: achatzit Date: Sat, 9 Apr 2016 00:02:22 +0300 Subject: [PATCH 4/5] Update play.js --- app/scripts/controllers/play.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/controllers/play.js b/app/scripts/controllers/play.js index 323e296..78a5034 100644 --- a/app/scripts/controllers/play.js +++ b/app/scripts/controllers/play.js @@ -18,8 +18,8 @@ angular.module('assignment1App') ]; this.numbers = numbers; - this.oddNumbers = numbers.filter(function(a) { return a % 2 === 0; }); - this.evenNumbers = numbers.filter(function(a) { return a % 2 === 1; }); + 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 }); From 2ecb61664abda73d40aa6e3d2557ae291397f709 Mon Sep 17 00:00:00 2001 From: achatzit Date: Sat, 9 Apr 2016 12:34:51 +0300 Subject: [PATCH 5/5] Update play2.js --- app/scripts/controllers/play2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/controllers/play2.js b/app/scripts/controllers/play2.js index d9ddf1e..a3b435f 100644 --- a/app/scripts/controllers/play2.js +++ b/app/scripts/controllers/play2.js @@ -28,7 +28,7 @@ angular.module('assignment1App') function odd(arr){ // TODO: remove even values - var result = arr.filter(function(a) { return (a & 1) === 0; }); + var result = arr.filter(function(a) { return (a & 1) === 1; }); return result; } @@ -36,7 +36,7 @@ angular.module('assignment1App') function even(arr){ // TODO: remove odd values - var result = arr.filter(function(a) { return (a & 1) === 1; }); + var result = arr.filter(function(a) { return (a & 1) === 0; }); return result; }