mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Fix checkInputs error in media upload.

Browse Source
This commit is contained in:
Matthias Mees 2013-06-07 23:30:13 +02:00
parent 3472e11ef8
commit 0feb4c18c2
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
templates/2k11/admin/media_upload.tpl
View File

@ -34,18 +34,18 @@
<div id="upload_template" class="hidden"> <div id="upload_template" class="hidden">
<div class="form_field clearfix"> <div class="form_field clearfix">
<label for="userfile_0" class="uploadform_userfile_label">{$CONST.ENTER_MEDIA_UPLOAD}</label> <label for="userfile_1" class="uploadform_userfile_label">{$CONST.ENTER_MEDIA_UPLOAD}</label>
<input id="userfile_0" class="uploadform_userfile" name="serendipity[userfile][1]" type="file" onchange="checkInputs();"> <input id="userfile_1" class="uploadform_userfile" name="serendipity[userfile][1]" type="file" onchange="checkInputs();">
</div> </div>
<div class="form_field clearfix"> <div class="form_field clearfix">
<label for="target_filename_0" class="uploadform_target_filename_label">{$CONST.SAVE_FILE_AS} <span class="input-desc image-upload">{$CONST.PLAIN_ASCII_NAMES}</span></label> <label for="target_filename_1" class="uploadform_target_filename_label">{$CONST.SAVE_FILE_AS} <span class="input-desc image-upload">{$CONST.PLAIN_ASCII_NAMES}</span></label>
<input id="target_filename_0" class="uploadform_target_filename" name="serendipity[target_filename][1]" type="text" value=""> <input id="target_filename_1" class="uploadform_target_filename" name="serendipity[target_filename][1]" type="text" value="">
</div> </div>
<div class="form_select clearfix"> <div class="form_select clearfix">
<label for="target_directory_0" class="uploadform_target_directory_label">{$CONST.STORE_IN_DIRECTORY}</label> <label for="target_directory_1" class="uploadform_target_directory_label">{$CONST.STORE_IN_DIRECTORY}</label>
<select id="target_directory_0" class="uploadform_target_directory" name="serendipity[target_directory][1]"> <select id="target_directory_1" class="uploadform_target_directory" name="serendipity[target_directory][1]">
<option value="">{$CONST.BASE_DIRECTORY}</option> <option value="">{$CONST.BASE_DIRECTORY}</option>
{foreach from=$media.folders item="folder"} {foreach from=$media.folders item="folder"}
<option{if $media.only_path == $folder.relpath} selected{/if} value="{$folder.relpath}">{'&nbsp;'|@str_repeat:($folder.depth*2)} {$folder.name}</option> <option{if $media.only_path == $folder.relpath} selected{/if} value="{$folder.relpath}">{'&nbsp;'|@str_repeat:($folder.depth*2)} {$folder.name}</option>
@ -53,7 +53,7 @@
</select> </select>
</div> </div>
<div id="ccounter"><input id="column_count_0" class="uploadform_column_count" type="hidden" name="serendipity[column_count][1]" value="true"></div> <div id="ccounter"><input id="column_count_1" class="uploadform_column_count" type="hidden" name="serendipity[column_count][1]" value="true"></div>
</div> </div>
<div id="debug"></div> <div id="debug"></div>

21
templates/2k11/admin/serendipity_editor.js.tpl
View File

@ -435,12 +435,15 @@ function treeToggleAll() {
} }
// Used by media_upload.tpl to …? // Used by media_upload.tpl to …?
function getfilename(value) {
re = /^.+[\/\\]+?(.+)$/;
return value.replace(re, "$1");
}
var inputStorage = new Array(); var inputStorage = new Array();
function checkInputs() { function checkInputs() {
var fieldcount = $('.uploadform_userfile').length; for (i = 1; i <= upload_fieldcount; i++) {
for (i = 1; i <= fieldcount; i++) {
if (!inputStorage[i]) { if (!inputStorage[i]) {
fillInput(i, i); fillInput(i, i);
} else if (inputStorage[i] == document.getElementById('target_filename_' + i).value) { } else if (inputStorage[i] == document.getElementById('target_filename_' + i).value) {
@ -449,7 +452,6 @@ function checkInputs() {
} }
} }
// Helper function for checkInputs()
function fillInput(source, target) { function fillInput(source, target) {
useDuplicate = false; useDuplicate = false;
@ -470,18 +472,13 @@ function fillInput(source, target) {
if (useDuplicate) { if (useDuplicate) {
tkey = target + 1; tkey = target + 1;
if (!inputStorage[tkey] || inputStorage[tkey] == document.getElementById('target_filename_' + tkey).value) {ldelim} if (!inputStorage[tkey] || inputStorage[tkey] == document.getElementById('target_filename_' + tkey).value) {
document.getElementById('target_filename_' + (target+1)).value = sourceval; document.getElementById('target_filename_' + (target+1)).value = sourceval;
inputStorage[target + 1] = '~~~'; inputStorage[target + 1] = '~~~';
} }
} }
} }
// end …?
// Helper function for fillInput()
function getfilename(value) {
re = /^.+[\/\\]+?(.+)$/;
return value.replace(re, "$1");
}
// Hides the foreign upload form if batch upload is used (if more // Hides the foreign upload form if batch upload is used (if more
// images are added) // images are added)
@ -497,7 +494,7 @@ function rememberUploadOptions() {
// Clones the upload form template // Clones the upload form template
function addUploadField() { function addUploadField() {
var upload_fieldcount = $('.uploadform_userfile').length; upload_fieldcount = $('.uploadform_userfile').length + 1;
var $fields = $('#upload_template').clone(); var $fields = $('#upload_template').clone();
$fields.attr('id', 'upload_form_' + upload_fieldcount); $fields.attr('id', 'upload_form_' + upload_fieldcount);