From 22812c5f0dc57b1598912cf51fd1e5b721519f2d Mon Sep 17 00:00:00 2001 From: Jörn Friedrich Dreyer Date: Fri, 18 Jan 2013 22:38:44 +0100 Subject: replace live() with on() in core js --- apps/files/js/files.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/files/js/files.js') diff --git a/apps/files/js/files.js b/apps/files/js/files.js index c817d8431e2..9fd9b73a947 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -110,7 +110,7 @@ $(document).ready(function() { } // Triggers invisible file input - $('#upload a').live('click', function() { + $('#upload a').on('click', function() { $(this).parent().children('#file_upload_start').trigger('click'); return false; }); @@ -118,7 +118,7 @@ $(document).ready(function() { var lastChecked; // Sets the file link behaviour : - $('td.filename a').live('click',function(event) { + $('td.filename').on('click','a',function(event) { if (event.ctrlKey || event.shiftKey) { event.preventDefault(); if (event.shiftKey) { @@ -184,7 +184,7 @@ $(document).ready(function() { procesSelection(); }); - $('td.filename input:checkbox').live('change',function(event) { + $('#fileList').on('change', 'td.filename input:checkbox',function(event) { if (event.shiftKey) { var last = $(lastChecked).parent().parent().prevAll().length; var first = $(this).parent().parent().prevAll().length; -- cgit v1.2.3 From 263c3f3a4222b77ef7a8169443435552a88f0a48 Mon Sep 17 00:00:00 2001 From: Jörn Friedrich Dreyer Date: Wed, 30 Jan 2013 17:10:40 +0100 Subject: attach on to filelist instead of individual td elements for file link behaviour --- apps/files/js/files.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/files/js/files.js') diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 9fd9b73a947..ed240214104 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -118,7 +118,7 @@ $(document).ready(function() { var lastChecked; // Sets the file link behaviour : - $('td.filename').on('click','a',function(event) { + $('#fileList').on('click','td.filename a',function(event) { if (event.ctrlKey || event.shiftKey) { event.preventDefault(); if (event.shiftKey) { -- cgit v1.2.3 From c1072d0c09428525929a5e6154738245a23e5225 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Thu, 31 Jan 2013 23:26:40 +0100 Subject: call ajax scan only if a user is logged in - otherwise we'll get a 500 --- apps/files/js/files.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'apps/files/js/files.js') diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 3d09d6aa2b6..8aec701e53f 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -776,6 +776,10 @@ $(document).ready(function() { }); function scanFiles(force, dir){ + if (!OC.currentUser) { + return; + } + if(!dir){ dir = ''; } -- cgit v1.2.3 value='dependabot/maven/org.codehaus.mojo-flatten-maven-plugin-1.4.0'>dependabot/maven/org.codehaus.mojo-flatten-maven-plugin-1.4.0 A seamless aspect-oriented extension to the Java programming language: https://github.com/eclipse-aspectj/aspectjwww-data
aboutsummaryrefslogtreecommitdiffstats
blob: f7b949a927a916c263d03f1836f16bb3a4106467 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35