Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Merge pull request #262 from mailpoet/editor_transitions

Browse Source 
Editor: fix transitions and thumbnails
This commit is contained in:
Marco
2015-12-07 20:00:07 +01:00
parent 25727ea0ba cdfeb8d512
commit c04b95c09a
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/newsletter_editor/blocks/base.js
View File

@ -147,7 +147,7 @@ define([
this.$el.addClass(className); this.$el.addClass(className);
this.$el.one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd animationend', function() { this.$el.one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd animationend', function() {
that.$el.removeClass('mailpoet_block_transition_out'); that.$el.removeClass(className);
promise.resolve(); promise.resolve();
}); });
return promise; return promise;

2
assets/js/src/newsletter_editor/blocks/container.js
View File

@ -262,7 +262,7 @@ define([
this.$el.addClass(className); this.$el.addClass(className);
this.$el.one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd animationend', function() { this.$el.one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd animationend', function() {
that.$el.removeClass('mailpoet_block_transition_out'); that.$el.removeClass(className);
promise.resolve(); promise.resolve();
}); });
return promise; return promise;

2
assets/js/src/newsletter_editor/blocks/social.js
View File

@ -222,7 +222,7 @@ define([
this.$el.addClass(className); this.$el.addClass(className);
this.$el.one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd animationend', function() { this.$el.one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd animationend', function() {
that.$el.removeClass('mailpoet_block_transition_out'); that.$el.removeClass(className);
promise.resolve(); promise.resolve();
}); });
return promise; return promise;

2
package.json
View File

@ -19,7 +19,7 @@
"d3": "~3.5.5", "d3": "~3.5.5",
"handlebars": "3.0.3", "handlebars": "3.0.3",
"history": "^1.12.5", "history": "^1.12.5",
"html2canvas": "latest", "html2canvas": "0.5.0-alpha2",
"interact.js": "latest", "interact.js": "latest",
"moment": "^2.10.3", "moment": "^2.10.3",
"napa": "^1.2.0", "napa": "^1.2.0",