aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/style-presets.reel
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/style-presets.reel
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/style-presets.reel')
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.js4
1 files changed, 2 insertions, 2 deletions
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});