[Slim-Checkins] r11806 - in /branches/6.5/server/Slim/Buttons: Block.pm XMLBrowser.pm

[andy at svn.slimdevices.com]

Author: andy
Date: Tue Apr 24 11:22:28 2007
New Revision: 11806

URL: http://svn.slimdevices.com?rev=11806&view=rev
Log:
Remove 'Fetching...' text from XMLBrowser while loading a remote URL.  Allow client->block() to work as expected with no params

Modified:
    branches/6.5/server/Slim/Buttons/Block.pm
    branches/6.5/server/Slim/Buttons/XMLBrowser.pm

Modified: branches/6.5/server/Slim/Buttons/Block.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Block.pm?rev=11806&r1=11805&r2=11806&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Block.pm (original)
+++ branches/6.5/server/Slim/Buttons/Block.pm Tue Apr 24 11:22:28 2007
@@ -97,7 +97,11 @@
 
 	my $parts  = $line1;
 
-	if (ref($line1) ne 'HASH') {
+	if ( !$line1 ) {
+		# Default to what's currently on the screen
+		$parts = $client->curDisplay();
+	}
+	elsif (ref($line1) ne 'HASH') {
 
 		$parts = $client->parseLines([$line1, shift]);
 	}

Modified: branches/6.5/server/Slim/Buttons/XMLBrowser.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/XMLBrowser.pm?rev=11806&r1=11805&r2=11806&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/XMLBrowser.pm (original)
+++ branches/6.5/server/Slim/Buttons/XMLBrowser.pm Tue Apr 24 11:22:28 2007
@@ -77,14 +77,7 @@
 		my $item = $client->param('item');
 
 		# give user feedback while loading
-		my $string = $client->modeParam('header') 
-			? ( $client->string( $client->modeParam('header') ) || $client->string('XML_LOADING') )
-			: $client->string('XML_LOADING');
-
-		$client->block(
-			$string,
-			$title || $url,
-		);
+		$client->block();
 		
 		# Some plugins may give us a callback we should use to get OPML data
 		# instead of fetching it ourselves.
@@ -768,10 +761,7 @@
 
 		# URL is remote, load it asynchronously...
 		# give user feedback while loading
-		$client->block(
-			$client->string('XML_LOADING'),
-			$title || $url,
-		);
+		$client->block();
 		
 		# we may have a callback as URL
 		if ( ref $url eq 'CODE' ) {