summaryrefslogtreecommitdiffstats
path: root/apps/files_versions/js
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-08-18 00:38:52 +0200
committerkondou <kondou@ts.unde.re>2013-08-18 00:38:52 +0200
commitedd92e4c09151238a89816186914f9382293ab9b (patch)
treee25d87cecf45ff2c2189198e5369f7754e01873a /apps/files_versions/js
parent1348330c7d75d2b60d845a43be57dedc6199ea1a (diff)
parent12f4494de02457d51004ca6a82c1b2160189819f (diff)
downloadnextcloud-server-edd92e4c09151238a89816186914f9382293ab9b.tar.gz
nextcloud-server-edd92e4c09151238a89816186914f9382293ab9b.zip
Merge branch 'master' into fix_jslint_kondou
Conflicts: apps/files/js/file-upload.js
Diffstat (limited to 'apps/files_versions/js')
-rw-r--r--apps/files_versions/js/versions.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index 9c3c74721f0..f57e931bad9 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -104,9 +104,9 @@ function createVersionsDropdown(filename, files) {
success: function(result) {
var versions = result.data.versions;
if (result.data.endReached === true) {
- document.getElementById("show-more-versions").style.display="none";
+ $("#show-more-versions").css("display", "none");
} else {
- document.getElementById("show-more-versions").style.display="block";
+ $("#show-more-versions").css("display", "block");
}
if (versions) {
$.each(versions, function(index, row) {
@@ -132,8 +132,6 @@ function createVersionsDropdown(filename, files) {
var download ='<a href="' + path + "?file=" + files + '&revision=' + revision.version + '">';
download+='<img';
download+=' src="' + OC.imagePath('core', 'actions/download') + '"';
- download+=' id="' + revision.version + '"';
- download+=' value="' + files + '"';
download+=' name="downloadVersion" />';
download+=name;
download+='</a>';
@@ -143,8 +141,6 @@ function createVersionsDropdown(filename, files) {
revert+=' value="' + files + '">';
revert+='<img';
revert+=' src="' + OC.imagePath('core', 'actions/history') + '"';
- revert+=' id="' + revision.version + '"';
- revert+=' value="' + files + '"';
revert+=' name="revertVersion"';
revert+='/>'+t('files_versions', 'Restore')+'</span>';