From f609320a80d4f7fe2ba51830d354c1aef1199f83 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Sun, 6 Oct 2013 20:39:48 -0500
Subject: [PATCH] Making toderp progress

---
 dist/ionic-angular.js                         | 14 +--
 dist/ionic-ios7.css                           |  6 +-
 dist/ionic.css                                |  6 +-
 example/toderp2/index.html                    | 22 +++--
 example/toderp2/js/app.js                     |  2 +-
 example/toderp2/js/controllers.js             | 92 +++++++++----------
 js/ext/angular/src/directive/ionicNav.js      |  5 -
 js/ext/angular/src/directive/ionicSideMenu.js |  9 +-
 scss/ionic/_animations.scss                   |  6 +-
 9 files changed, 77 insertions(+), 85 deletions(-)

diff --git a/dist/ionic-angular.js b/dist/ionic-angular.js
index 6351de2cad..cd15f7403f 100644
--- a/dist/ionic-angular.js
+++ b/dist/ionic-angular.js
@@ -226,10 +226,6 @@ angular.module('ionic.ui.nav', ['ionic.service'])
     controller: 'NavCtrl',
     //templateUrl: 'ext/angular/tmpl/ionicTabBar.tmpl.html',
     template: '<div class="view" ng-transclude></div>',
-    compile: function(element, attr, transclude, navCtrl) {
-      return function($scope, $element, $attr) {
-      };
-    }
   }
 })
 
@@ -237,7 +233,6 @@ angular.module('ionic.ui.nav', ['ionic.service'])
   return {
     restrict: 'E',
     require: '^navCtrl',
-    transclude: true,
     replace: true,
     scope: true,
     template: '<header class="bar bar-header bar-dark nav-bar" ng-class="{hidden: !navController.navBar.isVisible}">' + 
@@ -317,11 +312,8 @@ angular.module('ionic.ui.sideMenu', [])
 
 .directive('sideMenuCtrl', function() {
   return {
-    restrict: 'E',
+    restrict: 'CA',
     controller: 'SideMenuCtrl',
-    replace: true,
-    transclude: true,
-    template: '<div class="view" ng-transclude></div>',
   }
 })
 
@@ -374,11 +366,11 @@ angular.module('ionic.ui.sideMenu', [])
     require: '^sideMenuCtrl',
     replace: true,
     transclude: true,
-    scope: true,
-    template: '<div class="menu menu-{{side}}" ng-transclude></div>',
+    template: '<div class="menu menu-{{side}}"></div>',
     compile: function(element, attr, transclude, sideMenuCtrl) {
       return function($scope, $element, $attr) {
         $scope.side = attr.side;
+        $element.append(transclude($scope));
       };
     }
   }
diff --git a/dist/ionic-ios7.css b/dist/ionic-ios7.css
index 67f75a3481..799ec2c654 100644
--- a/dist/ionic-ios7.css
+++ b/dist/ionic-ios7.css
@@ -2305,11 +2305,11 @@ a.button {
   padding: 10px; }
 
 .slide-in-up {
-  opacity: 0.5;
+  opacity: 0;
   -webkit-transform: translate3d(0, 100%, 0);
   transform: translate3d(0, 100%, 0);
-  -webkit-transition: -webkit-transform 0.3s, opacity 0.2s;
-  transition: -webkit-transform 0.3s, opacity 0.2s;
+  -webkit-transition: -webkit-transform 0.4s, opacity 0.1s;
+  transition: -webkit-transform 0.4s, opacity 0.1s;
   -webkit-transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
   transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
   -webkit-animation-fill-mode: forwards; }
diff --git a/dist/ionic.css b/dist/ionic.css
index c1fcbf0f49..50f13fd568 100644
--- a/dist/ionic.css
+++ b/dist/ionic.css
@@ -2387,11 +2387,11 @@ a.button {
   padding: 10px; }
 
 .slide-in-up {
-  opacity: 0.5;
+  opacity: 0;
   -webkit-transform: translate3d(0, 100%, 0);
   transform: translate3d(0, 100%, 0);
-  -webkit-transition: -webkit-transform 0.3s, opacity 0.2s;
-  transition: -webkit-transform 0.3s, opacity 0.2s;
+  -webkit-transition: -webkit-transform 0.4s, opacity 0.1s;
+  transition: -webkit-transform 0.4s, opacity 0.1s;
   -webkit-transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
   transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
   -webkit-animation-fill-mode: forwards; }
diff --git a/example/toderp2/index.html b/example/toderp2/index.html
index 36169319b7..200198aead 100644
--- a/example/toderp2/index.html
+++ b/example/toderp2/index.html
@@ -107,14 +107,22 @@
 
     <!-- Tasks -->
     <script id="tasks.html" type="text/ng-template">
