[Slim-Checkins] r12511 - in /trunk/server/HTML/EN: html/fileselector.js html/wizard.js settings/server/wizard.html

[mherger at svn.slimdevices.com]

Author: mherger
Date: Wed Aug  8 13:39:53 2007
New Revision: 12511

URL: http://svn.slimdevices.com?rev=12511&view=rev
Log:
Bug: n/a
Description: add support for UNC paths on Windows

Modified:
    trunk/server/HTML/EN/html/fileselector.js
    trunk/server/HTML/EN/html/wizard.js
    trunk/server/HTML/EN/settings/server/wizard.html

Modified: trunk/server/HTML/EN/html/fileselector.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/fileselector.js?rev=12511&r1=12510&r2=12511&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/fileselector.js (original)
+++ trunk/server/HTML/EN/html/fileselector.js Wed Aug  8 13:39:53 2007
@@ -117,7 +117,7 @@
 	selectMyPath: function(){
 		// select the current setting, if available
 		input = Ext.get(this.input);
-		if (input != null && input.dom.value != null) {
+		if (input != null && input.dom.value != null && input.dom.value != '') {
 			separator = '/';
 			if (input.dom.value.match(/^[a-z]:\\/i)){
 				separator = '\\';
@@ -133,7 +133,22 @@
 				prev += (x==0 ? '' : separator) + path[x];
 				target += '|' + prev;
 			}
-			this.selectPath(target);
+
+			this.selectPath(target, null, function(success, selNode){
+				if (!success) {
+					// if that path is a Windows share, try adding it to the tree
+					result = input.dom.value.match(/^\\\\[\_\w\-]+\\[\-\_\w ]+[^\\]/);
+					if (result) {
+						root = this.getRootNode();
+						root.appendChild(new Ext.tree.AsyncTreeNode({
+							id: result[0],
+							text: result[0],
+							iconCls: 'x-tree-node-alwayscollapsed'
+						}));
+						this.selectMyPath();
+					}
+				}
+			}.createDelegate(this));
 		}
 	},
 

Modified: trunk/server/HTML/EN/html/wizard.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/wizard.js?rev=12511&r1=12510&r2=12511&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/wizard.js (original)
+++ trunk/server/HTML/EN/html/wizard.js Wed Aug  8 13:39:53 2007
@@ -34,7 +34,8 @@
 
 			folderselectors['audiodir'] = new FileSelector('audiodirselector', {
 				filter: 'foldersonly',
-				input: 'audiodir'
+				input: 'audiodir',
+				gotoBtn: 'gotoAudiodir'
 			});
 
 			folderselectors['itunes'] = new FileSelector('itunespathselector', {

Modified: trunk/server/HTML/EN/settings/server/wizard.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/wizard.html?rev=12511&r1=12510&r2=12511&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/server/wizard.html (original)
+++ trunk/server/HTML/EN/settings/server/wizard.html Wed Aug  8 13:39:53 2007
@@ -151,13 +151,19 @@
 			<div id="audiodir_m" class="page">
 				<div>[% "SETUP_WIZARD_AUDIODIR_DESC" | string %]</div>
 				<div id="audiodirselector"></div>
-				<div><input type="text" name="audiodir" id="audiodir" value="[% prefs.audiodir %]" class="stdedit" size="50"></div>
+				<div>
+					<input type="text" name="audiodir" id="audiodir" value="[% prefs.audiodir %]" class="stdedit" size="50">
+					<input type="button" class="stdedit" name="gotoAudiodir" id="gotoAudiodir" value="&gt;">
+				</div>
 			</div>
 
 			<div id="itunes_m" class="page">
 				<div>[% "SETUP_WIZARD_ITUNES_DESC" | string %]</div>
 				<div id="itunespathselector"></div>
-				<div><input type="text" name="xml_path" id="xml_path" value="[% prefs.xml_path %]" class="stdedit" size="50"></div>
+				<div>
+					<input type="text" name="xml_path" id="xml_path" value="[% prefs.xml_path %]" class="stdedit" size="50">
+					<input type="button" class="stdedit" name="gotoiTunesDir" id="gotoiTunesDir" value="&gt;">
+				</div>
 			</div>
 
 			<div id="musicip_m" class="page">