From 43ba92a535a19bbf120e1e749af48afbdbb0e74a Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Thu, 22 Sep 2011 12:15:03 -0400
Subject: [PATCH] CC-2866: progress icon not showing
- fixed
---
.../application/controllers/LibraryController.php | 2 +-
airtime_mvc/public/js/airtime/library/library.js | 10 ++++------
.../js/airtime/schedule/full-calendar-functions.js | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index 573ea4a9c..4342d3529 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -97,7 +97,7 @@ class LibraryController extends Zend_Controller_Action
$text = "Re-upload to Soundcloud";
}
$menu[] = array('action' => array('type' => 'ajax', 'url' => '/Library/upload-file-soundcloud/id/#id#',
- 'callback'=>'window["redrawDataTable"]'),'title' => $text);
+ 'callback'=>"window['addProgressIcon']('$file_id')"),'title' => $text);
}
if ($user->isAdmin()) {
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index f7d856907..6c3e14b6c 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -153,11 +153,9 @@ function dtDrawCallback() {
addLibraryItemEvents();
}
-function redrawDataTable() {
- var dt;
-
- dt = $('#library_display').dataTable();
- dt.fnDraw(false);
+function addProgressIcon(id) {
+ $("#au_"+id).find("td:eq(0)").append('<span id="'+id+'" class="small-icon progress"></span>')
+ $("span[id="+id+"]").addClass("progress");
}
function checkSCUploadStatus(){
@@ -180,7 +178,7 @@ function addQtipToSCIcons(){
if($(this).hasClass("progress")){
$(this).qtip({
content: {
- text: "Uploading in the progress..."
+ text: "Uploading in progress..."
},
position:{
adjust: {
diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
index da682f7b3..52df7fb61 100644
--- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
+++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
@@ -348,7 +348,7 @@ function addQtipToSCIcons(ele){
if($(ele).hasClass("progress")){
$(ele).qtip({
content: {
- text: "Uploading in the progress..."
+ text: "Uploading in progress..."
},
position:{
adjust: {