diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-27 08:35:19 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-27 08:35:19 -0800 |
| commit | 0a482127b244f8ec8f8fac7af928391e05d4dd8e (patch) | |
| tree | ee5b3bfce397e4db90660794f3d15b7858fec3c4 /modules/organize/js | |
| parent | bccb6fc02146fb07cd1b472a90092e78e2259e91 (diff) | |
| parent | 55f9408d509b6ee34e62948d311d6d963e3ffa6d (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/organize/js/organize.js
Diffstat (limited to 'modules/organize/js')
| -rw-r--r-- | modules/organize/js/organize.js | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js index 556aa7e7..76eadf85 100644 --- a/modules/organize/js/organize.js +++ b/modules/organize/js/organize.js @@ -162,16 +162,8 @@ }, set_handlers: function() { - $("#g-organize-microthumb-panel") - .selectable({ - filter: ".g-organize-microthumb-grid-cell", - selected: function(event, ui) { - $(ui.selected).children(".g-organize-microthumb").addClass("ui-state-highlight"); - }, - unselected: function(event, ui) { - $(ui.unselected).children(".g-organize-microthumb").removeClass("ui-state-highlight"); - } - }) + $("#g-organize-microthumb-grid") + .selectable({filter: ".g-organize-microthumb-grid-cell"}) .droppable($.organize.content_droppable); $(".g-organize-microthumb-grid-cell") .draggable($.organize.micro_thumb_draggable) |