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

Fix preventing dragging by settings/delete block tools

Browse Source
This commit is contained in:
Tautvidas Sipavičius
2016-02-04 13:47:46 +02:00
parent ba69d659ab
commit 992fe2a6e9
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,6 @@ define([
DraggableBehavior: {
cloneOriginal: true,
hideOriginal: true,
ignoreSelector: ".mailpoet_tool:not(.mailpoet_move_block)",
onDrop: function(options) {
// After a clone of model has been dropped, cleanup
// and destroy self

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

@@ -94,7 +94,6 @@ define([
DraggableBehavior: {
cloneOriginal: true,
hideOriginal: true,
ignoreSelector: ".mailpoet_tool:not(.mailpoet_move_block)",
onDrop: function(options) {
// After a clone of model has been dropped, cleanup
// and destroy self

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

@@ -120,7 +120,6 @@ define([
DraggableBehavior: {
cloneOriginal: true,
hideOriginal: true,
ignoreSelector: ".mailpoet_tool:not(.mailpoet_move_block)",
onDrop: function(options) {
// After a clone of model has been dropped, cleanup
// and destroy self

6
views/newsletter/templates/blocks/base/toolsGeneric.hbs
View File

@@ -1,7 +1,7 @@
{{#if tools.layerSelector}}<a href="javascript:;" class="mailpoet_tool mailpoet_newsletter_layer_selector" title="<%= __('Switch editing layer') %>">
{{#if tools.layerSelector}}<a href="javascript:;" class="mailpoet_tool mailpoet_newsletter_layer_selector mailpoet_ignore_drag" title="<%= __('Switch editing layer') %>">
<%= source('newsletter/templates/svg/block-tools/settings-column.svg') %>
</a>{{/if}}{{#if tools.settings}}<a href="javascript:;" class="mailpoet_tool mailpoet_edit_block" title="<%= __('Edit settings') %>">
</a>{{/if}}{{#if tools.settings}}<a href="javascript:;" class="mailpoet_tool mailpoet_edit_block mailpoet_ignore_drag" title="<%= __('Edit settings') %>">
<%= source('newsletter/templates/svg/block-tools/settings.svg') %>
</a>{{/if}}{{#if tools.delete}}<div class="mailpoet_delete_block"><a href="javascript:;" class="mailpoet_tool mailpoet_delete_block_activate" title="<%= __('Delete') %>"><%= source('newsletter/templates/svg/block-tools/trash.svg') %></a><a href="javascript:;" class="mailpoet_delete_block_confirm" title="<%= __('Confirm deletion') %>"><%= __('Delete') %></a><a href="javascript:;" class="mailpoet_delete_block_cancel" title="<%= __('Cancel deletion') %>"><%= __('Cancel') %></a></div>{{/if}}{{#if tools.move}}<a href="javascript:;" class="mailpoet_tool mailpoet_move_block" title="<%= __('Drag to move') %>">
</a>{{/if}}{{#if tools.delete}}<div class="mailpoet_delete_block mailpoet_ignore_drag"><a href="javascript:;" class="mailpoet_tool mailpoet_delete_block_activate" title="<%= __('Delete') %>"><%= source('newsletter/templates/svg/block-tools/trash.svg') %></a><a href="javascript:;" class="mailpoet_delete_block_confirm" title="<%= __('Confirm deletion') %>"><%= __('Delete') %></a><a href="javascript:;" class="mailpoet_delete_block_cancel" title="<%= __('Cancel deletion') %>"><%= __('Cancel') %></a></div>{{/if}}{{#if tools.move}}<a href="javascript:;" class="mailpoet_tool mailpoet_move_block" title="<%= __('Drag to move') %>">
<%= source('newsletter/templates/svg/block-tools/move.svg') %>
</a>{{/if}}