[Slim-Checkins] r12497 - in /trunk/server: HTML/EN/settings/server/wizard.html Slim/Web/Settings/Server/Wizard.pm

[mherger at svn.slimdevices.com]

Author: mherger
Date: Mon Aug  6 09:43:33 2007
New Revision: 12497

URL: http://svn.slimdevices.com?rev=12497&view=rev
Log:
Bug: n/a
Description: remove some legacy code

Modified:
    trunk/server/HTML/EN/settings/server/wizard.html
    trunk/server/Slim/Web/Settings/Server/Wizard.pm

Modified: trunk/server/HTML/EN/settings/server/wizard.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/wizard.html?rev=12497&r1=12496&r2=12497&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/server/wizard.html (original)
+++ trunk/server/HTML/EN/settings/server/wizard.html Mon Aug  6 09:43:33 2007
@@ -11,21 +11,9 @@
 		<script type="text/javascript" src="/html/ext/adapter/ext/ext-base.js"></script>
 		<script type="text/javascript" src="/html/ext/ext-all.js"></script>
 
-		<script type="text/javascript">		
-			function getSelected() {
-				var selected = tree.getSelectionModel().getSelectedNode();
-
-				if (selected != null && selected.id) {
-					alert("[% "SETUP_OK_USING" | string %]\n" + selected.id);
-				}
-				else {
-					alert("nothing selected");
-				}
-			}
-
+		<script type="text/javascript">
 			var firstpage = [% showLanguage ? 1 : 0 %];
 			var showproxy = [% showProxy %];
-			var audiodir_tree = "[% audiodir_tree %]";
 			var showitunes = [% showiTunes ? 1 : 0 %];
 
 			Ext.onReady(function(){
@@ -40,8 +28,7 @@
 				});
 
 				new FileSelector('itunespathselector', {
-					filter: 'foldersonly',
-					input: '.xml'
+					input: 'xml_path'
 				});
 			});
 		</script>

Modified: trunk/server/Slim/Web/Settings/Server/Wizard.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Server/Wizard.pm?rev=12497&r1=12496&r2=12497&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Server/Wizard.pm (original)
+++ trunk/server/Slim/Web/Settings/Server/Wizard.pm Mon Aug  6 09:43:33 2007
@@ -60,17 +60,6 @@
 		}
 	}
 
-	# build the tree for the currently set music path
-	# The tree control is expecting something like 
-	# |/|/home|/home/myself|/home/myself/music
-	my $prev = '';
-	foreach (split /\//, $prefs->get('audiodir')) {
-		if ($_) {
-			$prev .= "/$_";
-			$paramRef->{'audiodir_tree'} .= '|' . $prev;
-		}
-	}
-
 	$paramRef->{'showiTunes'} = (preferences('plugin.itunes')->get('xml_file') || Slim::Plugin::iTunes::Common->canUseiTunesLibrary() == undef);
 	$paramRef->{'showProxy'} = $showProxy;
 	$paramRef->{'languageoptions'} = Slim::Utils::Strings::languageOptions();