From 1e2a082cd29cef0f6a7c56402720fd005f2bf292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 22 Feb 2018 12:13:35 +0100 Subject: [PATCH 01/14] Use popovermenu instead of dropdown and small fix to popovermenu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_external/css/settings.css | 8 ++- apps/files_external/js/settings.js | 78 +++++++++++----------- apps/files_external/templates/settings.php | 6 +- core/css/apps.scss | 23 +++---- 4 files changed, 57 insertions(+), 58 deletions(-) diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css index bac89e26b0..7aa7ab1a6b 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.css @@ -30,9 +30,15 @@ td.mountPoint, td.backend { width:160px; } #addMountPoint>td.applicable { visibility:hidden; } #addMountPoint>td.hidden { visibility:hidden; } +#externalStorage td.mountOptionsToggle { + position: relative; + padding: 0 !important; + width: 44px; +} #externalStorage .icon-settings { - padding: 11px 20px; + padding: 14px; vertical-align: text-bottom; + cursor: pointer; } #selectBackend { diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index cb9b7ad682..bb34bc4ebc 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -12,31 +12,42 @@ // TODO: move to a separate file var MOUNT_OPTIONS_DROPDOWN_TEMPLATE = - '
' + - // FIXME: options are hard-coded for now - '
' + - ' ' + - ' ' + - '
' + - '
' + - ' ' + - ' ' + - '
' + - '
' + - ' ' + - ' ' + - '
' + - '
' + - ' ' + - ' ' + - '
' + - '
' + - ' ' + - ' ' + - '
' + + '
'+ + '
    '+ + '
  • '+ + ' '+ + ' '+ + ' '+ + ' '+ + '
    • '+ + '
  • '+ + ' '+ + ' '+ + ' '+ + ' '+ + '
    • '+ + '
  • '+ + ' '+ + ' '+ + ' '+ + ' '+ + '
    • '+ + '
  • '+ + ' '+ + ' '+ + ' '+ + ' '+ + '
    • '+ + '
  • '+ + ' '+ + ' '+ + ' '+ + ' '+ + '
    • '+ + '
