aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_external/js/dropbox.js
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2013-02-11 20:27:05 -0500
committerMichael Gapczynski <mtgap@owncloud.com>2013-02-11 20:27:05 -0500
commit6eba790a75ba128e3182771a30dbe88733ee0dfc (patch)
treeba313bec694c64928d82e2b76445d6307a305b22 /apps/files_external/js/dropbox.js
parent6f08b1f829e9d4c49f66b19fdda8c229bc8ae3f3 (diff)
parent04bf8c1b66d6adef0466efae00c32745465767f2 (diff)
downloadnextcloud-server-6eba790a75ba128e3182771a30dbe88733ee0dfc.tar.gz
nextcloud-server-6eba790a75ba128e3182771a30dbe88733ee0dfc.zip
Merge branch 'master' into external_storage_ui_feedback
Conflicts: apps/files_external/js/dropbox.js apps/files_external/js/google.js apps/files_external/js/settings.js apps/files_external/lib/amazons3.php apps/files_external/lib/dropbox.php apps/files_external/lib/google.php apps/files_external/lib/smb.php apps/files_external/lib/swift.php apps/files_external/lib/webdav.php lib/filestorage.php
Diffstat (limited to 'apps/files_external/js/dropbox.js')
-rw-r--r--apps/files_external/js/dropbox.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index 9314a4c7927..a8bbb7b02e2 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -1,6 +1,6 @@
$(document).ready(function() {
- $('#externalStorage tbody tr.OC_Filestorage_Dropbox').each(function() {
+ $('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox').each(function() {
var configured = $(this).find('[data-parameter="configured"]');
if ($(configured).val() == 'true') {
$(this).find('.configuration input').attr('disabled', 'disabled');
@@ -37,18 +37,18 @@ $(document).ready(function() {
}
});
- $('#externalStorage tbody tr.OC_Filestorage_Dropbox td').live('paste', function() {
+ $('#externalStorage tbody').on('paste', 'tr.OC_Filestorage_Dropbox td', function() {
var tr = $(this).parent();
setTimeout(function() {
onDropboxInputsChange(tr);
}, 20);
});
- $('#externalStorage tbody tr.OC_Filestorage_Dropbox td').live('keyup', function() {
+ $('#externalStorage tbody').on('keyup', 'tr.OC_Filestorage_Dropbox td', function() {
onDropboxInputsChange($(this).parent());
});
- $('#externalStorage tbody tr.OC_Filestorage_Dropbox .chzn-select').live('change', function() {
+ $('#externalStorage tbody').on('change', 'tr.OC_Filestorage_Dropbox .chzn-select', function() {
onDropboxInputsChange($(this).parent().parent());
});
@@ -72,7 +72,7 @@ $(document).ready(function() {
}
}
- $('.dropbox').live('click', function(event) {
+ $('.dropbox').on('click', function(event) {
event.preventDefault();
var tr = $(this).parent().parent();
var app_key = $(this).parent().find('[data-parameter="app_key"]').val();