[BUGFIX] Disable extension list during repository update 57/43557/3
authorAndreas Fernandez <a.fernandez@scripting-base.de>
Fri, 25 Sep 2015 07:09:57 +0000 (09:09 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Fri, 25 Sep 2015 08:34:31 +0000 (10:34 +0200)
The extension list is now completely hidden during a repository
update.
Also, the form submit logic has been adjusted and the splash screen
text now shows a spinner icon again.

Resolves: #70098
Releases: master
Change-Id: I2f01c2e5b4a174e79af67500cf7275ba365409ab
Reviewed-on: http://review.typo3.org/43557
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/extensionmanager/Resources/Private/Language/locallang.xlf
typo3/sysext/extensionmanager/Resources/Private/Templates/List/Ter.html
typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js

index 1b21bb4..91da95c 100644 (file)
                                <source>Install impexp</source>
                        </trans-unit>
                        <trans-unit id="extensionList.updateFromTer.label">
-                               <source>Retrieving Extension-List from TYPO3 Extension Repository (TER)</source>
+                               <source>Retrieving extension list from TYPO3 Extension Repository (TER)...</source>
                        </trans-unit>
                        <trans-unit id="extensionList.updateFromTer.buttonLabel">
                                <source>Update now</source>
index 61700b6..f7d2f92 100644 (file)
@@ -48,7 +48,7 @@
                                <f:render partial="List/TerPaginator" arguments="{extensions:extensions, showVersionList:showVersionList,  availableAndInstalled:availableAndInstalled}" />
                        </f:else>
                </f:if>
-               <div class="splash-receivedata x-mask-loading"><div class="spinner"><f:translate key="extensionList.updateFromTer.label"/></div></div>
+               <div class="splash-receivedata x-mask-loading"><core:icon identifier="spinner-circle-dark" /> <f:translate key="extensionList.updateFromTer.label"/></div>
        </div>
 
 </f:section>
index 6fc5e08..7422fd1 100644 (file)
@@ -470,7 +470,7 @@ define(['jquery', 'nprogress', 'datatables', 'TYPO3/CMS/Backend/jquery.clearable
                        {
                                onClear: function() {
                                        if (searchResultShown) {
-                                               $(this).parents('form').first().submit();
+                                               $(this).closest('form').submit();
                                        }
                                }
                        }
@@ -479,6 +479,7 @@ define(['jquery', 'nprogress', 'datatables', 'TYPO3/CMS/Backend/jquery.clearable
 
        ExtensionManager.Update = {
                identifier: {
+                       extensionTable: '#terTable',
                        terUpdateAction: '.update-from-ter',
                        pagination: '.pagination-wrap',
                        splashscreen: '.splash-receivedata',
@@ -519,6 +520,9 @@ define(['jquery', 'nprogress', 'datatables', 'TYPO3/CMS/Backend/jquery.clearable
                // Hide triggers for TER update
                $(ExtensionManager.Update.identifier.terUpdateAction).addClass('is-hidden');
 
+               // Hide extension table
+               $(ExtensionManager.Update.identifier.extensionTable).hide();
+
                // Show loaders
                $(ExtensionManager.Update.identifier.splashscreen).addClass('is-shown');
                $(ExtensionManager.Update.identifier.terTableDataTableWrapper).addClass('is-loading');
@@ -576,6 +580,9 @@ define(['jquery', 'nprogress', 'datatables', 'TYPO3/CMS/Backend/jquery.clearable
 
                                // Show triggers for TER-update
                                $(ExtensionManager.Update.identifier.terUpdateAction).removeClass('is-hidden');
+
+                               // Show extension table
+                               $(ExtensionManager.Update.identifier.extensionTable).show();
                        }
                });
        };