diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/presets/animations-presets.reel | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/presets/animations-presets.reel')
| -rw-r--r-- | js/panels/presets/animations-presets.reel/animations-presets.html | 2 | ||||
| -rw-r--r-- | js/panels/presets/animations-presets.reel/animations-presets.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.html b/js/panels/presets/animations-presets.reel/animations-presets.html index 13e31d8d..fad23595 100644 --- a/js/panels/presets/animations-presets.reel/animations-presets.html +++ b/js/panels/presets/animations-presets.reel/animations-presets.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. |
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.js b/js/panels/presets/animations-presets.reel/animations-presets.js index c577d076..729b336a 100644 --- a/js/panels/presets/animations-presets.reel/animations-presets.js +++ b/js/panels/presets/animations-presets.reel/animations-presets.js | |||
| @@ -47,6 +47,6 @@ exports.AnimationsLibrary = Montage.create(Component, { | |||
| 47 | handleNodeActivation: { | 47 | handleNodeActivation: { |
| 48 | value: function(presetData) { | 48 | value: function(presetData) { |
| 49 | this.application.ninja.presetsController.applyPreset(presetData); | 49 | this.application.ninja.presetsController.applyPreset(presetData); |
| 50 | } | 50 | } |
| 51 | } | 51 | } |
| 52 | }); | 52 | }); |