From f010b5801b1303afaf1b27d57f1d8ec332d59af9 Mon Sep 17 00:00:00 2001 From: Andreas Fernandez <a.fernandez@scripting-base.de> Date: Fri, 6 Mar 2015 19:39:41 +0100 Subject: [PATCH] [BUGFIX] Fix update button in Extension Manager The change If527b0e8fd77a059c8b25db16a926c5c80356331 introduced a regression which broke the event listeners for the update buttons. Change the JavaScript code to match the new markup. Resolves: #65580 Releases: master Change-Id: Ifbf857c88fad10f6e0411c48dadacf85bcfa425c Reviewed-on: http://review.typo3.org/37612 Reviewed-by: Nicole Cordes <typo3@cordes.co> Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl> Reviewed-by: Markus Klein <klein.t3@reelworx.at> Tested-by: Markus Klein <klein.t3@reelworx.at> --- .../Private/Templates/List/Index.html | 1 + .../Resources/Public/JavaScript/Main.js | 23 ++++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html index d85159848f12..e6c510353720 100644 --- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html +++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html @@ -62,6 +62,7 @@ uri="{f:uri.action(action:'updateCommentForUpdatableVersions',controller:'Download',arguments:{extension:extension.key, integerVersion: extension.terObject.integerVersion},format:'json')}" icon="actions-system-extension-update" title="{f:translate(key:'extensionList.updateToVersion', arguments:{0:extension.updateToVersion.version})}" + additionalAttributes="{data-action:'update-extension'}" /> </span> </f:else> diff --git a/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js b/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js index df90a015e68d..bda9eae5e811 100644 --- a/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js +++ b/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js @@ -97,20 +97,15 @@ define(['jquery', 'datatables', 'jquery/jquery.clearable'], function($) { }); }); - $('.t3-icon-system-extension-update').parent().each(function() { - var $me = $(this); - $me.data('href', $me.attr('href')); - $me.attr('href', '#'); - $me.addClass('transformed'); - $me.click(function() { - $.ajax({ - url: $(this).data('href'), - dataType: 'json', - beforeSend: function() { - $(ExtensionManager.identifier.extensionManager).mask(); - }, - success: ExtensionManager.updateExtension - }); + $('a[data-action=update-extension]').click(function(e) { + e.preventDefault(); + $.ajax({ + url: $(this).attr('href'), + dataType: 'json', + beforeSend: function() { + $(ExtensionManager.identifier.extensionManager).mask(); + }, + success: ExtensionManager.updateExtension }); }); }; -- GitLab