diff options
author | Bharat Mediratta <bharat@menalto.com> | 2010-02-08 15:38:59 -0800 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2010-02-08 15:38:59 -0800 |
commit | 9ca521c71021b43f13950d246a15f6f0da0b7989 (patch) | |
tree | b2435238db3231761efc9245c4627214c9c595db /modules/organize/js/organize.js | |
parent | 6dfab72922bf20104d6032eb292d59c6bd6578ba (diff) | |
parent | 008174859dc25dade593abdf4ce670bc6c7ef332 (diff) |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/organize/js/organize.js')
-rw-r--r-- | modules/organize/js/organize.js | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js index 942e49e5..5b90f402 100644 --- a/modules/organize/js/organize.js +++ b/modules/organize/js/organize.js @@ -7,31 +7,28 @@ appendTo: "#g-organize-content-pane", helper: function(event, ui) { var selected = $(".ui-draggable.ui-selected img"); - if (selected.length) { - var set = $('<div class="g-drag-helper"></div>') - .css({ - zIndex: 2000, - width: 80, - height: Math.ceil(selected.length / 5) * 16 - }); + var set = $('<div class="g-drag-helper"></div>') + .css({ + zIndex: 2000, + width: 80, + height: Math.ceil(selected.length / 5) * 16 + }); - selected.each(function(i) { - var row = parseInt(i / 5); - var j = i - (row * 5); - var o = $(this).offset(); - var copy = $(this).clone() - .css({ - width: $(this).width(), height: $(this).height(), display: "block", - margin: 0, position: 'absolute', outline: '5px solid #fff', - left: o.left - event.pageX, top: o.top - event.pageY - }) - .appendTo(set) - .animate({ width: 10, height: 10, outlineWidth: 1, margin: 1, - left: (20 * j), top: (row * 20) }, 500); - }); - return set; - } - return null; + selected.each(function(i) { + var row = parseInt(i / 5); + var j = i - (row * 5); + var o = $(this).offset(); + var copy = $(this).clone() + .css({ + width: $(this).width(), height: $(this).height(), display: "block", + margin: 0, position: 'absolute', outline: '5px solid #fff', + left: o.left - event.pageX, top: o.top - event.pageY + }) + .appendTo(set) + .animate({ width: 10, height: 10, outlineWidth: 1, margin: 1, + left: (20 * j), top: (row * 20) }, 500); + }); + return set; }, start: function(event, ui) { |