Download as
Browse Code »

Commit 590cd157cdc43dea3a2d7d2caefdbcc0d24a00cc

Authored by Victor Costa
1 parent cb6fbc38
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

container_block: avoid conflict between resizable and draggable functions

Showing 1 changed file with 2 additions and 0 deletions   Show diff stats
plugins/container_block/public/container_block.js
  Diff comments   View file @590cd15
1 function enableMoveContainerChildren(container, box) { 1 function enableMoveContainerChildren(container, box) {
2 var div = jQuery('#box-'+box+' > .block-outer > .block'); 2 var div = jQuery('#box-'+box+' > .block-outer > .block');
3 if(!div.is('.ui-resizable')) { 3 if(!div.is('.ui-resizable')) {
  4 + div.removeClass('ui-draggable');
4 div.resizable({ 5 div.resizable({
5 handles: 'e, w', 6 handles: 'e, w',
6 containment: '#block-'+container+' .block-inner-2', 7 containment: '#block-'+container+' .block-inner-2',
@@ -14,6 +15,7 @@ function enableMoveContainerChildren(container, box) { @@ -14,6 +15,7 @@ function enableMoveContainerChildren(container, box) {
14 function disableMoveContainerChildren(container, box) { 15 function disableMoveContainerChildren(container, box) {
15 var div = jQuery('#box-'+box+' > .block-outer > .block'); 16 var div = jQuery('#box-'+box+' > .block-outer > .block');
16 if(div.is('.ui-resizable')) { 17 if(div.is('.ui-resizable')) {
  18 + div.addClass('ui-draggable');
17 div.resizable('destroy'); 19 div.resizable('destroy');
18 } 20 }
19 } 21 }