Commit 5cd7e54deb4ceefc9c788ea131ee320414bd31d3
1 parent
4c1ac095
Exists in
master
and in
29 other branches
container_block: fixed resize of children
Showing
2 changed files
with
1 additions
and
5 deletions
Show diff stats
plugins/container_block/public/container_block.js
| 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.find("a").live("click", function(e) { | ||
| 5 | - e.preventDefault(); | ||
| 6 | - }); | ||
| 7 | div.resizable({ | 4 | div.resizable({ |
| 8 | handles: 'e, w', | 5 | handles: 'e, w', |
| 9 | containment: '#block-'+container+' .block-inner-2', | 6 | containment: '#block-'+container+' .block-inner-2', |
| @@ -17,7 +14,6 @@ function enableMoveContainerChildren(container, box) { | @@ -17,7 +14,6 @@ function enableMoveContainerChildren(container, box) { | ||
| 17 | function disableMoveContainerChildren(container, box) { | 14 | function disableMoveContainerChildren(container, box) { |
| 18 | var div = jQuery('#box-'+box+' > .block-outer > .block'); | 15 | var div = jQuery('#box-'+box+' > .block-outer > .block'); |
| 19 | if(div.is('.ui-resizable')) { | 16 | if(div.is('.ui-resizable')) { |
| 20 | - div.find("a").die("click"); | ||
| 21 | div.resizable('destroy'); | 17 | div.resizable('destroy'); |
| 22 | } | 18 | } |
| 23 | } | 19 | } |
plugins/container_block/public/style.css
| 1 | #box-organizer .container-block-plugin_container-block > .block-inner-1 > .block-inner-2 > .button-bar { | 1 | #box-organizer .container-block-plugin_container-block > .block-inner-1 > .block-inner-2 > .button-bar { |
| 2 | - height: auto; | 2 | + height: 22px; |
| 3 | padding-bottom: 0px; | 3 | padding-bottom: 0px; |
| 4 | width: auto; | 4 | width: auto; |
| 5 | } | 5 | } |