From 462e73d93b5746de5632b4c5c458ada6bdf991e3 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 22 Aug 2012 13:58:13 -0400 Subject: [PATCH 1/2] CC-4245: Playlists: Can only rearrange, by dragging and dropping, tracks once -fixed --- airtime_mvc/public/js/airtime/library/spl.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 7074b07b7..1d8313fe2 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -300,7 +300,7 @@ var AIRTIME = (function(AIRTIME){ .empty() .val(json.description); - $('#spl_sortable').unbind(); + $('#spl_sortable').off('focusout keydown'); $('#spl_sortable') .empty() .append(json.html); @@ -423,20 +423,20 @@ var AIRTIME = (function(AIRTIME){ //sets events dynamically for the cue editor. function setCueEvents() { var temp = $('#spl_sortable'); - temp.on("blur", ".spl_cue_in span", changeCueIn); + temp.on("focusout", ".spl_cue_in span", changeCueIn); temp.on("keydown", ".spl_cue_in span", submitOnEnter); - temp.on("blur", ".spl_cue_out span", changeCueOut); + temp.on("focusout", ".spl_cue_out span", changeCueOut); temp.on("keydown", ".spl_cue_out span", submitOnEnter); } //sets events dynamically for the fade editor. function setFadeEvents() { var temp = $('#spl_sortable'); - temp.on("blur", ".spl_fade_in span", changeFadeIn); + temp.on("focusout", ".spl_fade_in span", changeFadeIn); temp.on("keydown", ".spl_fade_in span", submitOnEnter); - temp.on("blur", ".spl_fade_out span", changeFadeOut); + temp.on("focusout", ".spl_fade_out span", changeFadeOut); temp.on("keydown", ".spl_fade_out span", submitOnEnter); } From ef5427d0bc33557e48c319cb5a6ea097fa1edd82 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 22 Aug 2012 14:18:48 -0400 Subject: [PATCH 2/2] CC-4197: Media Library -> Regular Playlist: Some character get cut off in context view -fixed --- .../views/scripts/library/get-file-metadata.ajax.phtml | 6 +++--- airtime_mvc/public/css/styles.css | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml index 15aeb1bc4..7e4770332 100644 --- a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml +++ b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml @@ -54,11 +54,11 @@ $titleMaxStrLen) { - $row["track_title"] = substr($row["track_title"], 0, 34)."..."; + $row["track_title"] = mb_substr($row["track_title"], 0, 34, 'UTF-8')."..."; } $artistMaxStrLen = 22; - if (strlen($row["creator"]) > $artistMaxStrLen) { - $row["creator"] = substr($row["creator"], 0, 21)."..."; + if (mb_strlen($row["creator"], 'UTF-8') > $artistMaxStrLen) { + $row["creator"] = mb_substr($row["creator"], 0, 21, 'UTF-8')."..."; } ?>