aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets
diff options
context:
space:
mode:
authorhwc4872012-04-04 16:32:53 -0700
committerhwc4872012-04-04 16:32:53 -0700
commit6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600 (patch)
treef267e05f623ed90d1cc841b8c79a338d6d8e807c /js/panels/presets
parent16f62ca09cc428043e8fef8bdeea11a989e62bc0 (diff)
parent17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff)
downloadninja-6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping
Conflicts: js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js
Diffstat (limited to 'js/panels/presets')
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.js4
-rw-r--r--js/panels/presets/default-animation-presets.js4
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.js4
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.js4
4 files changed, 9 insertions, 7 deletions
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.js b/js/panels/presets/animations-presets.reel/animations-presets.js
index ab200212..272f6c5b 100644
--- a/js/panels/presets/animations-presets.reel/animations-presets.js
+++ b/js/panels/presets/animations-presets.reel/animations-presets.js
@@ -68,6 +68,6 @@ exports.AnimationsLibrary = Montage.create(Component, {
68 }); 68 });
69 69
70 return keysString; 70 return keysString;
71 } 71 }
72 } 72 }
73}); 73});
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 64f91ea6..4793c356 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -15,7 +15,9 @@ exports.animationPresets = {
15 "rules" : [{ 15 "rules" : [{
16 "selectorSuffix" : "", 16 "selectorSuffix" : "",
17 "styles" : { 17 "styles" : {
18 "-webkit-animation": "border-morph 2s infinite" 18 "-webkit-animation-name": "border-morph",
19 "-webkit-animation-duration": "2s",
20 "-webkit-animation-iteration-count": "infinite"
19 } 21 }
20 }, 22 },
21 { 23 {
diff --git a/js/panels/presets/style-presets.reel/style-presets.js b/js/panels/presets/style-presets.reel/style-presets.js
index 11f41822..a742213e 100644
--- a/js/panels/presets/style-presets.reel/style-presets.js
+++ b/js/panels/presets/style-presets.reel/style-presets.js
@@ -61,7 +61,7 @@ exports.StylesLibrary = Montage.create(Component, {
61 }, this); 61 }, this);
62 62
63 63
64 } 64 }
65 }, 65 },
66 handleDragEnd : { 66 handleDragEnd : {
67 value: function(sourceObject) { 67 value: function(sourceObject) {
@@ -75,7 +75,7 @@ exports.StylesLibrary = Montage.create(Component, {
75 console.log('1Handle should change selection'); 75 console.log('1Handle should change selection');
76 return false; 76 return false;
77 } 77 }
78 } 78 }
79 79
80 80
81}); 81});
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.js b/js/panels/presets/transitions-presets.reel/transitions-presets.js
index f7d84085..05f917c4 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.js
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.js
@@ -41,6 +41,6 @@ exports.TransitionsLibrary = Montage.create(Component, {
41 el._element.classList.add(selectorBase); 41 el._element.classList.add(selectorBase);
42 }, this); 42 }, this);
43 43
44 } 44 }
45 } 45 }
46}); 46});