From 72253455412def764e6373146f91c89aaac9620b Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Wed, 15 Aug 2012 12:51:53 -0400
Subject: [PATCH] CC-4231: Library: Prevent audio preview popup for dynamic
blocks
- done
---
airtime_mvc/application/models/Datatables.php | 5 +++++
.../js/airtime/library/events/library_playlistbuilder.js | 4 ++++
airtime_mvc/public/js/airtime/library/library.js | 2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/airtime_mvc/application/models/Datatables.php b/airtime_mvc/application/models/Datatables.php
index 01971a139..66737b7d9 100644
--- a/airtime_mvc/application/models/Datatables.php
+++ b/airtime_mvc/application/models/Datatables.php
@@ -95,6 +95,11 @@ class Application_Model_Datatables
$r['length'] = $pl->getLength();
} else if ($r['ftype'] == "block") {
$bl = new Application_Model_Block($r['id']);
+ if ($bl->isStatic()) {
+ $r['bl_type'] = 'static';
+ } else {
+ $r['bl_type'] = 'dynamic';
+ }
$r['length'] = $bl->getLength();
}
}
diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
index dcb63f8af..f2eff7739 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
@@ -40,6 +40,10 @@ var AIRTIME = (function(AIRTIME){
$nRow.attr("id", aData["tr_id"])
.data("aData", aData)
.data("screen", "playlist");
+
+ if (aData["bl_type"] !== undefined) {
+ $nRow.attr("bl_type", aData["bl_type"]);
+ }
};
mod.fnDrawCallback = function() {
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index 3ec3232ac..bcd364d5f 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -426,7 +426,7 @@ var AIRTIME = (function(AIRTIME) {
open_audio_preview(aData.ftype, aData.audioFile, aData.track_title, aData.artist_name);
} else if (aData.ftype == 'stream') {
open_audio_preview(aData.ftype, aData.audioFile, aData.track_title, aData.artist_name);
- } else if (aData.ftype == 'block') {
+ } else if (aData.ftype == 'block' && aData.bl_type == 'static') {
blockIndex = $(this).parent().attr('id').substring(3); //remove the bl_
open_block_preview(blockIndex, 0);
}