Ajax improvements, js reorganized

public/javascripts/ajax.js

@@ -1,50 +0,0 @@
-function loadArtistData(name) {
-	setArchor('/artist/'+ name +'/');
-	$.get('/artist/'+ name +'/', function(data){
-		if (typeof data.error != 'undefined') {
-			if (data.error == 'loading') {
-				loadArtistData(name);
-			} else if (data.error == 404) {
-				load404Page();
-			}
-			return false;
-		}
-		Pages.renderArtist(data);
-	})
-}
-function loadSearchPage() {
-	setArchor('/search/');
-	$.get('/demo/search.html', function(data){
-		$('#data-container').html(data);
-	})
-}
-function loadWheePage() {
-	$.get('/demo/whee.html', function(data){
-		$('#data-container').html(data);
-	})
-}
-function load404Page() {
-	$.get('/demo/404.html', function(data){
-		$('#data-container').html(data);
-	})
-}
-
-$(function(){
-	$('a.data.artist').live('click', function(){
-		loadArtistData($(this).html());
-		return false;
-	});
-	$('.search').live('click', function(){
-		loadSearchPage();
-		return false;
-	});
-	$('#search_form').live('submit', function(){
-		$('.autocomplete-container').remove();
-		loadArtistData($('#search_field').val());
-		return false;
-	});
-})
-
-function setArchor(anchor) {
-	window.location = '#'+ anchor;
-}

public/javascripts/beathaven/ajax.js

@@ -0,0 +1,77 @@
+var Ajax = {
+	loadArtistData: function(name) {
+		$('#search-container input').attr('disabled', 'disabled').blur();
+		$('#search-container img').show();
+		name = name.replace(' ', '+');
+		Ajax.setArchor('/artist/'+ name +'/');
+		$.get('/artist/'+ name +'/', function(data){
+			if (typeof data.error != 'undefined') {
+				if (data.error == 'loading') {
+					Ajax.loadArtistData(name);
+				} else if (data.error == 404) {
+					Ajax.load404Page();
+				}
+				return false;
+			}
+			Pages.renderArtist(data);
+		})
+	},
+	
+	loadSearchPage: function() {
+		Ajax.setArchor('/search/');
+		$.get('/demo/search.html', function(data){
+			$('#data-container').html(data);
+		})
+	},
+	
+	loadWheePage: function() {
+		$.get('/demo/whee.html', function(data){
+			$('#data-container').html(data);
+		})
+	},
+	
+	load404Page: function() {
+		$.get('/demo/404.html', function(data){
+			$('#data-container').html(data);
+		})
+	},
+	
+	setArchor: function(anchor) {
+		window.location = '#'+ anchor;
+	},
+	
+	getAnchor: function() {
+		var tmp = window.location.href.split('#');
+		if (typeof tmp[1] !== 'undefined') {
+			return tmp[1];
+		}
+		return '';
+	},
+
+	detectStartPage: function() {
+		if (m = this.getAnchor().match(/\/artist\/(.+)\//)) {
+			this.loadArtistData(m[1]);
+		} else if (this.getAnchor() === '' || this.getAnchor().match(/\/search\//)) {
+			this.loadSearchPage();
+		} else {
+			this.load404Page();
+		}
+	}
+}
+
+
+$(function(){
+	$('a.data.artist').live('click', function(){
+		Ajax.loadArtistData($(this).html());
+		return false;
+	});
+	$('.search').live('click', function(){
+		Ajax.loadSearchPage();
+		return false;
+	});
+	$('#search_form').live('submit', function(){
+		$('.autocomplete-container').remove();
+		Ajax.loadArtistData($('#search_field').val());
+		return false;
+	});
+})

public/javascripts/beathaven/layout.js

@@ -7,7 +7,7 @@ var beathaven = {
 	init: function () {
 		this.drawInterface();
 		this.adjustSizes();
-		loadSearchPage();
+		Ajax.detectStartPage();
 	},
 	drawInterface: function() {
 	},

public/javascripts/beathaven/pages.js

@@ -53,34 +53,4 @@ var Pages = {
 		
 		$('#data-container').html('').append(artist_info).append(albums_info).scrollbar();
 	}
-}
-
-/*
-
-<div class="albums">
-	<div class="album">
-		<h2 class="name">Get Born</h2>
-		<div class="pic">
-			<img src="pics/getborn.jpg" alt="Get Born by Jet" width="250" />
-			<div class="add-album">Add to playlist</div>
-		</div>
-		<div class="tracklist">
-			<ul>
-				<li>
-					<div class="trackname">Last Chance</div>
-					<div class="length">1:52</div>
-				</li>
-				<li>
-					<div class="trackname">Are You Gonna Be My Girl</div>
-					<div class="length">3:34</div>
-				</li>
-				<li>
-					<div class="trackname">Rollover DJ</div>
-					<div class="length">3:17</div>
-				</li>
-			</ul>
-		</div>
-	</div>
-</div>
-
-*/
+}

public/javascripts/jquery/jquery.contentchange.js

@@ -0,0 +1,19 @@
+(function(){
+	var interval;
+	jQuery.event.special.contentchange = {
+		setup: function() {
+			var self = this,
+			$this = $(this),
+			$originalContent = $this.text();
+			interval = setInterval(function() {
+				if ($originalContent != $this.text()) {
+						$originalContent = $this.text();
+					jQuery.event.handle.call(self, {type:'contentchange'});
+				}
+			}, 100);
+		},
+		teardown: function() {
+			clearInterval(interval);
+		}
+	};
+})();