diff --git a/todo-src/animations.css b/todo-src/animations.css new file mode 100644 index 0000000..c94e83f --- /dev/null +++ b/todo-src/animations.css @@ -0,0 +1,31 @@ +/* Sitch container for priority */ +.animate-switch-container { + position:relative; + background:white; + border:1px solid black; + height:40px; + overflow:hidden; +} + +.animate-switch { + padding:10px; +} + +.animate-switch.ng-animate { + transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s; + + position:absolute; + top:0; + left:0; + right:0; + bottom:0; +} + +.animate-switch.ng-leave.ng-leave-active, +.animate-switch.ng-enter { + top:-50px; +} +.animate-switch.ng-leave, +.animate-switch.ng-enter.ng-enter-active { + top:0; +} diff --git a/todo-src/index.html b/todo-src/index.html index 89203ad..1aedf0c 100644 --- a/todo-src/index.html +++ b/todo-src/index.html @@ -6,11 +6,13 @@ + + -

My little to do app!

+

To Do

@@ -34,7 +36,16 @@

stuff i gotta do asap

- +
+
+ +
+
top
+
medium
+
low
+
+
diff --git a/todo-src/protractor.js b/todo-src/protractor.js new file mode 100644 index 0000000..719ebe0 --- /dev/null +++ b/todo-src/protractor.js @@ -0,0 +1,18 @@ +var switchElem = element(by.css('[ng-switch]')); +var select = element(by.model('selection')); + +it('should start in low', function () { + expect(switchElem.getText()).toMatch(/someday/); +}); +it('should change to medium', function () { + select.all(by.css('option')).get(1).click(); + expect(switchElem.getText()).toMatch(/tomorrow/); +}); +it('should change to top', function () { + select.all(by.css('option')).get(2).click(); + expect(switchElem.getText()).toMatch(/now/); +}); +it('should select default', function () { + select.all(by.css('option')).get(3).click(); + expect(switchElem.getText()).toMatch(/default/); +}); \ No newline at end of file diff --git a/todo-src/script.js b/todo-src/script.js index fe21743..b8d6776 100644 --- a/todo-src/script.js +++ b/todo-src/script.js @@ -19,10 +19,17 @@ myApp.controller('MainCtrl', function ($scope){ var index = $scope.todos.indexOf(item); $scope.todos.splice(index, 1); } - - + }); +myApp.controller('switchExample', ['ngAnimate']) +.controller('ExampleController', ['$scope', function ($scope) { + $scope.items = ['now', 'tomorrow', 'someday']; + $scope.selection = $scope.items[0]; +}]); + + + /************************* * Homework (not rly): * - "enter" button functionality instead of clicking button diff --git a/todo-src/style.css b/todo-src/style.css index eb51b03..25d35ae 100644 --- a/todo-src/style.css +++ b/todo-src/style.css @@ -2,3 +2,4 @@ body { background: green; } +