'+ '
'; /** @@ -724,7 +735,7 @@ MountConfigListView.prototype = _.extend({ self.saveStorageConfig($(this).closest('tr')); }); - this.$el.on('click', 'td.mountOptionsToggle>img', function() { + this.$el.on('click', 'td.mountOptionsToggle>.icon-settings', function() { self._showMountOptionsDropdown($(this).closest('tr')); }); @@ -1278,11 +1289,6 @@ MountConfigListView.prototype = _.extend({ * @param {Object} $tr configuration row */ _showMountOptionsDropdown: function($tr) { - if (this._preventNextDropdown) { - // prevented because the click was on the toggle - this._preventNextDropdown = false; - return; - } var self = this; var storage = this.getStorageConfig($tr); var $toggle = $tr.find('.mountOptionsToggle'); @@ -1299,15 +1305,7 @@ MountConfigListView.prototype = _.extend({ dropDown.show($toggle, storage.mountOptions || [], visibleOptions); $('body').on('mouseup.mountOptionsDropdown', function(event) { var $target = $(event.target); - if ($toggle.has($target).length) { - // why is it always so hard to make dropdowns behave ? - // this prevents the click on the toggle to cause - // the dropdown to reopen itself - // (preventDefault doesn't work here because the click - // event is already in the queue and cannot be cancelled) - self._preventNextDropdown = true; - } - if ($target.closest('.dropdown').length) { + if ($target.closest('.popovermenu').length) { return; } dropDown.hide(); diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 237985bfd0..ac5b0d01a1 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -143,11 +143,7 @@ - <?php p($l->t('Advanced settings')); ?> +
diff --git a/core/css/apps.scss b/core/css/apps.scss index a92db4ed4a..50c48d132e 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -683,10 +683,9 @@ kbd { /* DROPDOWN ----------------------------------------------------------------- */ .dropdown { - background: nc-darken($color-main-background, 8%); - border-bottom-left-radius: 5px; - border-bottom-right-radius: 5px; - box-shadow: 0 1px 1px $color-box-shadow; + background: $color-main-background; + border-radius: 0 0 $border-radius $border-radius; + filter: drop-shadow(0 1px 3px $color-box-shadow); display: block; margin-right: 0; position: absolute; @@ -868,17 +867,17 @@ kbd { width: 16px; padding: 0 10px; } + /* checkbox/radio fixes */ + > input.radio + label, > input.checkbox + label { padding: 0 !important; - &::before { - margin: -2px 12px 0; - } + width: 100%; } - > input.radio + label { - padding: 0 !important; - &::before { - margin: -2px 11px 0; - } + > input.checkbox + label::before { + margin: -2px 12px 0; + } + > input.radio + label::before { + margin: -2px 11px 0; } } > button { From 3d2b3a13099a7949297543fe1950164897fcdb2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 22 Feb 2018 12:24:55 +0100 Subject: [PATCH 02/14] fixup! Use popovermenu instead of dropdown and small fix to popovermenu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/apps.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/css/apps.scss b/core/css/apps.scss index 50c48d132e..5b400c4629 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -683,9 +683,10 @@ kbd { /* DROPDOWN ----------------------------------------------------------------- */ .dropdown { - background: $color-main-background; - border-radius: 0 0 $border-radius $border-radius; - filter: drop-shadow(0 1px 3px $color-box-shadow); + background: nc-darken($color-main-background, 8%); + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; + box-shadow: 0 1px 1px $color-box-shadow; display: block; margin-right: 0; position: absolute; From 0cc520f3a0a91f9b316f973ff8877c8fc4bae7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 22 Feb 2018 13:09:06 +0100 Subject: [PATCH 03/14] Changed config saving feedback design MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- .../css/{settings.css => settings.scss} | 10 ++++------ apps/files_external/js/settings.js | 11 ++++++----- apps/files_external/templates/settings.php | 2 +- settings/css/settings.scss | 6 +++--- 4 files changed, 14 insertions(+), 15 deletions(-) rename apps/files_external/css/{settings.css => settings.scss} (97%) diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.scss similarity index 97% rename from apps/files_external/css/settings.css rename to apps/files_external/css/settings.scss index 7aa7ab1a6b..a92ae242dd 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.scss @@ -18,9 +18,11 @@ #externalStorage td.status > span { display: inline-block; - height: 16px; - width: 16px; + height: 28px; + width: 28px; vertical-align: text-bottom; + border-radius: 50%; + cursor: pointer; } td.mountPoint, td.backend { width:160px; } @@ -78,10 +80,6 @@ td.mountPoint, td.backend { width:160px; } top: 3px; } -#externalStorage td.status .success { - border-radius: 50%; -} - #userMountingBackends { padding-left: 25px; } diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index bb34bc4ebc..211740c564 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -1230,22 +1230,23 @@ MountConfigListView.prototype = _.extend({ */ updateStatus: function($tr, status, message) { var $statusSpan = $tr.find('.status span'); - $statusSpan.removeClass('loading-small success indeterminate error'); + $statusSpan.removeClass(); + console.log($tr, status, message); switch (status) { case null: // remove status break; case StorageConfig.Status.IN_PROGRESS: - $statusSpan.addClass('loading-small'); + $statusSpan.attr('class', 'icon-loading-small'); break; case StorageConfig.Status.SUCCESS: - $statusSpan.addClass('success'); + $statusSpan.attr('class', 'success icon-checkmark-white'); break; case StorageConfig.Status.INDETERMINATE: - $statusSpan.addClass('indeterminate'); + $statusSpan.attr('class', 'indeterminate icon-info-white'); break; default: - $statusSpan.addClass('error'); + $statusSpan.attr('class', 'error icon-error-white'); } $statusSpan.attr('data-original-title', (typeof message === 'string') ? message : ''); }, diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index ac5b0d01a1..98498eb2c3 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -110,7 +110,7 @@ > - + diff --git a/settings/css/settings.scss b/settings/css/settings.scss index 05d62423d1..7ed02f8d18 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -1105,14 +1105,14 @@ table.grid td.date { span { &.success { - background: #37ce02; + background-color: $color-success; border-radius: $border-radius; } &.error { - background: #ce3702; + background-color: $color-error; } &.indeterminate { - background: #e6db00; + background-color: $color-warning; border-radius: 40% 0; } } From 884605ac18dcbb54ee9743113ef4ce3b42fe30d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 22 Feb 2018 13:15:31 +0100 Subject: [PATCH 04/14] Better label styling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_external/css/settings.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/files_external/css/settings.scss b/apps/files_external/css/settings.scss index a92ae242dd..c781cd9bd1 100644 --- a/apps/files_external/css/settings.scss +++ b/apps/files_external/css/settings.scss @@ -65,9 +65,9 @@ td.mountPoint, td.backend { width:160px; } } #externalStorage td.configuration label { - min-width: 144px; /* 130px plus 2x7px padding */ - display: inline-block; - margin-right: 6px; + width: 100%; + display: inline-flex; + align-items: center; } #externalStorage td.configuration input.disabled-success { From 1f3eef94609b728179fe29084939931ecbd94df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 22 Feb 2018 13:32:00 +0100 Subject: [PATCH 05/14] fixup! Changed config saving feedback design MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_external/js/settings.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 211740c564..7f56fd4bb7 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -1230,8 +1230,6 @@ MountConfigListView.prototype = _.extend({ */ updateStatus: function($tr, status, message) { var $statusSpan = $tr.find('.status span'); - $statusSpan.removeClass(); - console.log($tr, status, message); switch (status) { case null: // remove status From 323dd310568447f3c63b8d9128c75a18a75c3527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 22 Feb 2018 15:04:23 +0100 Subject: [PATCH 06/14] Tooltip fix on status icon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_external/js/settings.js | 7 ++++++- apps/files_external/templates/settings.php | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 7f56fd4bb7..b0f71c0324 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -1246,7 +1246,12 @@ MountConfigListView.prototype = _.extend({ default: $statusSpan.attr('class', 'error icon-error-white'); } - $statusSpan.attr('data-original-title', (typeof message === 'string') ? message : ''); + if (typeof message === 'string') { + $statusSpan.attr('title', message); + $statusSpan.tooltip(); + } else { + $statusSpan.tooltip('destroy'); + } }, /** diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 98498eb2c3..1fb3245c6d 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -110,7 +110,7 @@ > - + From dab83c4a494f3c87200b086fceff364d16e85864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 22 Feb 2018 15:41:40 +0100 Subject: [PATCH 07/14] Select in popover fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_external/js/settings.js | 2 +- core/css/apps.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index b0f71c0324..eaaed02510 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -33,7 +33,7 @@ var MOUNT_OPTIONS_DROPDOWN_TEMPLATE = ' '+ ' '+ '
  • '+ - ' '+ + ' '+ ' '+ ' - <?php p($l->t('Delete')); ?> +
    - <?php p($l->t('Save')); ?> +
    From 0f229d23f716b6cfa81fb5ec67bc97e405bceb60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Mon, 26 Feb 2018 13:03:44 +0100 Subject: [PATCH 09/14] fixup! Fixed icons padding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_external/css/settings.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/files_external/css/settings.scss b/apps/files_external/css/settings.scss index 4f46ccb97e..15b2691d18 100644 --- a/apps/files_external/css/settings.scss +++ b/apps/files_external/css/settings.scss @@ -33,6 +33,7 @@ td.mountPoint, td.backend { width:160px; } #addMountPoint>td.hidden { visibility:hidden; } #externalStorage td { + height: 50px; &.mountOptionsToggle, &.remove, &.save { From 6b45d7e5499a4ae910e2697702c4063b6558297b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 27 Feb 2018 11:35:11 +0100 Subject: [PATCH 10/14] Fixed actions and header missing th MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_external/css/settings.scss | 8 ++++---- apps/files_external/js/settings.js | 6 +++--- apps/files_external/templates/settings.php | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/files_external/css/settings.scss b/apps/files_external/css/settings.scss index 15b2691d18..09beaf1205 100644 --- a/apps/files_external/css/settings.scss +++ b/apps/files_external/css/settings.scss @@ -40,15 +40,15 @@ td.mountPoint, td.backend { width:160px; } position: relative; padding: 0 !important; width: 44px; - opacity: 0.5; - &:hover { - opacity: 1; - } [class^='icon-'], [class*=' icon-'] { + opacity: 0.5; padding: 14px; vertical-align: text-bottom; cursor: pointer; + &:hover { + opacity: 1; + } } } } diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index eaaed02510..0550cb04d8 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -727,15 +727,15 @@ MountConfigListView.prototype = _.extend({ self.recheckStorageConfig($(this).closest('tr')); }); - this.$el.on('click', 'td.remove>img', function() { + this.$el.on('click', 'td.remove>.icon-delete', function() { self.deleteStorageConfig($(this).closest('tr')); }); - this.$el.on('click', 'td.save>img', function () { + this.$el.on('click', 'td.save>.icon-checkmark', function () { self.saveStorageConfig($(this).closest('tr')); }); - this.$el.on('click', 'td.mountOptionsToggle>.icon-settings', function() { + this.$el.on('click', 'td.mountOptionsToggle>.icon-settings-dark', function() { self._showMountOptionsDropdown($(this).closest('tr')); }); diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index b6bce5b30b..8ceab06fd2 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -101,6 +101,7 @@ '.$l->t('Available for').''); ?>     +   From 324e96b780ecbe77088d490ebb32c48cc42c7a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 27 Feb 2018 12:11:36 +0100 Subject: [PATCH 11/14] Fixed tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_external/tests/js/settingsSpec.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/files_external/tests/js/settingsSpec.js b/apps/files_external/tests/js/settingsSpec.js index d6b96a4718..9edf0deee6 100644 --- a/apps/files_external/tests/js/settingsSpec.js +++ b/apps/files_external/tests/js/settingsSpec.js @@ -45,9 +45,16 @@ describe('OCA.External.Settings tests', function() { '' + '' + '' + - '' + - 'Delete' + - 'Save' + + ''+ + '
    '+ + ''+ + ''+ + ''+ + '
    '+ + ''+ + ''+ + '
    '+ + ''+ '' + '' + '' From f1634cd3e28d7b2117af5074755745015b3237e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 27 Feb 2018 12:27:25 +0100 Subject: [PATCH 12/14] fixup! Fixed tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_external/tests/js/settingsSpec.js | 40 ++++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/apps/files_external/tests/js/settingsSpec.js b/apps/files_external/tests/js/settingsSpec.js index 9edf0deee6..d68b2a5dd8 100644 --- a/apps/files_external/tests/js/settingsSpec.js +++ b/apps/files_external/tests/js/settingsSpec.js @@ -213,7 +213,7 @@ describe('OCA.External.Settings tests', function() { expect($mountOptionsField.length).toEqual(1); $mountOptionsField.val(JSON.stringify({previews:true})); - var $saveButton = $tr.find('td.save img'); + var $saveButton = $tr.find('td.save .icon-save'); $saveButton.click(); expect(fakeServer.requests.length).toEqual(1); @@ -238,17 +238,17 @@ describe('OCA.External.Settings tests', function() { // TODO: respond and check data-id }); - it('saves storage after closing mount options dropdown', function() { - $tr.find('.mountOptionsToggle img').click(); + it('saves storage after closing mount options popovermenu', function() { + $tr.find('.mountOptionsToggle .icon-settings-dark').click(); $tr.find('[name=previews]').trigger(new $.Event('keyup', {keyCode: 97})); $tr.find('input[data-parameter=field1]').val('test'); - // does not save inside the dropdown + // does not save inside the popovermenu expect(fakeServer.requests.length).toEqual(0); $('body').mouseup(); - // but after closing the dropdown + // but after closing the popovermenu expect(fakeServer.requests.length).toEqual(1); }); // TODO: status indicator @@ -320,7 +320,7 @@ describe('OCA.External.Settings tests', function() { describe('recheck storages', function() { // TODO }); - describe('mount options dropdown', function() { + describe('mount options popovermenu', function() { var $tr; var $td; @@ -330,45 +330,45 @@ describe('OCA.External.Settings tests', function() { selectBackend('\\OC\\TestBackend'); }); - it('shows dropdown when clicking on toggle button, hides when clicking outside', function() { - $td.find('img').click(); + it('shows popovermenu when clicking on toggle button, hides when clicking outside', function() { + $td.find('.icon-settings-dark').click(); - expect($td.find('.dropdown').length).toEqual(1); + expect($td.find('.popovermenu.open').length).toEqual(1); $('body').mouseup(); - expect($td.find('.dropdown').length).toEqual(0); + expect($td.find('.popovermenu.open').length).toEqual(0); }); it('doesnt show the encryption option when encryption is disabled', function () { view._encryptionEnabled = false; - $td.find('img').click(); + $td.find('.icon-settings-dark').click(); - expect($td.find('.dropdown [name=encrypt]:visible').length).toEqual(0); + expect($td.find('.popovermenu [name=encrypt]:visible').length).toEqual(0); $('body').mouseup(); - expect($td.find('.dropdown').length).toEqual(0); + expect($td.find('.popovermenu.open').length).toEqual(0); }); it('reads config from mountOptions field', function() { $tr.find('input.mountOptions').val(JSON.stringify({previews:false})); - $td.find('img').click(); - expect($td.find('.dropdown [name=previews]').prop('checked')).toEqual(false); + $td.find('.icon-settings-dark').click(); + expect($td.find('.popovermenu [name=previews]').prop('checked')).toEqual(false); $('body').mouseup(); $tr.find('input.mountOptions').val(JSON.stringify({previews:true})); - $td.find('img').click(); - expect($td.find('.dropdown [name=previews]').prop('checked')).toEqual(true); + $td.find('.icon-settings-dark').click(); + expect($td.find('.popovermenu [name=previews]').prop('checked')).toEqual(true); }); it('writes config into mountOptions field', function() { - $td.find('img').click(); + $td.find('.icon-settings-dark').click(); // defaults to true - var $field = $td.find('.dropdown [name=previews]'); + var $field = $td.find('.popovermenu [name=previews]'); expect($field.prop('checked')).toEqual(true); - $td.find('.dropdown [name=filesystem_check_changes]').val(0); + $td.find('.popovermenu [name=filesystem_check_changes]').val(0); $('body').mouseup(); expect(JSON.parse($tr.find('input.mountOptions').val())).toEqual({ From 6ee9a2b35bf1dee8e64b9d7b1d86766b6505b3ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 27 Feb 2018 13:05:01 +0100 Subject: [PATCH 13/14] fixup! Fixed tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_external/css/settings.scss | 4 ---- apps/files_external/js/settings.js | 17 +++++++++-------- apps/files_external/tests/js/settingsSpec.js | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/apps/files_external/css/settings.scss b/apps/files_external/css/settings.scss index 09beaf1205..0f52ed3b2a 100644 --- a/apps/files_external/css/settings.scss +++ b/apps/files_external/css/settings.scss @@ -125,10 +125,6 @@ td.mountPoint, td.backend { width:160px; } width: auto; } -#externalStorage .mountOptionsDropdown { - margin-right: 40px; -} - .nav-icon-external-storage { background-image: url('../img/app-dark.svg?v=1'); } diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 0550cb04d8..99ee83d8a2 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -13,26 +13,27 @@ // TODO: move to a separate file var MOUNT_OPTIONS_DROPDOWN_TEMPLATE = '
    '+ + // FIXME: options are hard-coded for now '
      '+ - '
    • '+ + '
    • '+ ' '+ ' '+ ' '+ ' '+ '
      • '+ - '
    • '+ + '
    • '+ ' '+ ' '+ ' '+ ' '+ '
      • '+ - '
    • '+ + '
    • '+ ' '+ ' '+ ' '+ ' '+ '
      • '+ - '
    • '+ + '
    • '+ ' '+ ' '+ ' '+ ' '+ '
      • '+ - '
    • '+ + '
    • '+ ' '+ ' '+ ' '+ @@ -1303,9 +1304,9 @@ MountConfigListView.prototype = _.extend({ 'enable_sharing', 'encoding_compatibility' ]; - if (this._encryptionEnabled) { - visibleOptions.push('encrypt'); - } + // if (this._encryptionEnabled) { + // visibleOptions.push('encrypt'); + // } dropDown.show($toggle, storage.mountOptions || [], visibleOptions); $('body').on('mouseup.mountOptionsDropdown', function(event) { var $target = $(event.target); diff --git a/apps/files_external/tests/js/settingsSpec.js b/apps/files_external/tests/js/settingsSpec.js index d68b2a5dd8..56bdcff834 100644 --- a/apps/files_external/tests/js/settingsSpec.js +++ b/apps/files_external/tests/js/settingsSpec.js @@ -213,7 +213,7 @@ describe('OCA.External.Settings tests', function() { expect($mountOptionsField.length).toEqual(1); $mountOptionsField.val(JSON.stringify({previews:true})); - var $saveButton = $tr.find('td.save .icon-save'); + var $saveButton = $tr.find('td.save .icon-checkmark'); $saveButton.click(); expect(fakeServer.requests.length).toEqual(1); From 5f217e2d83c3e6556f2d9ca1ba314b23e84c69c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 27 Feb 2018 13:25:42 +0100 Subject: [PATCH 14/14] fixup! Fixed tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_external/js/settings.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 99ee83d8a2..035340b225 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -1304,9 +1304,9 @@ MountConfigListView.prototype = _.extend({ 'enable_sharing', 'encoding_compatibility' ]; - // if (this._encryptionEnabled) { - // visibleOptions.push('encrypt'); - // } + if (this._encryptionEnabled) { + visibleOptions.push('encrypt'); + } dropDown.show($toggle, storage.mountOptions || [], visibleOptions); $('body').on('mouseup.mountOptionsDropdown', function(event) { var $target = $(event.target);