From f0b02873337ef2b5143224aa7f291ef935047ecf Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 26 Mar 2015 12:21:40 +0100 Subject: [PATCH] adjust animations of Share, Versions and others to OC.menuSpeed --- apps/files_versions/js/versions.js | 7 ++++--- core/js/apps.js | 4 ++-- core/js/share.js | 32 +++++++++++++++--------------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index 1a47c1749f9..e86bb4c3307 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -40,6 +40,7 @@ $(document).ready(function(){ if ( $('#dropdown').hasClass('drop-versions') && file == $('#dropdown').data('file')) { createDropDown = false; } + $('#dropdown').slideUp(OC.menuSpeed); $('#dropdown').remove(); $('tr').removeClass('mouseOver'); } @@ -71,7 +72,7 @@ function revertFile(file, revision) { if (response.status === 'error') { OC.Notification.show( t('files_version', 'Failed to revert {file} to revision {timestamp}.', {file:file, timestamp:formatDate(revision * 1000)}) ); } else { - $('#dropdown').hide('blind', function() { + $('#dropdown').slideUp(OC.menuSpeed, function() { $('#dropdown').closest('tr').find('.modified:first').html(relative_modified_date(revision)); $('#dropdown').remove(); $('tr').removeClass('mouseOver'); @@ -175,13 +176,13 @@ function createVersionsDropdown(filename, files, fileList) { version.appendTo('#found_versions'); } - $('#dropdown').show('blind'); + $('#dropdown').slideDown(1000); } $(this).click( function(event) { if ($('#dropdown').has(event.target).length === 0 && $('#dropdown').hasClass('drop-versions')) { - $('#dropdown').hide('blind', function() { + $('#dropdown').slideUp(OC.menuSpeed, function() { $('#dropdown').remove(); $('tr').removeClass('mouseOver'); }); diff --git a/core/js/apps.js b/core/js/apps.js index 21fae58985e..e9aa0fdfe8d 100644 --- a/core/js/apps.js +++ b/core/js/apps.js @@ -44,12 +44,12 @@ var area = $(areaSelector); function hideArea() { - area.slideUp(function() { + area.slideUp(OC.menuSpeed*4, function() { area.trigger(new $.Event('hide')); }); } function showArea() { - area.slideDown(function() { + area.slideDown(OC.menuSpeed*4, function() { area.trigger(new $.Event('show')); }); } diff --git a/core/js/share.js b/core/js/share.js index 38f7ec0e14d..061ac6affa2 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -590,7 +590,7 @@ OC.Share={ dropDownEl.appendTo(appendTo); } dropDownEl.attr('data-item-source-name', filename); - $('#dropdown').show('blind', function() { + $('#dropdown').slideDown(OC.menuSpeed, function() { OC.Share.droppedDown = true; }); if ($('html').hasClass('lte9')){ @@ -600,7 +600,7 @@ OC.Share={ }, hideDropDown:function(callback) { OC.Share.currentShares = null; - $('#dropdown').hide('blind', function() { + $('#dropdown').slideUp(OC.menuSpeed, function() { OC.Share.droppedDown = false; $('#dropdown').remove(); if (typeof FileActions !== 'undefined') { @@ -753,14 +753,14 @@ OC.Share={ } } $('#linkText').val(link); - $('#linkText').show('blind'); + $('#linkText').slideDown(OC.menuSpeed); $('#linkText').css('display','block'); if (oc_appconfig.core.enforcePasswordForPublicLink === false || password === null) { $('#showPassword').show(); $('#showPassword+label').show(); } if (password != null) { - $('#linkPass').show('blind'); + $('#linkPass').slideDown(OC.menuSpeed); $('#showPassword').attr('checked', true); $('#linkPassText').attr('placeholder', '**********'); } @@ -770,11 +770,11 @@ OC.Share={ $('#allowPublicUploadWrapper').show(); }, hideLink:function() { - $('#linkText').hide('blind'); + $('#linkText').slideUp(OC.menuSpeed); $('#defaultExpireMessage').hide(); $('#showPassword').hide(); $('#showPassword+label').hide(); - $('#linkPass').hide('blind'); + $('#linkPass').slideUp(OC.menuSpeed); $('#emailPrivateLink #email').hide(); $('#emailPrivateLink #emailButton').hide(); $('#allowPublicUploadWrapper').hide(); @@ -805,7 +805,7 @@ OC.Share={ } $('#expirationCheckbox').attr('checked', true); $('#expirationDate').val(date); - $('#expirationDate').show('blind'); + $('#expirationDate').slideDown(OC.menuSpeed); $('#expirationDate').css('display','block'); $('#expirationDate').datepicker({ dateFormat : 'dd-mm-yy' @@ -817,7 +817,7 @@ OC.Share={ datePickerOptions.maxDate = new Date(shareTime + oc_appconfig.core.defaultExpireDate * 24 * 3600 * 1000); } if(oc_appconfig.core.defaultExpireDateEnabled) { - $('#defaultExpireMessage').show('blind'); + $('#defaultExpireMessage').slideDown(OC.menuSpeed); } $.datepicker.setDefaults(datePickerOptions); } @@ -905,7 +905,7 @@ $(document).ready(function() { $('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares})); OC.Share.updateIcon(itemType, itemSource); if (typeof OC.Share.statuses[itemSource] === 'undefined') { - $('#expiration').hide('blind'); + $('#expiration').slideUp(OC.menuSpeed); } }); @@ -988,7 +988,7 @@ $(document).ready(function() { OC.Share.updateIcon(itemType, itemSource); }); } else { - $('#linkPass').toggle('blind'); + $('#linkPass').slideToggle(OC.menuSpeed); $('#linkPassText').focus(); } if (expireDateString !== '') { @@ -997,7 +997,7 @@ $(document).ready(function() { } else { // Delete private link OC.Share.hideLink(); - $('#expiration').hide('blind'); + $('#expiration').slideUp(OC.menuSpeed); if ($('#linkText').val() !== '') { $loading.removeClass('hidden'); $button.addClass('hidden'); @@ -1010,7 +1010,7 @@ $(document).ready(function() { $('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares})); OC.Share.updateIcon(itemType, itemSource); if (typeof OC.Share.statuses[itemSource] === 'undefined') { - $('#expiration').hide('blind'); + $('#expiration').slideUp(OC.menuSpeed); } }); } @@ -1063,7 +1063,7 @@ $(document).ready(function() { }); $(document).on('click', '#dropdown #showPassword', function() { - $('#linkPass').toggle('blind'); + $('#linkPass').slideToggle(OC.menuSpeed); if (!$('#showPassword').is(':checked') ) { var itemType = $('#dropdown').data('item-type'); var itemSource = $('#dropdown').data('item-source'); @@ -1133,9 +1133,9 @@ $(document).ready(function() { if (!result || result.status !== 'success') { OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error')); } - $('#expirationDate').hide('blind'); + $('#expirationDate').slideUp(OC.menuSpeed); if (oc_appconfig.core.defaultExpireDateEnforced === false) { - $('#defaultExpireMessage').show('blind'); + $('#defaultExpireMessage').slideDown(OC.menuSpeed); } }); } @@ -1161,7 +1161,7 @@ $(document).ready(function() { expirationDateField.addClass('error'); } else { if (oc_appconfig.core.defaultExpireDateEnforced === 'no') { - $('#defaultExpireMessage'). hide('blind'); + $('#defaultExpireMessage').slideUp(OC.menuSpeed); } } });