From 0a17b348853f1c42caeeb70d26f80b992d61ec2e Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Thu, 3 May 2012 18:00:10 +0200 Subject: [PATCH] CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours --- .../js/airtime/library/events/library_showbuilder.js | 8 ++++---- airtime_mvc/public/js/airtime/showbuilder/builder.js | 10 ++++++---- 2 files changed, 10 insertions(+), 8 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 fd0f4aebf..4126852a9 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -9,11 +9,11 @@ var AIRTIME = (function(AIRTIME){ mod.checkAddButton = function() { var selected = mod.getChosenItemsLength(), - cursor = $('tr.cursor-selected-row'), + $cursor = $('tr.cursor-selected-row'), check = false; //make sure library items are selected and a cursor is selected. - if (selected !== 0 && cursor.length !== 0) { + if (selected !== 0 && $cursor.length !== 0) { check = true; } @@ -100,7 +100,8 @@ var AIRTIME = (function(AIRTIME){ length, temp, aMediaIds = [], - aSchedIds = []; + aSchedIds = [], + aData = []; //process selected files/playlists. for (i = 0, length = selected.length; i < length; i++) { @@ -108,7 +109,6 @@ var AIRTIME = (function(AIRTIME){ aMediaIds.push({"id": data.id, "type": data.ftype}); } - aData = []; $("#show_builder_table tr.cursor-selected-row").each(function(i, el){ aData.push($(el).prev().data("aData")); }); diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index c8795bd40..4582d4466 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -5,6 +5,7 @@ var AIRTIME = (function(AIRTIME){ $sbContent, $sbTable, $toolbar, + $ul, $lib; if (AIRTIME.showbuilder === undefined) { @@ -56,7 +57,7 @@ var AIRTIME = (function(AIRTIME){ }; mod.checkTrimButton = function() { - $over = $sbTable.find(".sb-over"); + var $over = $sbTable.find(".sb-over"); if ($over.length !== 0) { AIRTIME.button.enableButton("sb-button-trim"); @@ -67,7 +68,7 @@ var AIRTIME = (function(AIRTIME){ }; mod.checkDeleteButton = function() { - $selected = $sbTable.find("tbody").find("input:checkbox").filter(":checked"); + var $selected = $sbTable.find("tbody").find("input:checkbox").filter(":checked"); if ($selected.length !== 0) { AIRTIME.button.enableButton("sb-button-delete"); @@ -78,7 +79,7 @@ var AIRTIME = (function(AIRTIME){ }; mod.checkJumpToCurrentButton = function() { - $current = $sbTable.find(".sb-now-playing"); + var $current = $sbTable.find(".sb-now-playing"); if ($current.length !== 0) { AIRTIME.button.enableButton("sb-button-current"); @@ -89,7 +90,7 @@ var AIRTIME = (function(AIRTIME){ }; mod.checkCancelButton = function() { - $current = $sbTable.find(".sb-current-show"); + var $current = $sbTable.find(".sb-current-show"); if ($current.length !== 0) { AIRTIME.button.enableButton("sb-button-cancel"); @@ -784,6 +785,7 @@ var AIRTIME = (function(AIRTIME){ $ul.append('
  • ') .append('
  • '); $toolbar.append($ul); + $ul = undefined; $.contextMenu({ selector: '#show_builder .ui-icon-document-b',