New version of animate and forms, and uses demo mode :)

ialexi · Dec 10, 2009 · 66d926c · 66d926c
1 parent e961f50
commit 66d926c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/apps/contacts/resources/main_page.js b/apps/contacts/resources/main_page.js
@@ -4,6 +4,7 @@
 // ==========================================================================
 /*globals Contacts Animate */
 require("views/contact");
+
 // This page describes the main user interface for your application.  
 Contacts.mainPage = SC.Page.design({
 

diff --git a/apps/contacts/views/contact.js b/apps/contacts/views/contact.js
@@ -10,6 +10,9 @@
 
 @extends SC.View
 */
+
+Animate.defaultTimingFunction = Animate.TRANSITION_EASE_IN_OUT;
+
 Contacts.ContactView = SC.View.extend(
 /** @scope Contacts.ContactView.prototype */ {
 	layout: {left:0, right:0},
@@ -21,7 +24,7 @@ Contacts.ContactView = SC.View.extend(
 		sc_super();
 		if (this.get("form") && !this.get("form").isClass) this.adjust("minHeight", this.getPath("form.layout").minHeight + 40);
 	},
-	form: Forms.FormView.design(Forms.FormAnimation, {
+	form: Forms.FormView.design(Forms.FormAnimation, Forms.FormAnimation.DemoMode, {
 		editsByDefault: NO,
 		layout: { left: 20, top: 20, right: 20, bottom: 20 },
 		contentBinding: ".parentView.content",

diff --git a/frameworks/animate b/frameworks/animate
diff --git a/frameworks/forms b/frameworks/forms