-      <side-menu-ctrl id="tasks-view" nav-content class="view" ng-controller="TasksCtrl" nav-bar="false">
+      <div class="view" side-menu-ctrl id="tasks-view" nav-content class="view" ng-controller="TasksCtrl" nav-bar="false">
         <div class="full-section" side-menu-content>
           <header class="bar bar-header bar-secondary">
-            <a href="#" class="button"><i class="icon-reorder"></i></a>
-            <h1 class="title">{{activeList.title}}</h1>
+            <a href="#" class="button button-icon"><i class="icon-reorder"></i></a>
+            <h1 class="title">{{activeProject.title}}</h1>
+            <button class="button button-clear button-primary">Edit</button>
           </header>
           <div class="content has-header">
-            <h1>Slide me side to side!</h1>
+            <form ng-submit="addTask(newTask)">
+              <input type="text" ng-model="newTask.title" placeholder="Add an item...">
+            </form>
+            <list>
+              <li class="list-item" ng-repeat="task in activeProject.tasks" ng-class="{completed: task.isCompleted}">
+                {{task.title}}
+              </li>
+            </list>
           </div>
         </div>
         <menu side="left">
@@ -123,14 +131,14 @@
             <div class="toderp-small-logo"></div>
             <button class="button button-icon">S</button>
           </header>
-          <content has-header="true" ng-controller="ProjectsCtrl">
+          <content has-header="true">
             <form ng-submit="addProject(newProject)">
               <input type="text" ng-model="newProject.title" placeholder="Create a new list...">
             </form>
             <list>
-              <li class="list-item" ng-repeat="project in projects">
+              <a ng-click="setActiveProject(project)" class="list-item" ng-repeat="project in projects">
                 {{project.title}}
-              </li>
+              </a>
             </list>
           </content>
         </menu>
diff --git a/example/toderp2/js/app.js b/example/toderp2/js/app.js
index 135114406e..1b26443201 100644
--- a/example/toderp2/js/app.js
+++ b/example/toderp2/js/app.js
@@ -15,4 +15,4 @@ angular.module('ionic.todo', [
                'ngAnimate'])
 
 // Our Firebase URL
-.constant('FIREBASE_URL', 'https://ionic-todo-demo.firebaseio.com/');
+.constant('FIREBASE_URL', 'https://ionic-todo-demo.firebaseio.com/todo');
diff --git a/example/toderp2/js/controllers.js b/example/toderp2/js/controllers.js
index c1e881d259..2408c8811b 100644
--- a/example/toderp2/js/controllers.js
+++ b/example/toderp2/js/controllers.js
@@ -62,59 +62,59 @@ angular.module('ionic.todo.controllers', ['ionic.todo'])
 
   $scope.showLogin = function() {
     $scope.loginModal && $scope.loginModal.show();
-    /*
-    ActionSheet.show({
-      buttons: [
-        { text: 'Option 1' },
-        { text: 'Option 2' },
-        { text: 'Option 3' },
-      ],
-      destructiveText: 'Delete life',
-      titleText: 'Are you sure about life?',
-      cancelText: 'Cancel',
-      cancel: function() {
-        console.log('CANCELLED');
-      },
-      buttonClicked: function(index) {
-        console.log('BUTTON CLICKED', index);
-        return true;
-      },
-      destructiveButtonClicked: function() {
-        return true;
-      }
-    });
-    */
   };
 })
 
 
 // The tasks controller (main app controller)
