Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

2 files changed, 31 insertions, 1 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 87e93465..7d982a62 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -372,7 +372,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                     nextDocumentIndex = closeDocumentIndex - 1;
                 }
                 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
-                if(typeof this.activeDocument.stopVideos !== "undefined"){doc.stopVideos();}
+                if(typeof doc.stopVideos !== "undefined"){doc.stopVideos();}
                 this._removeDocumentView(doc.container);
             }else if(this._documents.length === 0){
                 if(typeof this.activeDocument.pauseAndStopVideos !== "undefined"){
diff --git a/js/panels/presets/default-transition-presets.js b/js/panels/presets/default-transition-presets.js
index 00873231..271ad821 100644
--- a/js/panels/presets/default-transition-presets.js
+++ b/js/panels/presets/default-transition-presets.js
@@ -88,6 +88,36 @@ exports.transitionPresets = {
                         "-webkit-transform": "rotate(180deg)"
                     }
                 }]
+            },
+            {
+                "text": "Scale Up",
+                "selectorBase" : "scale-up",
+                "rules" : [{
+                    "selectorSuffix" : "",
+                    "styles" : {
+                        "-webkit-transition": "-webkit-transform 0.4s ease-in"
+                    }
+                }, {
+                    "selectorSuffix" : ":hover",
+                    "styles" : {
+                        "-webkit-transform": "scale(1.4)"
+                    }
+                }]
+            },
+            {
+                "text": "Scale Down",
+                "selectorBase" : "scale-down",
+                "rules" : [{
+                    "selectorSuffix" : "",
+                    "styles" : {
+                        "-webkit-transition": "-webkit-transform 0.4s ease-in"
+                    }
+                }, {
+                    "selectorSuffix" : ":hover",
+                    "styles" : {
+                        "-webkit-transform": "scale(.5)"
+                    }
+                }]
             }]
     }]
 };
\ No newline at end of file