From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sun, 25 Sep 2011 11:42:58 +0000 (+0300)
Subject: Revert "web intf: fix uri decoding when browsing."
X-Git-Tag: 1.2.0-pre1~588
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2c1d110d73977783fbfe3362505d026f11200400;p=vlc

Revert "web intf: fix uri decoding when browsing."

This reverts commit fb9bbdc9a43b4bcb52141122f0a53eec862067ca.
---

diff --git a/share/lua/http/js/controlers.js b/share/lua/http/js/controlers.js
index 5d3e3381e1..fb21dd531d 100644
--- a/share/lua/http/js/controlers.js
+++ b/share/lua/http/js/controlers.js
@@ -172,11 +172,11 @@ function browse(dir){
 			$('#browse_elements').empty();
             $('element',data).each(function(){
 				if($(this).attr('type')=='dir' || $.inArray($(this).attr('name').substr(-3),video_types)!=-1 || $.inArray($(this).attr('name').substr(-3),audio_types)!=-1){
-					$('#browse_elements').append(createElementLi($(this).attr('name'),$(this).attr('type'),$(this).attr('uri'),$(this).attr('name').substr(-3)));
+					$('#browse_elements').append(createElementLi($(this).attr('name'),$(this).attr('type'),$(this).attr('path'),$(this).attr('name').substr(-3)));
 				}
 			});
 			$('[opendir]').dblclick(function(){
-				browse(decodeURIComponent($(this).attr('opendir')).substring(7));
+				browse($(this).attr('opendir'));
 			});
 			$('[openfile]').dblclick(function(){
 				switch(tgt){
@@ -195,7 +195,7 @@ function browse(dir){
 					case '#mobile':
 						break;
 					default:
-						sendCommand('command=in_play&input='+encodeURIComponent($(this).attr('openfile')));
+						sendCommand('command=in_play&input=file://'+encodeURIComponent($(this).attr('openfile')));
 						break;
 				}
 				$('#window_browse').dialog('close');
@@ -212,7 +212,7 @@ function browse(dir){
 			$('[openfile]').click(function(){
 				switch(tgt){
 					case '#mobile':
-						sendCommand('command=in_play&input='+encodeURIComponent($(this).attr('openfile')),"window.location='mobile.html'");
+						sendCommand('command=in_play&input=file://'+encodeURIComponent($(this).attr('openfile')),"window.location='mobile.html'");
 						break;
 					default:
 						break;