From 4dba91838ff24202fa7e184469074b61a4872d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 8 Oct 2012 10:28:29 +0200
Subject: [PATCH] add ID to upload form and check if ID exist to avoid loading
invalid javascript code for read-only views.
---
apps/files/js/files.js | 5 +++--
apps/files/templates/index.php | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index c7f4c4ce08..b36e46813d 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -199,7 +199,8 @@ $(document).ready(function() {
$(document).bind('drop dragover', function (e) {
e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
});
-
+
+ if ( document.getElementById("data-upload-form") ) {
$(function() {
$('.file_upload_start').fileupload({
dropZone: $('#content'), // restrict dropZone to content div
@@ -413,7 +414,7 @@ $(document).ready(function() {
}
})
});
-
+ }
$.assocArraySize = function(obj) {
// http://stackoverflow.com/a/6700/11236
var size = 0, key;
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index aff484f0a7..d49f2f4d5d 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -12,7 +12,7 @@
</ul>
</div>
<div class="file_upload_wrapper svg">
- <form data-upload-id='1' class="file_upload_form" action="<?php echo OCP\Util::linkTo('files', 'ajax/upload.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target_1">
+ <form data-upload-id='1' id="data-upload-form" class="file_upload_form" action="<?php echo OCP\Util::linkTo('files', 'ajax/upload.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target_1">
<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
--
GitLab