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

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, {
             });
 
             return keysString;
-        }
-    }
+        }
+        }
 });
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 = {
                 "rules" : [{
                     "selectorSuffix" : "",
                     "styles" : {
-                        "-webkit-animation": "border-morph 2s infinite"
+                        "-webkit-animation-name": "border-morph",
+                        "-webkit-animation-duration": "2s",
+                        "-webkit-animation-iteration-count": "infinite"
                     }
                 },
                     {
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, {
             }, this);
 
 
-        }
+            }
     },
     handleDragEnd : {
         value: function(sourceObject) {
@@ -75,7 +75,7 @@ exports.StylesLibrary = Montage.create(Component, {
             console.log('1Handle should change selection');
             return false;
         }
-    }
+        }
 
 
 });
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, {
                 el._element.classList.add(selectorBase);
             }, this);
 
-        }
-    }
+        }
+        }
 });