remove unused javascript code

website/agenda/js/calcms.cust.js

@@ -179,236 +179,14 @@ var calcms_settings = new Array();
                 $("#result").load(editorsUrl)
             }
         }
-
     }
 
-    /*
-	function insertDeskDetails() {
-		var pattern = new RegExp(/redaktion\/(.*)$/);
-		var matchs = pattern.exec(document.location.href);
-		if ((matchs != null) && (matchs.length > 0) && (matchs[1] != '')) {
-			var desk = $('#center h2:first').text();
-			desk = desk.replace('Redaktion: ', '');
-			desk = escape(desk);
-			$('#center .content').append(
-					'<div>' + '<a onclick="insertDeskPrevShows(\'' + desk
-							+ '\');return false;" href="#">«letzte«</a>'
-							+ ' Sendungen '
-							+ '<a onclick="insertDeskNextShows(\'' + desk
-							+ '\');return false;" href="#">»nächste»</a>'
-							+ '<div id="showDesk" />' + '</div>');
-		}
-	}
-	*/
-
-    /*
-	function fixBlogEntries() {
-		if (document.location.href.match('/redaktionen/')
-				|| document.location.href.match('/redaktionen?')
-				|| document.location.href.match('/redaktionen$')) {
-			$('img.image-thumbnail').css('width', '3em');
-			$('img.image-thumbnail').css('height', '3em');
-			$('div.image-attach-teaser').css('width', '3em');
-			$('div.node').css('padding', '0');
-			$('div.node').css('margin', '0');
-			$('#center .submitted').remove();
-			$('#center .clear-block h2 a')
-					.each(
-							function(index) {
-								$(this)
-										.html(
-												$(this)
-														.text()
-														.replace('Redaktion: ',
-																'<font color="gray">Redaktion:</font> '));
-								if ($(this).text().match(/Information:/))
-									$(this).remove();
-							})
-
-		}
-	}
-    */
-
-    /*
-	function setImageSize() {
-		var image = '#calcms_list div.content img';
-		var size = $(window).width();
-		size = Math.floor(size * 0.16);
-		$(image).css('width', size + 'px');
-		$(image).css('height', size + 'px');
-		if (size > 200) {
-			$(image).each(function(index) {
-				var url = $(this).attr('src');
-				if (url != null) {
-					url = url.replace('/thumbs/', '/images/');
-					console.log(url);
-					$(this).attr('src', url);
-				}
-			});
-		} else {
-			$(image).each(function(index) {
-				var url = $(this).attr('src');
-				if (url != null) {
-					url = url.replace('/images/', '/thumbs/');
-					$(this).attr('src', url);
-				}
-			});
-		}
-	}
-    */	
-
-	function setThumbs() {
-		$('#calcms_playlist img').each(function(index) {
-			var url = $(this).attr('src');
-			if (url != null) {
-				url = url.replace('/images/', '/thumbs/');
-				$(this).attr('src', url);
-			}
-		});
-	}
-
-    /*
-	function addCommentsOnAgendaPages() {
-		if (calcms.contains(window.location.href, '/programm/')
-				|| calcms.contains(window.location.href, '/agenda/')) {
-			$('#sidebar-right')
-					.append(
-							'<div id="block-block-2" class="clear-block block block-block"><h2>Kommentare</h2><div class="content">'
-									+ '<div id="calcms_newest_comments">Bitte warten…</div>'
-									+ '</div></div>');
-		}
-	}
-	*/
-
-	function scrollNextEvent() {
-		if ($('#calcms_running_event').length == 0)
-			return;
-		$('#playlist_container').scrollLeft(0);
-		setInterval(nextSlideEvent, 10000);
-	}
-
-	var numberOfComingShows = 100;
-	var slideCount = 0;
-	var slideOffset = 1;
-	var slideEvents = 1;
-
-	// slideEvents will be updated at onmouseenter/leave handler at
-	// playlist_long
-	function nextSlideEvent() {
-		if (slideEvents == 0)
-			return;
-		if ($('#coming_shows a').length == 0)
-			return;
-		if (slideCount == 0) {
-			numberOfComingShows = $('#coming_shows a').length;
-			$('#playlist_container').scrollLeft(0)
-			$('#playlist_container').css('overflow', 'auto');
-			$('#playlist_container').css('-webkit-overflow-scrolling', 'touch');
-			$('#playlist_container').css('height', '150');
-			$('#coming_shows').css('white-space', 'nowrap');
-			$('#coming_shows').css('overflow-x', 'hidden');
-			$('#coming_shows').css('height', '150');
-		}
-
-		// console.log(slideCount+" "+slideOffset)
-		$('#playlist_container').animate({
-			scrollLeft : slideCount * 115 + "px"
-		}, 5000);
-
-		if (slideCount < 0)
-			slideOffset = 1
-		if (slideCount > numberOfComingShows + 1 - $('#coming_shows').width()
-				/ 100)
-			slideOffset = -1
-		slideCount += slideOffset;
-	}
-
-	function mobilise() {
-		if (!navigator.userAgent.match(/Mobi/))
-			return;
-
-		$('#wrapper #container #sidebar-left').before(
-				$('#wrapper #container #center'));
-		$('#wrapper #container #sidebar-left').before(
-				$('#wrapper #container #sidebar-right'));
-
-		$('body.sidebars').css('min-width', '100%');
-		$('body.sidebar-left').css('min-width', '100%');
-		$('body.sidebar-right').css('min-width', '100%');
-
-		$('#wrapper #container .sidebar').css('width', '100%');
-		$('#wrapper #container').css('width', '100%');
-		$('#wrapper #container').css('max-width', '100%');
-		$('#wrapper #container').css('margin', '0');
-		$('#wrapper #container').css('padding', '0');
-
-		$('#center').css('margin', '0');
-		$('#center #squeeze').css('margin', '0');
-		$('#center *').css('margin-left', '0');
-		$('#center *').css('margin-right', '0');
-		$('#center .right-corner').css('position', 'static');
-		$('#center .right-corner').css('left', '0');
-		$('#center .right-corner').css('padding-left', '0');
-		$('#center .right-corner').css('padding-right', '0');
-		$('#center .right-corner').css('background-image', 'url()');
-		$('#center .left-corner').css('position', 'static');
-		$('#center .left-corner').css('padding-left', '0');
-		$('#center .left-corner').css('padding-right', '0');
-		$('#center .left-corner').css('background-image', 'url()');
-		$('#center *').css('background-image', 'url()');
-
-		$('#wrapper #container #header').css('height', '100px');
-
-		var padding = '0.5em'
-		$('#center .left-corner').css('padding-left', padding);
-		$('#center .left-corner').css('padding-right', padding);
-		$('#wrapper #container #sidebar-left').css('padding-left', padding);
-		$('#wrapper #container #sidebar-left').css('padding-right', padding);
-
-		// $('*').css('background','none');
-		// $('#sidebar-left div.content').css('text-align','center');
-		// $('#sidebar-left *').css('margin-left','0');
-		// $('#sidebar-left *').css('margin-right','0');
-		// $('#sidebar-right *').css('margin-left','0');
-		// $('#sidebar-right *').css('margin-right','0');
-		// $('#sidebar-left').css('width','90%');
-		$('.node').css('padding-left', '0');
-		$('.node').css('padding-right', '0');
-
-		$('#calcms_search input').css("padding", "1em");
-		$('#calcms_search select').css("padding", "1em");
-
-		var menu = "ul.links.primary-links";
-		$(menu).addClass('mobileMenu');
-		$(menu).before('<div id="mobileMenuButton"></div>');
-		$(menu).hide();
-
-		var menu2 = "ul.links.secondary-links";
-		$(menu2).each(function() {
-			$(menu).append($(this).html());
-		})
-		$(menu2).remove();
-
-		$('#calcms_calendar table').css('width', '90%');
-
-		// move footer down
-		var footer = $('#wrapper #footer').html();
-		$('body').append(footer);
-		$('#wrapper #footer').remove();
-
-		$("#mobileMenuButton").click(function() {
-			$(menu).slideToggle();
-			return false;
-		});
-	}
-
 	function initSearch() {
 		var base = $('#calcms_search_show_details');
 		var elem = $('#calcms_search_show_details #plus');
 		if (elem.length == 0) {
 			base.append('<span id="plus"> ▼ </span>');
 			base.prepend('<span id="plus"></span>');
-
 		}
 	}
 
