wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Suggest mount point name, don't reload custom javascript file

Browse source
This commit is contained in:
Michael Gapczynski 2012-08-13 17:09:37 -04:00
parent 98c7d40fcd
commit d3bdab286b
1 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
apps/files_external/js/settings.js
View file

@ -1,4 +1,4 @@
OC.MountConfig={
OC.MountConfig={
saveStorage:function(tr) {
var mountPoint = $(tr).find('.mountPoint input').val();
if (mountPoint == '') {
@ -63,6 +63,7 @@ OC.MountConfig={
var applicable = OC.currentUser;
$.post(OC.filePath('files_external', 'ajax', 'addMountPoint.php'), { mountPoint: mountPoint, class: backendClass, classOptions: classOptions, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
}
return true;
}
}
}
@ -77,6 +78,10 @@ $(document).ready(function() {
var selected = $(this).find('option:selected').text();
var backendClass = $(this).val();
$(this).parent().text(selected);
if ($(tr).find('.mountPoint input').val() == '') {
$(tr).find('.mountPoint input').val(suggestMountPoint(selected.replace(/\s+/g, '')));
}
$(tr).addClass(backendClass);
$(tr).find('.backend').data('class', backendClass);
var configurations = $(this).data('configurations');
var td = $(tr).find('td.configuration');
@ -95,7 +100,7 @@ $(document).ready(function() {
td.append('<input type="text" data-parameter="'+parameter+'" placeholder="'+placeholder+'" />');
}
});
if (parameters['custom']) {
if (parameters['custom'] && $('#externalStorage tbody tr.'+backendClass).length == 1) {
OC.addScript('files_external', parameters['custom']);
}
return false;
@ -108,6 +113,28 @@ $(document).ready(function() {
$(this).remove();
});
function suggestMountPoint(defaultMountPoint) {
var i = 1;
var append = '';
var match = true;
while (match && i < 20) {
match = false;
$('#externalStorage tbody td.mountPoint input').each(function(index, mountPoint) {
if ($(mountPoint).val() == defaultMountPoint+append) {
match = true;
return false;
}
});
if (match) {
append = i;
i++;
} else {
break;
}
}
return defaultMountPoint+append;
}
$('#externalStorage td').live('change', function() {
OC.MountConfig.saveStorage($(this).parent());
});