From b11e98ea241c95ea137b4c209c45576aba26333c Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Fri, 10 Apr 2015 19:52:06 -0400
Subject: [PATCH] Reduced the Now Playing screen AJAX on load from 9 to 2.

---
 .../application/controllers/ShowbuilderController.php  |  2 +-
 airtime_mvc/public/js/airtime/library/library.js       |  2 ++
 airtime_mvc/public/js/airtime/showbuilder/builder.js   | 10 ++++++----
 .../public/js/airtime/showbuilder/main_builder.js      |  6 +++---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php
index 9dadb6b71..a30baac4c 100644
--- a/airtime_mvc/application/controllers/ShowbuilderController.php
+++ b/airtime_mvc/application/controllers/ShowbuilderController.php
@@ -42,7 +42,7 @@ class ShowbuilderController extends Zend_Controller_Action
         $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
-        $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
+        //$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.columnFilter.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
 
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index 24499e57c..3e755c63e 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -530,12 +530,14 @@ var AIRTIME = (function(AIRTIME) {
             },
             "fnStateSave": function (oSettings, oData) {
                 localStorage.setItem('datatables-library', JSON.stringify(oData));
+                /*
                 $.ajax({
                     url: baseUrl+"usersettings/set-library-datatable",
                     type: "POST",
                     data: {settings : oData, format: "json"},
                     dataType: "json"
                   });
+                  */
                 
                 colReorderMap = oData.ColReorder;
             },
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 139660dd7..29e86963b 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -439,13 +439,14 @@ var AIRTIME = (function(AIRTIME){
             "fnStateSave": function fnStateSave(oSettings, oData) {
                
                 localStorage.setItem('datatables-timeline', JSON.stringify(oData));
-                
+
+                /*
                 $.ajax({
                   url: baseUrl+"usersettings/set-timeline-datatable",
                   type: "POST",
                   data: {settings : oData, format: "json"},
                   dataType: "json"
-                });
+                });*/
             },
             "fnStateLoad": function fnBuilderStateLoad(oSettings) {
                 var settings = localStorage.getItem('datatables-timeline');
@@ -466,13 +467,14 @@ var AIRTIME = (function(AIRTIME){
                         a[i] = (a[i] === "true") ? true : false;
                     }
                 }
-                
+
+                /*
                 a = oData.ColReorder;
                 for (i = 0, length = a.length; i < length; i++) {   
                     if (typeof(a[i]) === "string") {
                         a[i] = parseInt(a[i], 10);
                     }
-                }
+                }*/
                
                 oData.iCreate = parseInt(oData.iCreate, 10);
             },
diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
index 625464bb0..b29f32d68 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
@@ -328,10 +328,10 @@ AIRTIME = (function(AIRTIME) {
                     setTimeout(checkScheduleUpdates, 5000);
                 }
             });
-        }
 
-        //check if the timeline view needs updating.
-        checkScheduleUpdates();
+            //check if the timeline view needs updating.
+            setTimeout(checkScheduleUpdates, 5000);
+        }
     };
 
     mod.onResize = function() {