javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-06 22:29:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Making toderp progress

Browse Source
This commit is contained in:
Max Lynch
2013-10-06 20:39:48 -05:00
parent 3e9ebbae35
commit f609320a80
9 changed files with 77 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dist/ionic-angular.js vendored
View File

@ -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));
};
}
}

6
dist/ionic-ios7.css vendored
View File

@ -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; }

6
dist/ionic.css vendored
View File

@ -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; }

22
example/toderp2/index.html
View File

@ -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>

2
example/toderp2/js/app.js
View File

@ -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');

92
example/toderp2/js/controllers.js
View File

@ -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) {

5
js/ext/angular/src/directive/ionicNav.js vendored
View File

@ -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}">' +

9
js/ext/angular/src/directive/ionicSideMenu.js vendored
View File

@ -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));
};
}
}

6
scss/ionic/_animations.scss
View File

@ -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;