Skip to content

Commit

Permalink
Solving issue 13 'Update page count when moving a Page'
Browse files Browse the repository at this point in the history
  • Loading branch information
junior-ales committed Feb 27, 2013
1 parent ac2461e commit c5eb341
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 5 deletions.
19 changes: 14 additions & 5 deletions public/list.js
Expand Up @@ -195,7 +195,7 @@ $(function () {
});

function bindEvents(eventDiv) {
updatePageCount(eventDiv);
pageCounter(eventDiv);

eventDiv.find('.event-expand').click(function (event) {
event.preventDefault();
Expand Down Expand Up @@ -248,15 +248,18 @@ $(function () {

eventDiv.droppable({scope: 'events', hoverClass: 'droppable-active', drop: function (event, ui) {
$('.drag-cart-item').remove();
var eventDiv = $(event.target);
var toEventDiv = $(event.target);
var pageMovedRow = $(ui.draggable);
var pageMovedRowOldEvent = pageMovedRow.data('page-event');
var movedToEvent = eventDiv.data('event');
var movedToEvent = toEventDiv.data('event');
if (pageMovedRowOldEvent == movedToEvent) {
return;
}
pageMovedRow.data('page-event', movedToEvent);
eventDiv.find('tbody').append(pageMovedRow);
var fromEventDiv = $(pageMovedRow).closest('.event');
toEventDiv.find('tbody').append(pageMovedRow);
updatePageCounter(fromEventDiv, toEventDiv);

var path = pageMovedRow.data('change-event-path');
$.ajax({
url: path,
Expand Down Expand Up @@ -300,7 +303,7 @@ $(function () {
iframe.width = (newwidth) + "px";
}

function updatePageCount(eventDiv) {
function pageCounter(eventDiv) {
var pageCount = $(eventDiv).find('.page').length;
var pageCounterMsg;

Expand All @@ -315,4 +318,10 @@ $(function () {
}
$(eventDiv).closest('.event').find('.event-page-count').text(pageCounterMsg);
}

function updatePageCounter(fromEventPage, toEventPage) {
pageCounter(fromEventPage);
pageCounter(toEventPage);
}

});
19 changes: 19 additions & 0 deletions spec.rb
Expand Up @@ -406,6 +406,25 @@
assert_uploaded_page_is_displayed_within_event(@page1)
end

it 'updates the counter page of event when a page is dragged to another event' do
@page1 = Page.create!(:name => 'Joana', :event => 'Event1', :content => 'oi!')
@page2 = Page.create!(:name => 'Claudia', :event => 'Event2', :content => 'hi!')

visit '/list'

expand_event('Event1')
hover_page_row(@page1)
drag_page_to_event(@page1, 'Event2')

within_event(@page1.event) do
find('.event-page-count').should have_content 'no pages'
end

within_event(@page2.event) do
find('.event-page-count').should have_content '2 pages'
end
end

it 'shows when page contains image content' do
@page_with_image = Page.create!(:name => 'Joana', :content => "meet me <img src='/me.jpg'/>!")
@page_with_video = Page.create!(:name => 'Ana', :content => "meet me <iframe src='http://www.youtube.com/embed/132' />!")
Expand Down

0 comments on commit c5eb341

Please sign in to comment.