From d3f67c2e306cb1888099f4decba00a9d8727cc43 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 22 May 2012 18:23:36 -0700
Subject: Timeline: New easing selector in spans.
---
js/panels/Timeline/Span.reel/Span.html | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
(limited to 'js/panels/Timeline/Span.reel/Span.html')
diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html
index 8baa141a..d6c359ad 100644
--- a/js/panels/Timeline/Span.reel/Span.html
+++ b/js/panels/Timeline/Span.reel/Span.html
@@ -13,7 +13,10 @@
"owner": {
"prototype": "js/panels/Timeline/Span.reel",
"properties": {
- "element": {"#": "spanspace"}
+ "element": {"#": "spanspace"},
+ "container_easing" : {"#" : "container_easing"},
+ "easing_choice" : {"#": "easing_choice"},
+ "easing_choices" : {"#" : "easing_choices"}
}
}
@@ -23,6 +26,18 @@
+
+
+
+ ease-in-out
+
+
+ - choice 1
+ - choice 2
+ - choice 3
+ - choice 4
+
+
- ease-in-out
+ ease-out
- - choice 1
- - choice 2
- - choice 3
- - choice 4
+ - ease
+ - ease-out
+ - ease-in
+ - ease-in-out
+ - linear
--
cgit v1.2.3
From f97e4b6ab1db9fb7de18b2e44c1b0edcf2ba072d Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 12 Jun 2012 16:47:15 -0700
Subject: Timeline: New popup menu for easing choices.
---
js/panels/Timeline/Span.reel/Span.html | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
(limited to 'js/panels/Timeline/Span.reel/Span.html')
diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html
index a1f3afeb..6e643daa 100644
--- a/js/panels/Timeline/Span.reel/Span.html
+++ b/js/panels/Timeline/Span.reel/Span.html
@@ -15,8 +15,7 @@
"properties": {
"element": {"#": "spanspace"},
"container_easing" : {"#" : "container_easing"},
- "easing_choice" : {"#": "easing_choice"},
- "easing_choices" : {"#" : "easing_choices"}
+ "easing_choice" : {"#": "easing_choice"}
}
}
@@ -27,17 +26,10 @@
-
+
ease-out
-
- - ease
- - ease-out
- - ease-in
- - ease-in-out
- - linear
-
--
cgit v1.2.3