Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBox

2 files changed, 56 insertions, 0 deletions

diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
index 599eeda3..3505393c 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
@@ -297,6 +297,8 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
                         styles[n] = defaultStyles[n];
                     }
                 }
+                
+                instance.addEventListener('firstDraw', that, false);
 
                 that.application.ninja.currentDocument.setComponentInstance(instance, element);
 
@@ -305,6 +307,12 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
 
         }
     },
+    
+    handleFirstDraw: {
+        value: function (e) {
+                NJevent("addComponentFirstDraw");
+        }
+    },
 
     makeComponent: {
         value: function(name) {
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 2e656e86..64f91ea6 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -37,6 +37,54 @@ exports.animationPresets = {
                     }]
             }]
     }, {
+        "text": "2D Animations",
+    "children": [
+        {
+            "text": "Slide Out with Fade",
+            "selectorBase": "slide-fade-out",
+            "rules" : [{
+                "selectorSuffix" : "",
+                "styles" : {
+                    "-webkit-animation-name": "slide-fade-out",
+                    "-webkit-animation-duration": "5s",
+                    "-webkit-animation-iteration-count": "infinite",
+                    "-webkit-animation-direction": "normal",
+                    "-webkit-animation-timing-function": "ease",
+                    "-webkit-transform-style": "preserve-3d",
+                    "-webkit-transform": "perspective(1000)",
+                    "-webkit-animation-delay": "0s"
+                }
+            },{
+                "isKeyFrameRule": true,
+                "keys" : [{
+                    "keyText": "0%",
+                    "styles": {
+                        "opacity": "0",
+                        "-webkit-transform": "translate3d(0, 0, 0)"
+                    }
+                }, {
+                    "keyText": "10%",
+                    "styles": {
+                        "opacity": "1",
+                        "-webkit-transform": "translate3d(0, 0, 0)"
+                    }
+                }, {
+                    "keyText": "86%",
+                    "styles": {
+                        "opacity": "1",
+                        "-webkit-transform": "translate3d(0, 0, 0)"
+
+                    }
+                }, {
+                    "keyText": "100%",
+                    "styles": {
+                        "opacity": "0",
+                        "-webkit-transform": "translate3d(540px, 0, 0)"
+                    }
+                }]
+            }]
+        }]
+    }, {
         "text": "3D Animations",
         "children": [
             {