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

Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x

This commit is contained in:
Albert Santoni 2013-10-11 19:30:01 -04:00
parent a6712cdc01 73e5fa8a90
commit 9ea686880e
9 changed files with 714 additions and 669 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/forms/LiveStreamingPreferences.php
View File

@ -179,7 +179,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
socket_bind($sock, 0, $dj_harbor_input_port); socket_bind($sock, 0, $dj_harbor_input_port);
} catch (Exception $e) { } catch (Exception $e) {
$element = $this->getElement("dj_harbor_input_port"); $element = $this->getElement("dj_harbor_input_port");
$element->addError(sprintf(_("Port %s is not available"). $dj_harbor_input_port)); $element->addError(sprintf(_("Port %s is not available"), $dj_harbor_input_port));
$isValid = false; $isValid = false;
} }
socket_close($sock); socket_close($sock);

8
airtime_mvc/application/models/Show.php
View File

@ -1082,6 +1082,14 @@ SQL;
$event["rebroadcast"] = intval($show["rebroadcast"]); $event["rebroadcast"] = intval($show["rebroadcast"]);
$event["soundcloud_id"] = is_null($show["soundcloud_id"]) $event["soundcloud_id"] = is_null($show["soundcloud_id"])
? -1 : $show["soundcloud_id"]; ? -1 : $show["soundcloud_id"];
//for putting the now playing icon on the show.
if ($now > $startsDT && $now < $endsDT) {
$event["nowPlaying"] = true;
}
else {
$event["nowPlaying"] = false;
}
//event colouring //event colouring
if ($show["color"] != "") { if ($show["color"] != "") {

31
airtime_mvc/application/services/CalendarService.php
View File

@ -79,22 +79,27 @@ class Application_Service_CalendarService
"url" => $baseUrl."schedule/show-content-dialog"); "url" => $baseUrl."schedule/show-content-dialog");
} }
} else { } else {
//Show content can be modified from the calendar if: // Show content can be modified from the calendar if:
// the show has not started,
// the user is admin or hosting the show, // the user is admin or hosting the show,
// the show is not recorded // the show is not recorded
if ($now < $end && ($isAdminOrPM || $isHostOfShow) &&
!$this->ccShowInstance->isRecorded() ) {
$menu["schedule"] = array(
"name"=> _("Add / Remove Content"),
"icon" => "add-remove-content",
"url" => $baseUrl."showbuilder/builder-dialog/");
}
if ($now < $start && ($isAdminOrPM || $isHostOfShow) && if ($now < $start && ($isAdminOrPM || $isHostOfShow) &&
!$this->ccShowInstance->isRecorded() ) { !$this->ccShowInstance->isRecorded() ) {
$menu["schedule"] = array( $menu["clear"] = array(
"name"=> _("Add / Remove Content"), "name"=> _("Remove All Content"),
"icon" => "add-remove-content", "icon" => "remove-all-content",
"url" => $baseUrl."showbuilder/builder-dialog/"); "url" => $baseUrl."schedule/clear-show");
$menu["clear"] = array(
"name"=> _("Remove All Content"),
"icon" => "remove-all-content",
"url" => $baseUrl."schedule/clear-show");
} }
//"Show Content" should be a menu item at all times except when //"Show Content" should be a menu item at all times except when

50
airtime_mvc/application/services/HistoryService.php
View File

@ -575,26 +575,38 @@ class Application_Service_HistoryService
$instanceEnd = $showInstance->getDbEnds(null); $instanceEnd = $showInstance->getDbEnds(null);
$itemEnd = $item->getDbEnds(null); $itemEnd = $item->getDbEnds(null);
$recordStart = $item->getDbStarts(null);
$recordEnd = ($instanceEnd < $itemEnd) ? $instanceEnd : $itemEnd; $recordEnd = ($instanceEnd < $itemEnd) ? $instanceEnd : $itemEnd;
$history = new CcPlayoutHistory(); //first check if this is a duplicate
$history->setDbFileId($fileId); // (caused by restarting liquidsoap)
$history->setDbStarts($item->getDbStarts(null));
$history->setDbEnds($recordEnd); $prevRecord = CcPlayoutHistoryQuery::create()
$history->setDbInstanceId($item->getDbInstanceId()); ->filterByDbStarts($recordStart)
->filterByDbEnds($recordEnd)
foreach ($metadata as $key => $val) { ->filterByDbFileId($fileId)
$meta = new CcPlayoutHistoryMetaData(); ->findOne($this->con);
$meta->setDbKey($key);
$meta->setDbValue($val); if (empty($prevRecord)) {
$history->addCcPlayoutHistoryMetaData($meta); $history = new CcPlayoutHistory();
} $history->setDbFileId($fileId);
$history->setDbStarts($recordStart);
$history->save($this->con); $history->setDbEnds($recordEnd);
} $history->setDbInstanceId($item->getDbInstanceId());
$this->con->commit(); foreach ($metadata as $key => $val) {
$meta = new CcPlayoutHistoryMetaData();
$meta->setDbKey($key);
$meta->setDbValue($val);
$history->addCcPlayoutHistoryMetaData($meta);
}
$history->save($this->con);
$this->con->commit();
}
}
} }
catch (Exception $e) { catch (Exception $e) {
$this->con->rollback(); $this->con->rollback();

249
airtime_mvc/public/js/airtime/schedule/add-show.js
View File

@ -4,6 +4,84 @@
* *
*/ */
function openAddShowForm() {
if($("#add-show-form").length == 1) {
if( ($("#add-show-form").css('display')=='none')) {
$("#add-show-form").show();
var windowWidth = $(window).width();
// margin on showform are 16 px on each side
var calendarWidth = 100-(($("#schedule-add-show").width() + (16 * 4))/windowWidth*100);
var widthPercent = parseInt(calendarWidth)+"%";
$("#schedule_calendar").css("width", widthPercent);
// 200 px for top dashboard and 50 for padding on main content
// this calculation was copied from schedule.js line 326
var mainHeight = document.documentElement.clientHeight - 200 - 50;
$('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight);
}
$("#schedule-show-what").show(0, function(){
$add_show_name = $("#add_show_name");
$add_show_name.focus();
$add_show_name.select();
});
}
}
function makeAddShowButton(){
$('.fc-header-left')
.append('<span class="fc-header-space"></span>')
.append('<span class="fc-button"><a href="#" class="add-button"><span class="add-icon"></span>'+$.i18n._("Show")+'</a></span>')
.find('span.fc-button:last > a')
.click(function(){
openAddShowForm();
removeAddShowButton();
});
}
function removeAddShowButton(){
var aTag = $('.fc-header-left')
.find("span.fc-button:last > a");
var span = aTag.parent();
span.prev().remove();
span.remove();
}
//$el is DOM element #add-show-form
//form is the new form contents to append to $el
function redrawAddShowForm($el, form) {
//need to clean up the color picker.
$el.find("#schedule-show-style input").each(function(i, el){
var $input = $(this),
colId = $input.data("colorpickerId");
$("#"+colId).remove();
$input.removeData();
});
$el.empty().append(form);
setAddShowEvents($el);
}
function closeAddShowForm(event) {
event.stopPropagation();
event.preventDefault();
var $el = $("#add-show-form");
$el.hide();
windowResize();
$.get(baseUrl+"Schedule/get-form", {format:"json"}, function(json) {
redrawAddShowForm($el, json.form);
});
makeAddShowButton();
}
//dateText mm-dd-yy //dateText mm-dd-yy
function startDpSelect(dateText, inst) { function startDpSelect(dateText, inst) {
var time, date; var time, date;
@ -73,16 +151,14 @@ function findHosts(request, callback) {
} }
function beginEditShow(data){ function beginEditShow(data){
if(data.show_error == true){
if (data.show_error == true){
alertShowErrorAndReload(); alertShowErrorAndReload();
return false; return false;
} }
$("#add-show-form")
.empty() redrawAddShowForm($("#add-show-form"), data.newForm);
.append(data.newForm);
removeAddShowButton(); removeAddShowButton();
setAddShowEvents();
openAddShowForm(); openAddShowForm();
} }
@ -130,9 +206,9 @@ function getContrastYIQ(hexcolor){
} }
function setAddShowEvents() { function setAddShowEvents(form) {
var form = $("#add-show-form"); //var form = $("#add-show-form");
form.find("h3").click(function(){ form.find("h3").click(function(){
$(this).next().toggle(); $(this).next().toggle();
@ -499,108 +575,75 @@ function setAddShowEvents() {
} }
}); });
form.find("#add-show-close").click(closeAddShowForm);
form.find("#add-show-close") form.find(".add-show-submit").click(function(event) {
.click(function(event){ event.preventDefault();
event.stopPropagation();
event.preventDefault(); var addShowButton = $(this);
$('#schedule-add-show').block({
message: null,
applyPlatformOpacityRules: false
});
$("#add-show-form").hide(); //when editing a show, the record option is disabled
windowResize(); //we have to enable it to get the correct value when
//we call serializeArray()
if (form.find("#add_show_record").attr("disabled", true)) {
form.find("#add_show_record").attr("disabled", false);
}
$.get(baseUrl+"Schedule/get-form", {format:"json"}, function(json){ var data = $("form").serializeArray();
$("#add-show-form")
.empty()
.append(json.form);
setAddShowEvents(); var hosts = $('#add_show_hosts-element input').map(function() {
}); if($(this).attr("checked")) {
makeAddShowButton(); return $(this).val();
}); }
}).get();
form.find(".add-show-submit") var days = $('#add_show_day_check-element input').map(function() {
.click(function(event){ if($(this).attr("checked")) {
var addShowButton = $(this); return $(this).val();
/* }
if (!addShowButton.hasClass("disabled")){ }).get();
addShowButton.addClass("disabled");
var start_date = $("#add_show_start_date").val();
var end_date = $("#add_show_end_date").val();
var action = baseUrl+"Schedule/"+String(addShowButton.attr("data-action"));
$.post(action, {format: "json", data: data, hosts: hosts, days: days}, function(json){
$('#schedule-add-show').unblock();
var $addShowForm = $("#add-show-form");
if (json.form) {
redrawAddShowForm($addShowForm, json.form);
$("#add_show_end_date").val(end_date);
$("#add_show_start_date").val(start_date);
showErrorSections();
}
else if (json.edit) {
$("#schedule_calendar").removeAttr("style")
.fullCalendar('render');
$addShowForm.hide();
$.get(baseUrl+"Schedule/get-form", {format:"json"}, function(json){
redrawAddShowForm($addShowForm, json.form);
});
makeAddShowButton();
} }
else { else {
return;
redrawAddShowForm($addShowForm, json.newForm);
scheduleRefetchEvents(json);
} }
*/ });
});
event.preventDefault();
//when editing a show, the record option is disabled
//we have to enable it to get the correct value when
//we call serializeArray()
if (form.find("#add_show_record").attr("disabled", true)) {
form.find("#add_show_record").attr("disabled", false);
}
var data = $("form").serializeArray();
var hosts = $('#add_show_hosts-element input').map(function() {
if($(this).attr("checked")) {
return $(this).val();
}
}).get();
var days = $('#add_show_day_check-element input').map(function() {
if($(this).attr("checked")) {
return $(this).val();
}
}).get();
var start_date = $("#add_show_start_date").val();
var end_date = $("#add_show_end_date").val();
$('#schedule-add-show').block({
message: null,
applyPlatformOpacityRules: false
});
var action = baseUrl+"Schedule/"+String(addShowButton.attr("data-action"));
$.post(action, {format: "json", data: data, hosts: hosts, days: days}, function(json){
//addShowButton.removeClass("disabled");
$('#schedule-add-show').unblock();
if(json.form) {
$("#add-show-form")
.empty()
.append(json.form);
setAddShowEvents();
$("#add_show_end_date").val(end_date);
$("#add_show_start_date").val(start_date);
showErrorSections();
}else if(json.edit){
$("#schedule_calendar").removeAttr("style")
.fullCalendar('render');
$("#add-show-form").hide();
$.get(baseUrl+"Schedule/get-form", {format:"json"}, function(json){
$("#add-show-form")
.empty()
.append(json.form);
setAddShowEvents();
});
makeAddShowButton();
}
else {
$("#add-show-form")
.empty()
.append(json.newForm);
setAddShowEvents();
scheduleRefetchEvents(json);
}
});
});
var regDate = new RegExp(/^[0-9]{4}-[0-1][0-9]-[0-3][0-9]$/); var regDate = new RegExp(/^[0-9]{4}-[0-1][0-9]-[0-3][0-9]$/);
var regTime = new RegExp(/^[0-2][0-9]:[0-5][0-9]$/); var regTime = new RegExp(/^[0-2][0-9]:[0-5][0-9]$/);
@ -740,7 +783,7 @@ function showErrorSections() {
} }
$(document).ready(function() { $(document).ready(function() {
setAddShowEvents(); setAddShowEvents($("#add-show-form"));
}); });
//Alert the error and reload the page //Alert the error and reload the page

58
airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
View File

@ -19,49 +19,6 @@ function scheduleRefetchEvents(json) {
$("#schedule_calendar").fullCalendar( 'refetchEvents' ); $("#schedule_calendar").fullCalendar( 'refetchEvents' );
} }
function openAddShowForm() {
if($("#add-show-form").length == 1) {
if( ($("#add-show-form").css('display')=='none')) {
$("#add-show-form").show();
var windowWidth = $(window).width();
// margin on showform are 16 px on each side
var calendarWidth = 100-(($("#schedule-add-show").width() + (16 * 4))/windowWidth*100);
var widthPercent = parseInt(calendarWidth)+"%";
$("#schedule_calendar").css("width", widthPercent);
// 200 px for top dashboard and 50 for padding on main content
// this calculation was copied from schedule.js line 326
var mainHeight = document.documentElement.clientHeight - 200 - 50;
$('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight);
}
$("#schedule-show-what").show(0, function(){
$add_show_name = $("#add_show_name");
$add_show_name.focus();
$add_show_name.select();
});
}
}
function makeAddShowButton(){
$('.fc-header-left')
.append('<span class="fc-header-space"></span>')
.append('<span class="fc-button"><a href="#" class="add-button"><span class="add-icon"></span>'+$.i18n._("Show")+'</a></span>')
.find('span.fc-button:last > a')
.click(function(){
openAddShowForm();
removeAddShowButton();
});
}
function removeAddShowButton(){
var aTag = $('.fc-header-left')
.find("span.fc-button:last > a");
var span = aTag.parent();
span.prev().remove();
span.remove();
}
function makeTimeStamp(date){ function makeTimeStamp(date){
var sy, sm, sd, h, m, s, timestamp; var sy, sm, sd, h, m, s, timestamp;
sy = date.getFullYear(); sy = date.getFullYear();
@ -331,6 +288,21 @@ function eventRender(event, element, view) {
$(element).find(".fc-event-title").after('<span class="small-icon rebroadcast"></span>'); $(element).find(".fc-event-title").after('<span class="small-icon rebroadcast"></span>');
} }
} }
//now playing icon.
var span = '<span class="small-icon now-playing"></span>';
if (event.nowPlaying === true) {
if (view_name === 'agendaDay' || view_name === 'agendaWeek') {
$(element).find(".fc-event-time").before(span);
}
else if (view_name === 'month') {
$(element).find(".fc-event-title").after(span);
}
}
} }
function eventAfterRender( event, element, view ) { function eventAfterRender( event, element, view ) {

9
airtime_mvc/public/js/airtime/schedule/schedule.js
View File

@ -13,8 +13,13 @@ var AIRTIME = (function(AIRTIME){
var serverTimezoneOffset = 0; var serverTimezoneOffset = 0;
function closeDialogCalendar(event, ui) { function closeDialogCalendar(event, ui) {
//$("#schedule_calendar").fullCalendar( 'refetchEvents' );
$(this).remove(); $el = $(this);
$el.dialog('destroy');
$el.remove();
//need to refetch the events to update scheduled status.
$("#schedule_calendar").fullCalendar( 'refetchEvents' );
} }
function checkShowLength(json) { function checkShowLength(json) {

970
airtime_mvc/public/js/colorpicker/js/colorpicker.js
View File

@ -1,485 +1,485 @@
/** /**
* *
* Color picker * Color picker
* Author: Stefan Petre www.eyecon.ro * Author: Stefan Petre www.eyecon.ro
* *
* Dual licensed under the MIT and GPL licenses * Dual licensed under the MIT and GPL licenses
* *
*/ */
(function ($) { (function ($) {
var ColorPicker = function () { var ColorPicker = function () {
var var
ids = {}, ids = {},
inAction, inAction,
charMin = 65, charMin = 65,
visible, visible,
tpl = '<div class="colorpicker"><div class="colorpicker_color"><div><div></div></div></div><div class="colorpicker_hue"><div></div></div><div class="colorpicker_new_color"></div><div class="colorpicker_current_color"></div><div class="colorpicker_hex"><input type="text" maxlength="6" size="6" /></div><div class="colorpicker_rgb_r colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_g colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_h colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_s colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_submit"></div></div>', tpl = '<div class="colorpicker"><div class="colorpicker_color"><div><div></div></div></div><div class="colorpicker_hue"><div></div></div><div class="colorpicker_new_color"></div><div class="colorpicker_current_color"></div><div class="colorpicker_hex"><input type="text" maxlength="6" size="6" /></div><div class="colorpicker_rgb_r colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_g colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_h colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_s colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_submit"></div></div>',
defaults = { defaults = {
eventName: 'click', eventName: 'click',
onShow: function () {}, onShow: function () {},
onBeforeShow: function(){}, onBeforeShow: function(){},
onHide: function () {}, onHide: function () {},
onChange: function () {}, onChange: function () {},
onSubmit: function () {}, onSubmit: function () {},
color: 'ff0000', color: 'ff0000',
livePreview: true, livePreview: true,
flat: false flat: false
}, },
fillRGBFields = function (hsb, cal) { fillRGBFields = function (hsb, cal) {
var rgb = HSBToRGB(hsb); var rgb = HSBToRGB(hsb);
$(cal).data('colorpicker').fields $(cal).data('colorpicker').fields
.eq(1).val(rgb.r).end() .eq(1).val(rgb.r).end()
.eq(2).val(rgb.g).end() .eq(2).val(rgb.g).end()
.eq(3).val(rgb.b).end(); .eq(3).val(rgb.b).end();
}, },
fillHSBFields = function (hsb, cal) { fillHSBFields = function (hsb, cal) {
$(cal).data('colorpicker').fields $(cal).data('colorpicker').fields
.eq(4).val(hsb.h).end() .eq(4).val(hsb.h).end()
.eq(5).val(hsb.s).end() .eq(5).val(hsb.s).end()
.eq(6).val(hsb.b).end(); .eq(6).val(hsb.b).end();
}, },
fillHexFields = function (hsb, cal) { fillHexFields = function (hsb, cal) {
$(cal).data('colorpicker').fields $(cal).data('colorpicker').fields
.eq(0).val(HSBToHex(hsb)).end(); .eq(0).val(HSBToHex(hsb)).end();
}, },
setSelector = function (hsb, cal) { setSelector = function (hsb, cal) {
$(cal).data('colorpicker').selector.css('backgroundColor', '#' + HSBToHex({h: hsb.h, s: 100, b: 100})); $(cal).data('colorpicker').selector.css('backgroundColor', '#' + HSBToHex({h: hsb.h, s: 100, b: 100}));
$(cal).data('colorpicker').selectorIndic.css({ $(cal).data('colorpicker').selectorIndic.css({
left: parseInt(150 * hsb.s/100, 10), left: parseInt(150 * hsb.s/100, 10),
top: parseInt(150 * (100-hsb.b)/100, 10) top: parseInt(150 * (100-hsb.b)/100, 10)
}); });
}, },
setHue = function (hsb, cal) { setHue = function (hsb, cal) {
$(cal).data('colorpicker').hue.css('top', parseInt(150 - 150 * hsb.h/360, 10)); $(cal).data('colorpicker').hue.css('top', parseInt(150 - 150 * hsb.h/360, 10));
}, },
setCurrentColor = function (hsb, cal) { setCurrentColor = function (hsb, cal) {
$(cal).data('colorpicker').currentColor.css('backgroundColor', '#' + HSBToHex(hsb)); $(cal).data('colorpicker').currentColor.css('backgroundColor', '#' + HSBToHex(hsb));
}, },
setNewColor = function (hsb, cal) { setNewColor = function (hsb, cal) {
$(cal).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(hsb)); $(cal).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(hsb));
}, },
keyDown = function (ev) { keyDown = function (ev) {
var pressedKey = ev.charCode || ev.keyCode || -1; var pressedKey = ev.charCode || ev.keyCode || -1;
if ((pressedKey > charMin && pressedKey <= 90) || pressedKey == 32) { if ((pressedKey > charMin && pressedKey <= 90) || pressedKey == 32) {
return false; return false;
} }
var cal = $(this).parent().parent(); var cal = $(this).parent().parent();
if (cal.data('colorpicker').livePreview === true) { if (cal.data('colorpicker').livePreview === true) {
change.apply(this); change.apply(this);
} }
}, },
change = function (ev) { change = function (ev) {
var cal = $(this).parent().parent(), col; var cal = $(this).parent().parent(), col;
if (this.parentNode.className.indexOf('_hex') > 0) { if (this.parentNode.className.indexOf('_hex') > 0) {
cal.data('colorpicker').color = col = HexToHSB(fixHex(this.value)); cal.data('colorpicker').color = col = HexToHSB(fixHex(this.value));
} else if (this.parentNode.className.indexOf('_hsb') > 0) { } else if (this.parentNode.className.indexOf('_hsb') > 0) {
cal.data('colorpicker').color = col = fixHSB({ cal.data('colorpicker').color = col = fixHSB({
h: parseInt(cal.data('colorpicker').fields.eq(4).val(), 10), h: parseInt(cal.data('colorpicker').fields.eq(4).val(), 10),
s: parseInt(cal.data('colorpicker').fields.eq(5).val(), 10), s: parseInt(cal.data('colorpicker').fields.eq(5).val(), 10),
b: parseInt(cal.data('colorpicker').fields.eq(6).val(), 10) b: parseInt(cal.data('colorpicker').fields.eq(6).val(), 10)
}); });
} else { } else {
cal.data('colorpicker').color = col = RGBToHSB(fixRGB({ cal.data('colorpicker').color = col = RGBToHSB(fixRGB({
r: parseInt(cal.data('colorpicker').fields.eq(1).val(), 10), r: parseInt(cal.data('colorpicker').fields.eq(1).val(), 10),
g: parseInt(cal.data('colorpicker').fields.eq(2).val(), 10), g: parseInt(cal.data('colorpicker').fields.eq(2).val(), 10),
b: parseInt(cal.data('colorpicker').fields.eq(3).val(), 10) b: parseInt(cal.data('colorpicker').fields.eq(3).val(), 10)
})); }));
} }
if (ev) { if (ev) {
fillRGBFields(col, cal.get(0)); fillRGBFields(col, cal.get(0));
fillHexFields(col, cal.get(0)); fillHexFields(col, cal.get(0));
fillHSBFields(col, cal.get(0)); fillHSBFields(col, cal.get(0));
} }
setSelector(col, cal.get(0)); setSelector(col, cal.get(0));
setHue(col, cal.get(0)); setHue(col, cal.get(0));
setNewColor(col, cal.get(0)); setNewColor(col, cal.get(0));
cal.data('colorpicker').onChange.apply(cal, [col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el]); cal.data('colorpicker').onChange.apply(cal, [col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el]);
}, },
blur = function (ev) { blur = function (ev) {
var cal = $(this).parent().parent(); var cal = $(this).parent().parent();
cal.data('colorpicker').fields.parent().removeClass('colorpicker_focus'); cal.data('colorpicker').fields.parent().removeClass('colorpicker_focus');
}, },
focus = function () { focus = function () {
charMin = this.parentNode.className.indexOf('_hex') > 0 ? 70 : 65; charMin = this.parentNode.className.indexOf('_hex') > 0 ? 70 : 65;
$(this).parent().parent().data('colorpicker').fields.parent().removeClass('colorpicker_focus'); $(this).parent().parent().data('colorpicker').fields.parent().removeClass('colorpicker_focus');
$(this).parent().addClass('colorpicker_focus'); $(this).parent().addClass('colorpicker_focus');
}, },
downIncrement = function (ev) { downIncrement = function (ev) {
var field = $(this).parent().find('input').focus(); var field = $(this).parent().find('input').focus();
var current = { var current = {
el: $(this).parent().addClass('colorpicker_slider'), el: $(this).parent().addClass('colorpicker_slider'),
max: this.parentNode.className.indexOf('_hsb_h') > 0 ? 360 : (this.parentNode.className.indexOf('_hsb') > 0 ? 100 : 255), max: this.parentNode.className.indexOf('_hsb_h') > 0 ? 360 : (this.parentNode.className.indexOf('_hsb') > 0 ? 100 : 255),
y: ev.pageY, y: ev.pageY,
field: field, field: field,
val: parseInt(field.val(), 10), val: parseInt(field.val(), 10),
preview: $(this).parent().parent().data('colorpicker').livePreview preview: $(this).parent().parent().data('colorpicker').livePreview
}; };
$(document).bind('mouseup', current, upIncrement); $(document).bind('mouseup', current, upIncrement);
$(document).bind('mousemove', current, moveIncrement); $(document).bind('mousemove', current, moveIncrement);
}, },
moveIncrement = function (ev) { moveIncrement = function (ev) {
ev.data.field.val(Math.max(0, Math.min(ev.data.max, parseInt(ev.data.val + ev.pageY - ev.data.y, 10)))); ev.data.field.val(Math.max(0, Math.min(ev.data.max, parseInt(ev.data.val + ev.pageY - ev.data.y, 10))));
if (ev.data.preview) { if (ev.data.preview) {
change.apply(ev.data.field.get(0), [true]); change.apply(ev.data.field.get(0), [true]);
} }
return false; return false;
}, },
upIncrement = function (ev) { upIncrement = function (ev) {
change.apply(ev.data.field.get(0), [true]); change.apply(ev.data.field.get(0), [true]);
ev.data.el.removeClass('colorpicker_slider').find('input').focus(); ev.data.el.removeClass('colorpicker_slider').find('input').focus();
$(document).unbind('mouseup', upIncrement); $(document).unbind('mouseup', upIncrement);
$(document).unbind('mousemove', moveIncrement); $(document).unbind('mousemove', moveIncrement);
return false; return false;
}, },
downHue = function (ev) { downHue = function (ev) {
var current = { var current = {
cal: $(this).parent(), cal: $(this).parent(),
y: $(this).offset().top y: $(this).offset().top
}; };
current.preview = current.cal.data('colorpicker').livePreview; current.preview = current.cal.data('colorpicker').livePreview;
$(document).bind('mouseup', current, upHue); $(document).bind('mouseup', current, upHue);
$(document).bind('mousemove', current, moveHue); $(document).bind('mousemove', current, moveHue);
}, },
moveHue = function (ev) { moveHue = function (ev) {
change.apply( change.apply(
ev.data.cal.data('colorpicker') ev.data.cal.data('colorpicker')
.fields .fields
.eq(4) .eq(4)
.val(parseInt(360*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.y))))/150, 10)) .val(parseInt(360*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.y))))/150, 10))
.get(0), .get(0),
[ev.data.preview] [ev.data.preview]
); );
return false; return false;
}, },
upHue = function (ev) { upHue = function (ev) {
fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
$(document).unbind('mouseup', upHue); $(document).unbind('mouseup', upHue);
$(document).unbind('mousemove', moveHue); $(document).unbind('mousemove', moveHue);
return false; return false;
}, },
downSelector = function (ev) { downSelector = function (ev) {
var current = { var current = {
cal: $(this).parent(), cal: $(this).parent(),
pos: $(this).offset() pos: $(this).offset()
}; };
current.preview = current.cal.data('colorpicker').livePreview; current.preview = current.cal.data('colorpicker').livePreview;
$(document).bind('mouseup', current, upSelector); $(document).bind('mouseup', current, upSelector);
$(document).bind('mousemove', current, moveSelector); $(document).bind('mousemove', current, moveSelector);
}, },
moveSelector = function (ev) { moveSelector = function (ev) {
change.apply( change.apply(
ev.data.cal.data('colorpicker') ev.data.cal.data('colorpicker')
.fields .fields
.eq(6) .eq(6)
.val(parseInt(100*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.pos.top))))/150, 10)) .val(parseInt(100*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.pos.top))))/150, 10))
.end() .end()
.eq(5) .eq(5)
.val(parseInt(100*(Math.max(0,Math.min(150,(ev.pageX - ev.data.pos.left))))/150, 10)) .val(parseInt(100*(Math.max(0,Math.min(150,(ev.pageX - ev.data.pos.left))))/150, 10))
.get(0), .get(0),
[ev.data.preview] [ev.data.preview]
); );
return false; return false;
}, },
upSelector = function (ev) { upSelector = function (ev) {
fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
$(document).unbind('mouseup', upSelector); $(document).unbind('mouseup', upSelector);
$(document).unbind('mousemove', moveSelector); $(document).unbind('mousemove', moveSelector);
return false; return false;
}, },
enterSubmit = function (ev) { enterSubmit = function (ev) {
$(this).addClass('colorpicker_focus'); $(this).addClass('colorpicker_focus');
}, },
leaveSubmit = function (ev) { leaveSubmit = function (ev) {
$(this).removeClass('colorpicker_focus'); $(this).removeClass('colorpicker_focus');
}, },
clickSubmit = function (ev) { clickSubmit = function (ev) {
var cal = $(this).parent(); var cal = $(this).parent();
var col = cal.data('colorpicker').color; var col = cal.data('colorpicker').color;
cal.data('colorpicker').origColor = col; cal.data('colorpicker').origColor = col;
setCurrentColor(col, cal.get(0)); setCurrentColor(col, cal.get(0));
cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el); cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el);
}, },
show = function (ev) { show = function (ev) {
var cal = $('#' + $(this).data('colorpickerId')); var cal = $('#' + $(this).data('colorpickerId'));
cal.data('colorpicker').onBeforeShow.apply(this, [cal.get(0)]); cal.data('colorpicker').onBeforeShow.apply(this, [cal.get(0)]);
var pos = $(this).offset(); var pos = $(this).offset();
var viewPort = getViewport(); var viewPort = getViewport();
var top = pos.top + this.offsetHeight; var top = pos.top + this.offsetHeight;
var left = pos.left; var left = pos.left;
if (top + 176 > viewPort.t + viewPort.h) { if (top + 176 > viewPort.t + viewPort.h) {
top -= this.offsetHeight + 176; top -= this.offsetHeight + 176;
} }
if (left + 356 > viewPort.l + viewPort.w) { if (left + 356 > viewPort.l + viewPort.w) {
left -= 356; left -= 356;
} }
cal.css({left: left + 'px', top: top + 'px'}); cal.css({left: left + 'px', top: top + 'px'});
if (cal.data('colorpicker').onShow.apply(this, [cal.get(0)]) != false) { if (cal.data('colorpicker').onShow.apply(this, [cal.get(0)]) != false) {
cal.show(); cal.show();
} }
$(document).bind('mousedown', {cal: cal}, hide); $(document).bind('mousedown', {cal: cal}, hide);
return false; return false;
}, },
hide = function (ev) { hide = function (ev) {
if (!isChildOf(ev.data.cal.get(0), ev.target, ev.data.cal.get(0))) { if (!isChildOf(ev.data.cal.get(0), ev.target, ev.data.cal.get(0))) {
if (ev.data.cal.data('colorpicker').onHide.apply(this, [ev.data.cal.get(0)]) != false) { if (ev.data.cal.data('colorpicker').onHide.apply(this, [ev.data.cal.get(0)]) != false) {
ev.data.cal.hide(); ev.data.cal.hide();
} }
$(document).unbind('mousedown', hide); $(document).unbind('mousedown', hide);
} }
}, },
isChildOf = function(parentEl, el, container) { isChildOf = function(parentEl, el, container) {
if (parentEl == el) { if (parentEl == el) {
return true; return true;
} }
if (parentEl.contains) { if (parentEl.contains) {
return parentEl.contains(el); return parentEl.contains(el);
} }
if ( parentEl.compareDocumentPosition ) { if ( parentEl.compareDocumentPosition ) {
return !!(parentEl.compareDocumentPosition(el) & 16); return !!(parentEl.compareDocumentPosition(el) & 16);
} }
var prEl = el.parentNode; var prEl = el.parentNode;
while(prEl && prEl != container) { while(prEl && prEl != container) {
if (prEl == parentEl) if (prEl == parentEl)
return true; return true;
prEl = prEl.parentNode; prEl = prEl.parentNode;
} }
return false; return false;
}, },
getViewport = function () { getViewport = function () {
var m = document.compatMode == 'CSS1Compat'; var m = document.compatMode == 'CSS1Compat';
return { return {
l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft), l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft),
t : window.pageYOffset || (m ? document.documentElement.scrollTop : document.body.scrollTop), t : window.pageYOffset || (m ? document.documentElement.scrollTop : document.body.scrollTop),
w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth), w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth),
h : window.innerHeight || (m ? document.documentElement.clientHeight : document.body.clientHeight) h : window.innerHeight || (m ? document.documentElement.clientHeight : document.body.clientHeight)
}; };
}, },
fixHSB = function (hsb) { fixHSB = function (hsb) {
return { return {
h: Math.min(360, Math.max(0, hsb.h)), h: Math.min(360, Math.max(0, hsb.h)),
s: Math.min(100, Math.max(0, hsb.s)), s: Math.min(100, Math.max(0, hsb.s)),
b: Math.min(100, Math.max(0, hsb.b)) b: Math.min(100, Math.max(0, hsb.b))
}; };
}, },
fixRGB = function (rgb) { fixRGB = function (rgb) {
return { return {
r: Math.min(255, Math.max(0, rgb.r)), r: Math.min(255, Math.max(0, rgb.r)),
g: Math.min(255, Math.max(0, rgb.g)), g: Math.min(255, Math.max(0, rgb.g)),
b: Math.min(255, Math.max(0, rgb.b)) b: Math.min(255, Math.max(0, rgb.b))
}; };
}, },
fixHex = function (hex) { fixHex = function (hex) {
var len = 6 - hex.length; var len = 6 - hex.length;
if (len > 0) { if (len > 0) {
var o = []; var o = [];
for (var i=0; i<len; i++) { for (var i=0; i<len; i++) {
o.push('0'); o.push('0');
} }
o.push(hex); o.push(hex);
hex = o.join(''); hex = o.join('');
} }
return hex; return hex;
}, },
HexToRGB = function (hex) { HexToRGB = function (hex) {
var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16); var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16);
return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)}; return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)};
}, },
HexToHSB = function (hex) { HexToHSB = function (hex) {
return RGBToHSB(HexToRGB(hex)); return RGBToHSB(HexToRGB(hex));
}, },
RGBToHSB = function (rgb) { RGBToHSB = function (rgb) {
var hsb = { var hsb = {
h: 0, h: 0,
s: 0, s: 0,
b: 0 b: 0
}; };
var min = Math.min(rgb.r, rgb.g, rgb.b); var min = Math.min(rgb.r, rgb.g, rgb.b);
var max = Math.max(rgb.r, rgb.g, rgb.b); var max = Math.max(rgb.r, rgb.g, rgb.b);
var delta = max - min; var delta = max - min;
hsb.b = max; hsb.b = max;
if (max != 0) { if (max != 0) {
} }
hsb.s = max != 0 ? 255 * delta / max : 0; hsb.s = max != 0 ? 255 * delta / max : 0;
if (hsb.s != 0) { if (hsb.s != 0) {
if (rgb.r == max) { if (rgb.r == max) {
hsb.h = (rgb.g - rgb.b) / delta; hsb.h = (rgb.g - rgb.b) / delta;
} else if (rgb.g == max) { } else if (rgb.g == max) {
hsb.h = 2 + (rgb.b - rgb.r) / delta; hsb.h = 2 + (rgb.b - rgb.r) / delta;
} else { } else {
hsb.h = 4 + (rgb.r - rgb.g) / delta; hsb.h = 4 + (rgb.r - rgb.g) / delta;
} }
} else { } else {
hsb.h = -1; hsb.h = -1;
} }
hsb.h *= 60; hsb.h *= 60;
if (hsb.h < 0) { if (hsb.h < 0) {
hsb.h += 360; hsb.h += 360;
} }
hsb.s *= 100/255; hsb.s *= 100/255;
hsb.b *= 100/255; hsb.b *= 100/255;
return hsb; return hsb;
}, },
HSBToRGB = function (hsb) { HSBToRGB = function (hsb) {
var rgb = {}; var rgb = {};
var h = Math.round(hsb.h); var h = Math.round(hsb.h);
var s = Math.round(hsb.s*255/100); var s = Math.round(hsb.s*255/100);
var v = Math.round(hsb.b*255/100); var v = Math.round(hsb.b*255/100);
if(s == 0) { if(s == 0) {
rgb.r = rgb.g = rgb.b = v; rgb.r = rgb.g = rgb.b = v;
} else { } else {
var t1 = v; var t1 = v;
var t2 = (255-s)*v/255; var t2 = (255-s)*v/255;
var t3 = (t1-t2)*(h%60)/60; var t3 = (t1-t2)*(h%60)/60;
if(h==360) h = 0; if(h==360) h = 0;
if(h<60) {rgb.r=t1; rgb.b=t2; rgb.g=t2+t3} if(h<60) {rgb.r=t1; rgb.b=t2; rgb.g=t2+t3}
else if(h<120) {rgb.g=t1; rgb.b=t2; rgb.r=t1-t3} else if(h<120) {rgb.g=t1; rgb.b=t2; rgb.r=t1-t3}
else if(h<180) {rgb.g=t1; rgb.r=t2; rgb.b=t2+t3} else if(h<180) {rgb.g=t1; rgb.r=t2; rgb.b=t2+t3}
else if(h<240) {rgb.b=t1; rgb.r=t2; rgb.g=t1-t3} else if(h<240) {rgb.b=t1; rgb.r=t2; rgb.g=t1-t3}
else if(h<300) {rgb.b=t1; rgb.g=t2; rgb.r=t2+t3} else if(h<300) {rgb.b=t1; rgb.g=t2; rgb.r=t2+t3}
else if(h<360) {rgb.r=t1; rgb.g=t2; rgb.b=t1-t3} else if(h<360) {rgb.r=t1; rgb.g=t2; rgb.b=t1-t3}
else {rgb.r=0; rgb.g=0; rgb.b=0} else {rgb.r=0; rgb.g=0; rgb.b=0}
} }
return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)}; return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)};
}, },
RGBToHex = function (rgb) { RGBToHex = function (rgb) {
var hex = [ var hex = [
rgb.r.toString(16), rgb.r.toString(16),
rgb.g.toString(16), rgb.g.toString(16),
rgb.b.toString(16) rgb.b.toString(16)
]; ];
$.each(hex, function (nr, val) { $.each(hex, function (nr, val) {
if (val.length == 1) { if (val.length == 1) {
hex[nr] = '0' + val; hex[nr] = '0' + val;
} }
}); });
return hex.join(''); return hex.join('');
}, },
HSBToHex = function (hsb) { HSBToHex = function (hsb) {
return RGBToHex(HSBToRGB(hsb)); return RGBToHex(HSBToRGB(hsb));
}, },
restoreOriginal = function () { restoreOriginal = function () {
var cal = $(this).parent(); var cal = $(this).parent();
var col = cal.data('colorpicker').origColor; var col = cal.data('colorpicker').origColor;
cal.data('colorpicker').color = col; cal.data('colorpicker').color = col;
fillRGBFields(col, cal.get(0)); fillRGBFields(col, cal.get(0));
fillHexFields(col, cal.get(0)); fillHexFields(col, cal.get(0));
fillHSBFields(col, cal.get(0)); fillHSBFields(col, cal.get(0));
setSelector(col, cal.get(0)); setSelector(col, cal.get(0));
setHue(col, cal.get(0)); setHue(col, cal.get(0));
setNewColor(col, cal.get(0)); setNewColor(col, cal.get(0));
}; };
return { return {
init: function (opt) { init: function (opt) {
opt = $.extend({}, defaults, opt||{}); opt = $.extend({}, defaults, opt||{});
if (typeof opt.color == 'string') { if (typeof opt.color == 'string') {
opt.color = HexToHSB(opt.color); opt.color = HexToHSB(opt.color);
} else if (opt.color.r != undefined && opt.color.g != undefined && opt.color.b != undefined) { } else if (opt.color.r != undefined && opt.color.g != undefined && opt.color.b != undefined) {
opt.color = RGBToHSB(opt.color); opt.color = RGBToHSB(opt.color);
} else if (opt.color.h != undefined && opt.color.s != undefined && opt.color.b != undefined) { } else if (opt.color.h != undefined && opt.color.s != undefined && opt.color.b != undefined) {
opt.color = fixHSB(opt.color); opt.color = fixHSB(opt.color);
} else { } else {
return this; return this;
} }
return this.each(function () { return this.each(function () {
if (!$(this).data('colorpickerId')) { if (!$(this).data('colorpickerId')) {
var options = $.extend({}, opt); var options = $.extend({}, opt);
options.origColor = opt.color; options.origColor = opt.color;
var id = 'collorpicker_' + parseInt(Math.random() * 1000); var id = 'collorpicker_' + parseInt(Math.random() * 1000);
$(this).data('colorpickerId', id); $(this).data('colorpickerId', id);
var cal = $(tpl).attr('id', id); var cal = $(tpl).attr('id', id);
if (options.flat) { if (options.flat) {
cal.appendTo(this).show(); cal.appendTo(this).show();
} else { } else {
cal.appendTo(document.body); cal.appendTo(document.body);
} }
options.fields = cal options.fields = cal
.find('input') .find('input')
.bind('keyup', keyDown) .bind('keyup', keyDown)
.bind('change', change) .bind('change', change)
.bind('blur', blur) .bind('blur', blur)
.bind('focus', focus); .bind('focus', focus);
cal cal
.find('span').bind('mousedown', downIncrement).end() .find('span').bind('mousedown', downIncrement).end()
.find('>div.colorpicker_current_color').bind('click', restoreOriginal); .find('>div.colorpicker_current_color').bind('click', restoreOriginal);
options.selector = cal.find('div.colorpicker_color').bind('mousedown', downSelector); options.selector = cal.find('div.colorpicker_color').bind('mousedown', downSelector);
options.selectorIndic = options.selector.find('div div'); options.selectorIndic = options.selector.find('div div');
options.el = this; options.el = this;
options.hue = cal.find('div.colorpicker_hue div'); options.hue = cal.find('div.colorpicker_hue div');
cal.find('div.colorpicker_hue').bind('mousedown', downHue); cal.find('div.colorpicker_hue').bind('mousedown', downHue);
options.newColor = cal.find('div.colorpicker_new_color'); options.newColor = cal.find('div.colorpicker_new_color');
options.currentColor = cal.find('div.colorpicker_current_color'); options.currentColor = cal.find('div.colorpicker_current_color');
cal.data('colorpicker', options); cal.data('colorpicker', options);
cal.find('div.colorpicker_submit') cal.find('div.colorpicker_submit')
.bind('mouseenter', enterSubmit) .bind('mouseenter', enterSubmit)
.bind('mouseleave', leaveSubmit) .bind('mouseleave', leaveSubmit)
.bind('click', clickSubmit); .bind('click', clickSubmit);
fillRGBFields(options.color, cal.get(0)); fillRGBFields(options.color, cal.get(0));
fillHSBFields(options.color, cal.get(0)); fillHSBFields(options.color, cal.get(0));
fillHexFields(options.color, cal.get(0)); fillHexFields(options.color, cal.get(0));
setHue(options.color, cal.get(0)); setHue(options.color, cal.get(0));
setSelector(options.color, cal.get(0)); setSelector(options.color, cal.get(0));
setCurrentColor(options.color, cal.get(0)); setCurrentColor(options.color, cal.get(0));
setNewColor(options.color, cal.get(0)); setNewColor(options.color, cal.get(0));
if (options.flat) { if (options.flat) {
cal.css({ cal.css({
position: 'relative', position: 'relative',
display: 'block' display: 'block'
}); });
} else { } else {
$(this).bind(options.eventName, show); $(this).bind(options.eventName, show);
} }
} }
}); });
}, },
showPicker: function() { showPicker: function() {
return this.each( function () { return this.each( function () {
if ($(this).data('colorpickerId')) { if ($(this).data('colorpickerId')) {
show.apply(this); show.apply(this);
} }
}); });
}, },
hidePicker: function() { hidePicker: function() {
return this.each( function () { return this.each( function () {
if ($(this).data('colorpickerId')) { if ($(this).data('colorpickerId')) {
$('#' + $(this).data('colorpickerId')).hide(); $('#' + $(this).data('colorpickerId')).hide();
} }
}); });
}, },
setColor: function(col) { setColor: function(col) {
if (typeof col == 'string') { if (typeof col == 'string') {
col = HexToHSB(col); col = HexToHSB(col);
} else if (col.r != undefined && col.g != undefined && col.b != undefined) { } else if (col.r != undefined && col.g != undefined && col.b != undefined) {
col = RGBToHSB(col); col = RGBToHSB(col);
} else if (col.h != undefined && col.s != undefined && col.b != undefined) { } else if (col.h != undefined && col.s != undefined && col.b != undefined) {
col = fixHSB(col); col = fixHSB(col);
} else { } else {
return this; return this;
} }
return this.each(function(){ return this.each(function(){
if ($(this).data('colorpickerId')) { if ($(this).data('colorpickerId')) {
var cal = $('#' + $(this).data('colorpickerId')); var cal = $('#' + $(this).data('colorpickerId'));
cal.data('colorpicker').color = col; cal.data('colorpicker').color = col;
cal.data('colorpicker').origColor = col; cal.data('colorpicker').origColor = col;
fillRGBFields(col, cal.get(0)); fillRGBFields(col, cal.get(0));
fillHSBFields(col, cal.get(0)); fillHSBFields(col, cal.get(0));
fillHexFields(col, cal.get(0)); fillHexFields(col, cal.get(0));
setHue(col, cal.get(0)); setHue(col, cal.get(0));
setSelector(col, cal.get(0)); setSelector(col, cal.get(0));
setCurrentColor(col, cal.get(0)); setCurrentColor(col, cal.get(0));
setNewColor(col, cal.get(0)); setNewColor(col, cal.get(0));
} }
}); });
} }
}; };
}(); }();
$.fn.extend({ $.fn.extend({
ColorPicker: ColorPicker.init, ColorPicker: ColorPicker.init,
ColorPickerHide: ColorPicker.hidePicker, ColorPickerHide: ColorPicker.hidePicker,
ColorPickerShow: ColorPicker.showPicker, ColorPickerShow: ColorPicker.showPicker,
ColorPickerSetColor: ColorPicker.setColor ColorPickerSetColor: ColorPicker.setColor
}); });
})(jQuery) })(jQuery);

6
python_apps/pypo/pypoliquidsoap.py
View File

@ -140,14 +140,14 @@ class PypoLiquidsoap():
#Iterate over the new files, and compare them to currently scheduled #Iterate over the new files, and compare them to currently scheduled
#tracks. If already in liquidsoap queue still need to make sure they don't #tracks. If already in liquidsoap queue still need to make sure they don't
#have different attributes such replay_gain etc. #have different attributes
#if replay gain changes, it shouldn't change the amplification of the currently playing song
for i in scheduled_now_files: for i in scheduled_now_files:
if i["row_id"] in row_id_map: if i["row_id"] in row_id_map:
mi = row_id_map[i["row_id"]] mi = row_id_map[i["row_id"]]
correct = mi['start'] == i['start'] and \ correct = mi['start'] == i['start'] and \
mi['end'] == i['end'] and \ mi['end'] == i['end'] and \
mi['row_id'] == i['row_id'] and \ mi['row_id'] == i['row_id']
mi['replay_gain'] == i['replay_gain']
if not correct: if not correct:
#need to re-add #need to re-add