summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2013-10-20 23:03:48 +0300
committerJan-Christoph Borchardt <hey@jancborchardt.net>2013-10-20 23:03:48 +0300
commitfc7269e7282a4fa6f65c9ff683f19d8b5f0f5a60 (patch)
treebc8d5234434de37c68ae0561dd4eff4010a92c0b /core
parent1e8af6c5ef081324a57b6481970e8c910cd22c67 (diff)
downloadnextcloud-server-fc7269e7282a4fa6f65c9ff683f19d8b5f0f5a60.tar.gz
nextcloud-server-fc7269e7282a4fa6f65c9ff683f19d8b5f0f5a60.zip
remove hover hide/show stuff for share dropdown to make things more obvious
Diffstat (limited to 'core')
-rw-r--r--core/js/share.js29
1 files changed, 3 insertions, 26 deletions
diff --git a/core/js/share.js b/core/js/share.js
index 6ec15f01c1e..2922cdd60e5 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -372,7 +372,7 @@ OC.Share={
shareChecked = 'checked="checked"';
}
var html = '<li style="clear: both;" data-share-type="'+escapeHTML(shareType)+'" data-share-with="'+escapeHTML(shareWith)+'" title="' + escapeHTML(shareWith) + '">';
- html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
+ html += '<a href="#" class="unshare"><img class="svg" alt="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
if(shareWith.length > 14){
html += escapeHTML(shareWithDisplayName.substr(0,11) + '...');
}else{
@@ -387,14 +387,9 @@ OC.Share={
html += '<label><input type="checkbox" name="mailNotification" class="mailNotification" ' + checked + ' />'+t('core', 'notify user by email')+'</label>';
}
if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
- if (editChecked == '') {
- html += '<label style="display:none;">';
- } else {
- html += '<label>';
- }
- html += '<input type="checkbox" name="edit" class="permissions" '+editChecked+' />'+t('core', 'can edit')+'</label>';
+ html += '<label><input type="checkbox" name="edit" class="permissions" '+editChecked+' />'+t('core', 'can edit')+'</label>';
}
- html += '<a href="#" class="showCruds" style="display:none;"><img class="svg" alt="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
+ html += '<a href="#" class="showCruds"><img class="svg" alt="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
html += '<div class="cruds" style="display:none;">';
if (possiblePermissions & OC.PERMISSION_CREATE) {
html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.PERMISSION_CREATE+'" />'+t('core', 'create')+'</label>';
@@ -516,24 +511,6 @@ $(document).ready(function() {
}
});
- $(document).on('mouseenter', '#dropdown #shareWithList li', function(event) {
- // Show permissions and unshare button
- $(':hidden', this).filter(':not(.cruds)').show();
- });
-
- $(document).on('mouseleave', '#dropdown #shareWithList li', function(event) {
- // Hide permissions and unshare button
- if (!$('.cruds', this).is(':visible')) {
- $('a', this).hide();
- if (!$('input[name="edit"]', this).is(':checked')) {
- $('input[type="checkbox"]', this).hide();
- $('label', this).hide();
- }
- } else {
- $('a.unshare', this).hide();
- }
- });
-
$(document).on('click', '#dropdown .showCruds', function() {
$(this).parent().find('.cruds').toggle();
return false;