From 3df1081c60350e844769d4180c4fe027c3772e08 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Tue, 29 Sep 2015 15:51:09 -0400 Subject: [PATCH] SAAS-1088 - fix broken 'all my shows' checkbox --- .../library/events/library_showbuilder.js | 165 +++++++++--------- .../js/airtime/showbuilder/main_builder.js | 4 +- 2 files changed, 89 insertions(+), 80 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index 549f586bc..7aea7a7f7 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -102,88 +102,95 @@ var AIRTIME = (function(AIRTIME) { libEmpty.hide(); } + var sortable; + if ($("#show_builder_table").is(":visible")) { - $('#library_display tr[class*="lib-"]') - .draggable( - { - helper: function () { - - var $el = $(this), selected = mod - .getChosenItemsLength(), container, thead = $("#show_builder_table thead"), colspan = thead - .find("th").length, width = $el.width(), message; - - // dragging an element that has an unselected - // checkbox. - if (mod.isChosenItem($el) === false) { - selected++; - } - - if (selected === 1) { - message = $.i18n._("Adding 1 Item"); - } else { - message = sprintf($.i18n._("Adding %s Items"), selected); - } - - container = $('
').attr('id', - 'draggingContainer').append('') - .find("tr").append('').find("td") - .attr("colspan", colspan).width(width) - .addClass("ui-state-highlight").append( - message).end().end(); - - return container; - }, - create: function(event, ui) { - $(this).draggable("option", "cursorAt", { - left: Math.floor(this.clientWidth / 2) - }); - }, - cursor: 'move', - distance: 25, // min-distance for dragging - connectToSortable: '#show_builder_table' - }); + sortable = "#show_builder_table"; } else { - $('#library_display tr[class*="lib-"]') - .draggable( - { - helper: function () { - - var $el = $(this), selected = mod - .getChosenAudioFilesLength(), container, message, - width = $(this).width(), height = 55; - - // dragging an element that has an unselected - // checkbox. - if (mod.isChosenItem($el) === false) { - selected++; - } - - if (selected === 1) { - message = $.i18n._("Adding 1 Item"); - } else { - message = sprintf($.i18n._("Adding %s Items"), selected); - } - - container = $('
').append( - "
  • ").find("li").addClass( - "ui-state-default").append("
    ") - .find("div").addClass( - "list-item-container").append( - message).end().width(width) - .height(height).end(); - - return container; - }, - create: function(event, ui) { - $(this).draggable("option", "cursorAt", { - left: Math.floor(this.clientWidth / 2) - }); - }, - cursor: 'move', - distance: 25, // min-distance for dragging - connectToSortable: '.active-tab .spl_sortable' - }); + sortable = ".active-tab .spl_sortable"; + //$('#library_display tr[class*="lib-"]') + // .draggable( + // { + // helper: function () { + // + // var $el = $(this), selected = mod + // .getChosenAudioFilesLength(), container, message, + // width = $(this).width(), height = 55; + // + // // dragging an element that has an unselected + // // checkbox. + // if (mod.isChosenItem($el) === false) { + // selected++; + // } + // + // if (selected === 1) { + // message = $.i18n._("Adding 1 Item"); + // } else { + // message = sprintf($.i18n._("Adding %s Items"), selected); + // } + // + // container = $('
    ').append( + // "
  • ").find("li").addClass( + // "ui-state-default").append("
    ") + // .find("div").addClass( + // "list-item-container").append( + // message).end().width(width) + // .height(height).end(); + // + // return container; + // }, + // create: function(event, ui) { + // $(this).draggable("option", "cursorAt", { + // left: Math.floor(this.clientWidth / 2) + // }); + // }, + // cursor: 'move', + // distance: 25, // min-distance for dragging + // connectToSortable: '.active-tab .spl_sortable' + // }); } + + $('#library_display tr[class*="lib-"]') + .draggable( + { + helper: function () { + + var $el = $(this), selected = mod + .getChosenItemsLength(), container, thead = $("#show_builder_table thead"), colspan = thead + .find("th").length, width = $el.width(), message; + + // dragging an element that has an unselected + // checkbox. + if (mod.isChosenItem($el) === false) { + selected++; + } + + if (selected === 1) { + message = $.i18n._("Adding 1 Item"); + } else { + message = sprintf($.i18n._("Adding %s Items"), selected); + } + + container = $('
    ').attr('id', + 'draggingContainer').append('') + .find("tr").append('').find("td") + .attr("colspan", colspan).width(width) + .addClass("ui-state-highlight").append( + message).end().end(); + + return container; + }, + create: function(event, ui) { + $(this).draggable("option", "cursorAt", { + top: 20, + left: Math.floor($(this).outerWidth() / 2) + }); + }, + tolerance: 'pointer', + cursor: 'move', + distance: 25, // min-distance for dragging + connectToSortable: sortable + }); }; mod.dblClickAdd = function(data, type) { diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js index e114d677e..c03cf139f 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js @@ -93,6 +93,8 @@ AIRTIME = (function(AIRTIME) { check; check = validateTimeRange(); + + console.log(check); if (check.isValid) { //reset timestamp value since input values could have changed. @@ -102,7 +104,7 @@ AIRTIME = (function(AIRTIME) { fn.start = check.start; fn.end = check.end; - op = $("div.sb-advanced-options"); + op = $("div.sb-options-form"); if (op.is(":visible")) { if (fn.ops === undefined) {