diff options
| author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
| commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
| tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/Timeline/EasingMenu.reel/EasingMenu.html | |
| parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
| parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
| download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz | |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/Timeline/EasingMenu.reel/EasingMenu.html')
| -rw-r--r-- | js/panels/Timeline/EasingMenu.reel/EasingMenu.html | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html index dcf35d8f..b02a22c6 100644 --- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html +++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| @@ -29,31 +29,31 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
| 29 | POSSIBILITY OF SUCH DAMAGE. | 29 | POSSIBILITY OF SUCH DAMAGE. |
| 30 | </copyright> --> | 30 | </copyright> --> |
| 31 | <html lang="en"> | 31 | <html lang="en"> |
| 32 | <head> | 32 | <head> |
| 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| 34 | <link rel="stylesheet" type="text/css" href="css/EasingMenu.css"> | 34 | <link rel="stylesheet" type="text/css" href="css/EasingMenu.css"> |
| 35 | <script type="text/montage-serialization"> | 35 | <script type="text/montage-serialization"> |
| 36 | { | 36 | { |
| 37 | "owner": { | 37 | "owner": { |
| 38 | "prototype": "js/panels/Timeline/EasingMenu.reel", | 38 | "prototype": "js/panels/Timeline/EasingMenu.reel", |
| 39 | "properties": { | 39 | "properties": { |
| 40 | "element": {"#": "container-easing-menu"} | 40 | "element": {"#": "container-easing-menu"} |
| 41 | 41 | ||
| 42 | } | 42 | } |
| 43 | } | 43 | } |
| 44 | } | 44 | } |
| 45 | </script> | 45 | </script> |
| 46 | </head> | 46 | </head> |
| 47 | <body> | 47 | <body> |
| 48 | <div data-montage-id="container-easing-menu" class="container-easing-choices"> | 48 | <div data-montage-id="container-easing-menu" class="container-easing-choices"> |
| 49 | <ul data-montage-id="easing_choices" class="easing-choices"> | 49 | <ul data-montage-id="easing_choices" class="easing-choices"> |
| 50 | <li data-ninja-ease="none">none</li> | 50 | <li data-ninja-ease="none">none</li> |
| 51 | <li data-ninja-ease="ease">ease</li> | 51 | <li data-ninja-ease="ease">ease</li> |
| 52 | <li data-ninja-ease="ease-out">ease-out</li> | 52 | <li data-ninja-ease="ease-out">ease-out</li> |
| 53 | <li data-ninja-ease="ease-in">ease-in</li> | 53 | <li data-ninja-ease="ease-in">ease-in</li> |
| 54 | <li data-ninja-ease="ease-in-out">ease-in-out</li> | 54 | <li data-ninja-ease="ease-in-out">ease-in-out</li> |
| 55 | <li data-ninja-ease="linear">linear</li> | 55 | <li data-ninja-ease="linear">linear</li> |
| 56 | </ul> | 56 | </ul> |
| 57 | </div> | 57 | </div> |
| 58 | </body> | 58 | </body> |
| 59 | </html> | 59 | </html> |