aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-16 15:41:42 -0700
committerValerio Virgillito2012-03-16 15:41:42 -0700
commit37cc3a7824ef1844d6be22ccbbfadcdbbdaf61d2 (patch)
tree3aeefad213f35a498bcf8a1a1b655883f9f71147 /js
parentd1243d98d2f517055437cc67e963528771aa4c4b (diff)
parent3e98d9eaf6f691aa0f7a4334983537a4ee3ffd39 (diff)
downloadninja-37cc3a7824ef1844d6be22ccbbfadcdbbdaf61d2.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js')
-rwxr-xr-xjs/controllers/document-controller.js2
-rw-r--r--js/panels/presets/default-transition-presets.js30
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,
372 nextDocumentIndex = closeDocumentIndex - 1; 372 nextDocumentIndex = closeDocumentIndex - 1;
373 } 373 }
374 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]); 374 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
375 if(typeof this.activeDocument.stopVideos !== "undefined"){doc.stopVideos();} 375 if(typeof doc.stopVideos !== "undefined"){doc.stopVideos();}
376 this._removeDocumentView(doc.container); 376 this._removeDocumentView(doc.container);
377 }else if(this._documents.length === 0){ 377 }else if(this._documents.length === 0){
378 if(typeof this.activeDocument.pauseAndStopVideos !== "undefined"){ 378 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 = {
88 "-webkit-transform": "rotate(180deg)" 88 "-webkit-transform": "rotate(180deg)"
89 } 89 }
90 }] 90 }]
91 },
92 {
93 "text": "Scale Up",
94 "selectorBase" : "scale-up",
95 "rules" : [{
96 "selectorSuffix" : "",
97 "styles" : {
98 "-webkit-transition": "-webkit-transform 0.4s ease-in"
99 }
100 }, {
101 "selectorSuffix" : ":hover",
102 "styles" : {
103 "-webkit-transform": "scale(1.4)"
104 }
105 }]
106 },
107 {
108 "text": "Scale Down",
109 "selectorBase" : "scale-down",
110 "rules" : [{
111 "selectorSuffix" : "",
112 "styles" : {
113 "-webkit-transition": "-webkit-transform 0.4s ease-in"
114 }
115 }, {
116 "selectorSuffix" : ":hover",
117 "styles" : {
118 "-webkit-transform": "scale(.5)"
119 }
120 }]
91 }] 121 }]
92 }] 122 }]
93}; \ No newline at end of file 123}; \ No newline at end of file