summaryrefslogtreecommitdiffstats
path: root/apps/files_external/js/dropbox.js
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-02-08 00:11:54 +0100
committerRobin Appelman <icewind@owncloud.com>2013-02-08 00:11:54 +0100
commitf93f9dd50cce6b6e2ed4eeca2d34b2bac82e0350 (patch)
treec76b2eabb63ed308eb882468cb2a74042e6f9d53 /apps/files_external/js/dropbox.js
parent697536cf6ad1c9a862c32605b807172dfa680d22 (diff)
parent3bd33b69a1c37cee5c3d180ec8952a611aabb4d1 (diff)
downloadnextcloud-server-f93f9dd50cce6b6e2ed4eeca2d34b2bac82e0350.tar.gz
nextcloud-server-f93f9dd50cce6b6e2ed4eeca2d34b2bac82e0350.zip
merge master into trash_fileactions
Diffstat (limited to 'apps/files_external/js/dropbox.js')
-rw-r--r--apps/files_external/js/dropbox.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index a9a3155e677..cd3c957e0a8 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -36,7 +36,7 @@ $(document).ready(function() {
}
});
- $('#externalStorage tbody tr input').live('keyup', function() {
+ $('#externalStorage tbody').on('keyup', 'tr input', function() {
var tr = $(this).parent().parent();
if ($(tr).hasClass('\\\\OC\\\\Files\\\\Storage\\\\Dropbox') && $(tr).find('[data-parameter="configured"]').val() != 'true') {
var config = $(tr).find('.configuration');
@@ -52,7 +52,7 @@ $(document).ready(function() {
}
});
- $('.dropbox').live('click', function(event) {
+ $('.dropbox').on('click', function(event) {
event.preventDefault();
var app_key = $(this).parent().find('[data-parameter="app_key"]').val();
var app_secret = $(this).parent().find('[data-parameter="app_secret"]').val();