Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-6097, CC-6091, CC-6080, CC-6066 - css fixes and more work on add/remove content screen

Browse source
This commit is contained in:
Duncan Sommerville 2015-08-25 17:09:05 -04:00
parent 371a26ff97
commit 84baef1996
17 changed files with 169 additions and 318 deletions
Download patch file Download diff file Expand all files Collapse all files

12
airtime_mvc/public/js/airtime/showbuilder/builder.js
View file

@ -198,7 +198,6 @@ var AIRTIME = (function(AIRTIME){
};
mod.checkToolBarIcons = function() {
//library may not be on the page.
if (AIRTIME.library !== undefined) {
AIRTIME.library.checkAddButton();
@ -332,7 +331,6 @@ var AIRTIME = (function(AIRTIME){
};
mod.fnMove = function(aSelect, aAfter) {
mod.disableUI();
$.post(baseUrl+"showbuilder/schedule-move",
@ -757,6 +755,7 @@ var AIRTIME = (function(AIRTIME){
tr.addClass(SB_SELECTED_CLASS);
tr.find("input[type='checkbox']").prop("checked", true);
});
mod.checkToolBarIcons();
}
},
@ -874,11 +873,12 @@ var AIRTIME = (function(AIRTIME){
$previouslySelected = undefined;
tr.removeClass(SB_SELECTED_CLASS);
tr.find(".sb-checkbox > input").prop('checked', false);
mod.checkToolBarIcons();
} else {
tr.addClass(SB_SELECTED_CLASS);
tr.find(".sb-checkbox > input").prop('checked', true);
mod.checkToolBarIcons();
}
mod.checkToolBarIcons();
selectedRows = $("." + SB_SELECTED_CLASS);
});
@ -889,14 +889,14 @@ var AIRTIME = (function(AIRTIME){
$previouslySelected = undefined;
tr.removeClass(SB_SELECTED_CLASS);
tr.find(".sb-checkbox > input").prop('checked', false);
mod.checkToolBarIcons();
} else if (!(e.shiftKey || e.ctrlKey)) {
mod.selectNone();
tr.addClass(SB_SELECTED_CLASS);
tr.find(".sb-checkbox > input").prop('checked', true);
$previouslySelected = tr;
mod.checkToolBarIcons();
}
mod.checkToolBarIcons();
selectedRows = $("." + SB_SELECTED_CLASS);
});

17
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
View file

@ -118,10 +118,16 @@ AIRTIME = (function(AIRTIME) {
function highlightMediaTypeSelector()
{
$(".media_type_selector:first").addClass("highlight");
var selected;
if (location.hash === "") {
$("a[href$='#files']").parent().addClass("selected");
selected = $("a[href$='#tracks']");
} else {
selected = $("a[href$='"+location.hash+"']");
}
$("a[href$='"+location.hash+"']").parent().addClass("selected");
selected.parent().addClass("selected");
$("#library_filter").text(selected.text());
// Slightly hacky way of triggering the click event when it's outside of the anchor text
$(".media_type_selector").on("click", function() {
@ -130,7 +136,7 @@ AIRTIME = (function(AIRTIME) {
});
$(window).on('hashchange', function() {
var selected = $("a[href$='"+location.hash+"']");
// If we click Dashboard from one of the media views, do nothing
if (!location.hash) {
return;
@ -139,8 +145,11 @@ AIRTIME = (function(AIRTIME) {
$(".media_type_selector").each(function () {
$(this).removeClass("selected");
});
$("a[href$='"+location.hash+"']").parent().addClass("selected");
selected.parent().addClass("selected");
oTable.fnDraw();
$("#library_filter").text(selected.text());
// Highlight the dashboard link
$(".media_type_selector:first").addClass("highlight");
});
}