wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup! Fixed tests

Browse source 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-02-27 13:05:01 +01:00
parent f1634cd3e2
commit 6ee9a2b35b
No known key found for this signature in database
GPG key ID: FB5ACEED51955BF8
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_external/css/settings.scss
View file

@ -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');
}

17
apps/files_external/js/settings.js
View file

@ -13,26 +13,27 @@
// TODO: move to a separate file
var MOUNT_OPTIONS_DROPDOWN_TEMPLATE =
'<div class="popovermenu open">'+
// FIXME: options are hard-coded for now
' <ul>'+
' <li>'+
' <li class="optionRow">'+
' <span class="menuitem">'+
' <input id="mountOptionsEncrypt" class="checkbox" name="encrypt" type="checkbox" value="true" checked="checked"/>'+
' <label for="mountOptionsEncrypt">{{t "files_external" "Enable encryption"}}</label>'+
' </span>'+
' </li>'+
' <li>'+
' <li class="optionRow">'+
' <span class="menuitem">'+
' <input id="mountOptionsPreviews" class="checkbox" name="previews" type="checkbox" value="true" checked="checked"/>'+
' <label for="mountOptionsPreviews">{{t "files_external" "Enable previews"}}</label>'+
' </span>'+
' </li>'+
' <li>'+
' <li class="optionRow">'+
' <span class="menuitem">'+
' <input id="mountOptionsSharing" class="checkbox" name="enable_sharing" type="checkbox" value="true"/>'+
' <label for="mountOptionsSharing">{{t "files_external" "Enable sharing"}}</label>'+
' </span>'+
' </li>'+
' <li>'+
' <li class="optionRow">'+
' <span class="menuitem icon-search">'+
' <label for="mountOptionsFilesystemCheck">{{t "files_external" "Check for changes"}}</label>'+
' <select id="mountOptionsFilesystemCheck" name="filesystem_check_changes" data-type="int">'+
@ -41,7 +42,7 @@ var MOUNT_OPTIONS_DROPDOWN_TEMPLATE =
' </select>'+
' </span>'+
' </li>'+
' <li>'+
' <li class="optionRow">'+
' <span class="menuitem">'+
' <input id="mountOptionsEncoding" class="checkbox" name="encoding_compatibility" type="checkbox" value="true"/>'+
' <label for="mountOptionsEncoding">{{mountOptionsEncodingLabel}}</label>'+
@ -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);

2
apps/files_external/tests/js/settingsSpec.js
View file

@ -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);