diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-01-31 10:55:59 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-01-31 10:55:59 +0100 |
| commit | 54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7 (patch) | |
| tree | 48c2eb0ad04a4bd921f223258e41beba2e2c6539 /apps/files_external/js/dropbox.js | |
| parent | 9c83b307f6d49f30c4cc6db7258d7e3851bac0b7 (diff) | |
| parent | 00a30e665128352e9b20268ea65400a968903c74 (diff) | |
| download | nextcloud-server-54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7.tar.gz nextcloud-server-54eeb8b8fcff13d29ae363e7ca5e6da707fdd6b7.zip | |
fix merge conflict
Diffstat (limited to 'apps/files_external/js/dropbox.js')
| -rw-r--r-- | apps/files_external/js/dropbox.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js index c1e38640708..a9a3155e677 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'); @@ -38,7 +38,7 @@ $(document).ready(function() { $('#externalStorage tbody tr input').live('keyup', function() { var tr = $(this).parent().parent(); - if ($(tr).hasClass('OC_Filestorage_Dropbox') && $(tr).find('[data-parameter="configured"]').val() != 'true') { + if ($(tr).hasClass('\\\\OC\\\\Files\\\\Storage\\\\Dropbox') && $(tr).find('[data-parameter="configured"]').val() != 'true') { var config = $(tr).find('.configuration'); if ($(tr).find('.mountPoint input').val() != '' && $(config).find('[data-parameter="app_key"]').val() != '' && $(config).find('[data-parameter="app_secret"]').val() != '') { if ($(tr).find('.dropbox').length == 0) { |