@@ -434,26 +212,13 @@ var calcms_settings = new Array();
         }
     }
 
-	function initAll() {
+	$(document).ready(function() {
 		initCalcms();
 		//initWordpress();
-		//addCommentsOnAgendaPages();
 		calcms.showPlaylist();
 		calcms.showNewestComments();
-		// insertDeskDetails();
-		// fixBlogEntries();
-		calcms.removeCurrentPlayingHeader();
-		// setImageSize();
-		// setThumbs();
-		// scrollNextEvent();
-		//initSlider();
-		// mobilise();
 		initSearch();
 		console.log("calcms inited")
-	}
-
-	$(document).ready(function() {
-		initAll();
 	});
 
 }(jQuery, calcms));

website/agenda/js/calcms.js

@@ -3,21 +3,16 @@ var calcms = (function($) {
     var my = {};
 
     // calcms base functions
-    // event handlers are customized at herbstradio.org
-
     my.updateContainer = function updateContainer(id, url, onLoading, callback) {
         if (id == null)
             return;
-        if ($("#" + id).length == 0)
+        if (document.querySelector('#'+id).length == 0)
             return;
-        // if (onLoading)document.getElementById(id).innerHTML="lade ...";
         $("#" + id).load(url, null, callback);
     }
 
     my.load = function load(url) {
         window.location.href = url;
-        // $(window).load(url);
-        // $('html').load(url);
     }
 
     my.postContainer = function postContainer(url, parameters, callback) {
@@ -76,75 +71,6 @@ var calcms = (function($) {
         $("#calcms_search_field").val('');
     }
 
-    // set calcms_settings to parameters from URL
-    my.evaluateParametersFromUrl = function evaluateParametersFromUrl() {
-        var location = new String(window.location);
-
-        if (!location.match(my.get("base_url")))
-            return;
-
-        if (window.location.search != "") {
-            var parameters = window.location.search.split("?")[1].split("&");
-            for (var i = 0; i < parameters.length; i++) {
-                var pair = parameters[i];
-                var name_values = pair.split("=");
-                if (name_values != null) {
-                    // alert(name_values[0]+"="+name_values[1]);
-                    // set(name_values[0],name_values[1]);
-                    var element = document.getElementById(name_values[0]);
-                    if (element != null)
-                        element.value = name_values[1];
-                }
-            }
-        }
-
-        var sendung = /\/sendung\/(\d+)\//;
-        sendung.exec(location);
-
-        if (RegExp.$1 != null && RegExp.$1 != '') {
-            // alert(RegExp.$1);
-            set('event_id', RegExp.$1);
-            set('last_event_id', my.get('event_id'));
-        } else {
-
-            var sendungen = /\/sendungen\/(\d{4}\-\d{2}\-\d{2})\/(\d{4}\-\d{2}\-\d{2})\/(\d)\//;
-            sendungen.exec(location);
-            if (RegExp.$1 != '' && RegExp.$2 != '' && RegExp.$3 != '') {
-                set('from_date', RegExp.$1);
-                set('till_date', RegExp.$2);
-                set('weekday', RegExp.$3);
-            } else {
-
-                var sendungen = /\/sendungen\/(\d{4}\-\d{2}\-\d{2})\/(\d{4}\-\d{2}\-\d{2})\//;
-                sendungen.exec(location);
-                if (RegExp.$1 != '' && RegExp.$2 != '') {
-                    set('from_date', RegExp.$1);
-                    set('till_date', RegExp.$2);
-                } else {
-                    var sendungen = /\/sendungen\/(\d{4}\-\d{2}\-\d{2})\//;
-                    sendungen.exec(location);
-                    if (RegExp.$1 != '') {
-                        set('date', RegExp.$1);
-                    }
-                }
-
-            }
-
-            var kalender = /\/kalender\/(\d{4}\-\d{2}\-\d{2})\/(\d{4}\-\d{2}\-\d{2})\//;
-            kalender.exec(location);
-            if (RegExp.$1 != '' && RegExp.$2 != '') {
-                set('from_date', RegExp.$1);
-                set('till_date', RegExp.$2);
-            } else {
-                var kalender = /\/kalender\/(\d{4}\-\d{2}\-\d{2})\//;
-                kalender.exec(location);
-                if (RegExp.$1 != '') {
-                    set('date', RegExp.$1);
-                }
-            }
-        }
-    }
-
     // return URL from calcms_settings
     // parameters can be overwritten by field and value
     // This handles main controller interaction logics
@@ -163,20 +89,16 @@ var calcms = (function($) {
         var date = my.get('date');
         var month = my.get('month');
         var weekday = my.get('weekday');
-        var time_of_day = '';
         var time = '';
-        var program = my.get('program');
         var series_name = my.get('series_name');
         var category = my.get('category');
-        var tag = my.get('tag');
         var search_field = my.get('search');
 
         // delete filters by current action
         if ((field == 'search' && search_field != '')
                 || (field == 'category' && category != '')
                 || (field == 'series_name' && series_name != '')
-                || (field == 'program' && program != '') || (field == 'tag')
+        ) {
-                && tag != '') {
             weekday = '';
             date = '';
             from_date = '';
@@ -195,12 +117,6 @@ var calcms = (function($) {
             program = '';
         }
 
-        if (field == 'program') {
-            search_field = '';
-            series_name = '';
-            category = '';
-        }
-
         if (field == 'series_name') {
             search_field = '';
             program = '';
@@ -215,9 +131,7 @@ var calcms = (function($) {
             weekday = '';
             date = '';
             category = '';
-            program = '';
             series_name = '';
-            tags = '';
             search_field = '';
         }
 
@@ -225,21 +139,13 @@ var calcms = (function($) {
             weekday = '';
             date = '';
             category = '';
-            program = '';
             series_name = '';
-            tags = '';
             search_field = '';
         }
 
         if (field == 'weekday') {
-            /*
-             * if (month != ''){ from_date=month;
-             * till_date=month.substring(0,month.length-2)+"31" ; }
-             */
             category = '';
-            program = '';
             series_name = '';
-            tags = '';
             search_field = '';
         }
 
@@ -248,30 +154,19 @@ var calcms = (function($) {
             from_date = '';
             till_date = '';
             category = '';
-            program = '';
             series_name = '';
-            tags = '';
             search_field = '';
         }
 
         if (field == 'time') {
             if (time == 'null') {
                 return
-
-                
-
-                                
-
-                
-
             } else {
                 weekday = '';
-                time_of_day = '';
             }
         }
 
-        if (field == 'month' || field == 'week' || field == 'weekday'
+        if (field == 'month' || field == 'week' || field == 'weekday') {
-                || field == 'time_of_day') {
             time = '';
         }
 
@@ -313,20 +208,6 @@ var calcms = (function($) {
             url += '/';
         }
 
-        if (time_of_day != '') {
-            url += "&time_of_day=" + time_of_day;
-        } else if (time != '' && time != 'null') {
-            url += "&" + time;
-        }
-
-        if (tag != null && tag != '') {
-            url += "&tag=" + tag;
-        }
-
-        if (program != null && program != '') {
-            url += "&program=" + program;
-        }
-
         if (field == 'print') {
             url += "&print=1";
         }
@@ -558,7 +439,6 @@ var calcms = (function($) {
 
     // update menu and list by given date
     my.showEventsByDate = function showEventsByDate(date) {
-        // my.set('date',date);
         my.showMenuAndList('', 'date', date);
         return false;
 
@@ -610,17 +490,6 @@ var calcms = (function($) {
         return false;
     }
 
-    // update menu, list and calendar widget by entries of given month YYYY-MM
-    // (current day)
-    my.showTodaysCalendarAndEvents = function showTodaysCalendarAndEvents(month) {
-        my.set('month', month);
-        // my.set(date,'today');
-        my.showMenuAndList('', 'date', 'today');
-        my.showCalendar('', 'month');
-        return false;
-
-    };
-
     // update menu, list and calendar widget by entries of given month YYYY-MM
     my.showCalendarAndEventsByMonth = function showCalendarAndEventsByMonth(
             month) {
@@ -631,17 +500,6 @@ var calcms = (function($) {
 
     };
 
-    // update menu, list and calendar widget by entries of given date YYYY-MM-DD
-    my.showCalendarAndEventsByDate = function showCalendarAndEventsByDate(date) {
-        my.set('date', date);
-        my.showMenuAndList('', 'date');
-
-        my.set('month', date);
-        my.showCalendar('', 'month');
-        return false;
-
-    };
-
     // end of Calendar actions
 
     // show comment for given event id and start time
@@ -699,9 +557,9 @@ var calcms = (function($) {
         html += '</form>'
         html += '</div>';
 
-        document.getElementById(id).innerHTML = html
+        document.getElementById(id).innerHTML = html;
-
+        $("#" + id).show("drop");
-        my.show(id);
+        document.getElementById(id).style.visibility = "visible";
     }
     // end of Comment actions
 
@@ -723,7 +581,6 @@ var calcms = (function($) {
     // export selected events to ical
     my.exportSelectedToICal = function exportSelectedToICal() {
         window.location = my.get('ical_url') + my.setAndGetUrlParameters();
-        ;
         return false;
     }
 
@@ -745,41 +602,6 @@ var calcms = (function($) {
         return false;
     }
 
-    // wrapper to show an id
-    my.show = function show(id) {
-        $("#" + id).show("drop");
-        document.getElementById(id).style.visibility = "visible";
-        // document.getElementById(id).style.display="block";
-    }
-
-    // wrapper to hide an id
-    my.hide = function hide(id) {
-        $("#" + id).hide("drop");
-        document.getElementById(id).style.visibility = "hidden";
-        // document.getElementById(id).style.display="none";
-    }
-
-    // return max date
-    my.setDateIfBefore = function setDateIfBefore(date1, date2) {
-        if (date1 < date2)
-            return date2;
-        return date1;
-    }
-
-    // return min date
-    my.setDateIfAfter = function setDateIfAfter(date1, date2) {
-        if (date1 > date2)
-            return date2;
-        return date1;
-    }
-
-    // remove Drupal header for currently playing entry at topic overview page
-    my.removeCurrentPlayingHeader = function removeCurrentPlayingHeader() {
-        $("h2 a[href$='/testing']").each(function() {
-            $(this).css("display", "none");
-        });
-    }
-
     // return instance
     return my;
 }(jQuery));