From f71a4420a6bdc4b199aa2040def3b2a998c59b15 Mon Sep 17 00:00:00 2001 From: Naomi Date: Wed, 2 Feb 2011 14:57:51 -0500 Subject: [PATCH] removing js that isn't needed, don't have slot minute option on month view. --- application/controllers/LibraryController.php | 1 - application/controllers/SearchController.php | 1 - public/js/airtime/library/advancedsearch.js | 4 ++-- public/js/airtime/library/library.js | 6 +++--- public/js/airtime/library/spl.js | 5 ++--- public/js/airtime/onready/library.js | 5 ----- public/js/airtime/onready/search.js | 7 ------- public/js/airtime/schedule/full-calendar-functions.js | 6 +++--- 8 files changed, 10 insertions(+), 25 deletions(-) delete mode 100644 public/js/airtime/onready/library.js delete mode 100644 public/js/airtime/onready/search.js diff --git a/application/controllers/LibraryController.php b/application/controllers/LibraryController.php index c58072fe3..34bbb2778 100644 --- a/application/controllers/LibraryController.php +++ b/application/controllers/LibraryController.php @@ -24,7 +24,6 @@ class LibraryController extends Zend_Controller_Action public function indexAction() { - $this->view->headScript()->appendFile('/js/airtime/onready/library.js','text/javascript'); $this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript'); $this->view->headScript()->appendFile('/js/jplayer/jquery.jplayer.min.js'); $this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.js','text/javascript'); diff --git a/application/controllers/SearchController.php b/application/controllers/SearchController.php index 7a8981d9f..93f3d40c5 100644 --- a/application/controllers/SearchController.php +++ b/application/controllers/SearchController.php @@ -45,7 +45,6 @@ class SearchController extends Zend_Controller_Action { $this->_helper->layout->setLayout('search'); - $this->view->headScript()->appendFile('/js/airtime/onready/search.js','text/javascript'); $this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript'); $this->view->headLink()->appendStylesheet('/css/contextmenu.css'); diff --git a/public/js/airtime/library/advancedsearch.js b/public/js/airtime/library/advancedsearch.js index 85ae0b85a..cff0065c9 100644 --- a/public/js/airtime/library/advancedsearch.js +++ b/public/js/airtime/library/advancedsearch.js @@ -36,7 +36,7 @@ function ajaxAddGroup() { }); } -function setUpSearch() { +$(document).ready(function() { $("#search_add_group").click(ajaxAddGroup); @@ -45,4 +45,4 @@ function setUpSearch() { $('[id^="fieldset-row_"]').each(function(i, el){ addRemove(el); }); -} +}); diff --git a/public/js/airtime/library/library.js b/public/js/airtime/library/library.js index 56f0f2afc..6537e8a35 100644 --- a/public/js/airtime/library/library.js +++ b/public/js/airtime/library/library.js @@ -71,7 +71,7 @@ function dtDrawCallback() { addLibraryItemEvents(); } -function setUpLibrary() { +$(document).ready(function() { $('.tabs').tabs(); @@ -103,5 +103,5 @@ function setUpLibrary() { "sPaginationType": "full_numbers", "bJQueryUI": true, "bAutoWidth": false - } ); -} + }); +}); diff --git a/public/js/airtime/library/spl.js b/public/js/airtime/library/spl.js index 7627d6af4..d3105084b 100644 --- a/public/js/airtime/library/spl.js +++ b/public/js/airtime/library/spl.js @@ -377,7 +377,7 @@ function openDiffSPL(json) { setUpSPL(); } -function setUpSPL() { +$(document).ready(function() { $("#spl_sortable").sortable(); $("#spl_sortable" ).bind( "sortstop", moveSPLItem); @@ -401,5 +401,4 @@ function setUpSPL() { $("#spl_sortable").droppable(); $("#spl_sortable" ).bind( "drop", addSPLItem); -} - +}); diff --git a/public/js/airtime/onready/library.js b/public/js/airtime/onready/library.js deleted file mode 100644 index 55920fff9..000000000 --- a/public/js/airtime/onready/library.js +++ /dev/null @@ -1,5 +0,0 @@ -$(document).ready(function() { - - setUpLibrary(); - setUpSPL(); -}); diff --git a/public/js/airtime/onready/search.js b/public/js/airtime/onready/search.js deleted file mode 100644 index cfd22d817..000000000 --- a/public/js/airtime/onready/search.js +++ /dev/null @@ -1,7 +0,0 @@ -$(document).ready(function() { - - setUpLibrary(); - setUpSearch(); - setUpSPL(); - -}); diff --git a/public/js/airtime/schedule/full-calendar-functions.js b/public/js/airtime/schedule/full-calendar-functions.js index 2a7e58446..7fd6cb359 100644 --- a/public/js/airtime/schedule/full-calendar-functions.js +++ b/public/js/airtime/schedule/full-calendar-functions.js @@ -22,10 +22,11 @@ function dayClick(date, allDay, jsEvent, view) { } function viewDisplay( view ) { - + + $('.schedule_change_slots').remove(); + if(view.name === 'agendaDay' || view.name === 'agendaWeek') { - $('.schedule_change_slots').remove(); var calendarEl = this; var select = $('