-.controller('TasksCtrl', function($scope, angularFire, FIREBASE_URL) {
-  var taskRef = new Firebase(FIREBASE_URL + '/todos');
-  $scope.todos = [];
-  angularFire(taskRef, $scope, 'todos');
+.controller('TasksCtrl', function($scope, angularFire, angularFireCollection, FIREBASE_URL) {
+  /*
+  var lastProjectRef = new Firebase(FIREBASE_URL + '/lastproject');
+  var lastProjectPromise = angularFire(lastProjectRef, $scope, 'lastProject');
+  $scope.lastProject = null;
+  */
 
-  $scope.addTask = function(task) {
-    var t = {};
-    t = angular.extend({
-     id: $scope.user.id
-    }, task);
-
-    console.log("Adding task:", t);
-    $scope.todos.push(t);
-
-    $scope.task = {};
-  };
-})
-
-.controller('ProjectsCtrl', function($scope, angularFire, FIREBASE_URL) {
-  var taskRef = new Firebase(FIREBASE_URL + '/projects');
 
   $scope.newProject = {};
 
-  $scope.projects = [];
-  angularFire(taskRef, $scope, 'projects');
+  $scope.newTask = {};
 
+
+  /**
+   * Add a new tasks to the current project.
+   */
+  $scope.addTask = function(task) {
+    if(!$scope.activeProject) {
+      return;
+    }
+
+    if(!$scope.activeProject.tasks) {
+      $scope.activeProject.tasks = [];
+    }
+    $scope.activeProject.tasks.push({
+      title: task.title,
+      user_id: $scope.user.id,
+      isCompleted: false
+    });
+
+    $scope.newTask = {};
+  };
+
+  /**
+   * Set the current project
+   */
+  $scope.setActiveProject = function(project) {
+    if(project.$ref) {
+      $scope.activeProject = angularFire(project.$ref, $scope, 'activeProject');
+    } else {
+      $scope.activeProject = angularFire(project, $scope, 'activeProject');
+    }
+    //$scope.lastProject = project;
+  }
+
+  /**
+   * Add a project to the projects list.
+   */
   $scope.addProject = function(newProject) {
     var p = {
       title: newProject.title,
@@ -124,14 +124,14 @@ angular.module('ionic.todo.controllers', ['ionic.todo'])
 
     console.log("Adding project:", p);
 
-    $scope.projects.push(p);
 
     // Reset the form
     $scope.newProject = {};
+
+    $scope.setActiveProject($scope.projects.add(p));
   };
 
-  // Check if we need to create an initial list
-  taskRef.on('value', function(snapshot) {
+  $scope.projects = angularFireCollection(new Firebase(FIREBASE_URL + '/project_list'), function(snapshot) {
     if(!snapshot.val()) {
       var title = prompt('Create your first list:');
       if(title) {
diff --git a/js/ext/angular/src/directive/ionicNav.js b/js/ext/angular/src/directive/ionicNav.js
index 0a2c42f8f2..0491161c01 100644
--- a/js/ext/angular/src/directive/ionicNav.js
+++ b/js/ext/angular/src/directive/ionicNav.js
@@ -53,10 +53,6 @@ angular.module('ionic.ui.nav', ['ionic.service'])
     controller: 'NavCtrl',
     //templateUrl: 'ext/angular/tmpl/ionicTabBar.tmpl.html',
     template: '<div class="view" ng-transclude></div>',
-    compile: function(element, attr, transclude, navCtrl) {
-      return function($scope, $element, $attr) {
-      };
-    }
   }
 })
 
@@ -64,7 +60,6 @@ angular.module('ionic.ui.nav', ['ionic.service'])
   return {
     restrict: 'E',
     require: '^navCtrl',
-    transclude: true,
     replace: true,
     scope: true,
     template: '<header class="bar bar-header bar-dark nav-bar" ng-class="{hidden: !navController.navBar.isVisible}">' + 
diff --git a/js/ext/angular/src/directive/ionicSideMenu.js b/js/ext/angular/src/directive/ionicSideMenu.js
index 8ed683edec..2430690819 100644
--- a/js/ext/angular/src/directive/ionicSideMenu.js
+++ b/js/ext/angular/src/directive/ionicSideMenu.js
@@ -33,11 +33,8 @@ angular.module('ionic.ui.sideMenu', [])
 
 .directive('sideMenuCtrl', function() {
   return {
-    restrict: 'E',
+    restrict: 'CA',
     controller: 'SideMenuCtrl',
-    replace: true,
-    transclude: true,
-    template: '<div class="view" ng-transclude></div>',
   }
 })
 
@@ -90,11 +87,11 @@ angular.module('ionic.ui.sideMenu', [])
     require: '^sideMenuCtrl',
     replace: true,
     transclude: true,
-    scope: true,
-    template: '<div class="menu menu-{{side}}" ng-transclude></div>',
+    template: '<div class="menu menu-{{side}}"></div>',
     compile: function(element, attr, transclude, sideMenuCtrl) {
       return function($scope, $element, $attr) {
         $scope.side = attr.side;
+        $element.append(transclude($scope));
       };
     }
   }
diff --git a/scss/ionic/_animations.scss b/scss/ionic/_animations.scss
index 8ff0011c76..74852c0cc2 100644
--- a/scss/ionic/_animations.scss
+++ b/scss/ionic/_animations.scss
@@ -2,13 +2,13 @@ $bezier-function: cubic-bezier(.1, .7, .1, 1);
  
 .slide-in-up {
   // Start hidden
-  opacity: 0.5;
+  opacity: 0;
   // Start it down low
  -webkit-transform: translate3d(0, 100%, 0);
   transform: translate3d(0, 100%, 0);
 
-  -webkit-transition: -webkit-transform 0.3s, opacity 0.2s;
-  transition: -webkit-transform 0.3s, opacity 0.2s;
+  -webkit-transition: -webkit-transform 0.4s, opacity 0.1s;
+  transition: -webkit-transform 0.4s, opacity 0.1s;
 
   -webkit-transition-timing-function: $bezier-function;
   transition-timing-function: $bezier-function;