diff options
| -rw-r--r-- | core/js/update.js | 33 | ||||
| -rw-r--r-- | lib/base.php | 8 |
2 files changed, 20 insertions, 21 deletions
diff --git a/core/js/update.js b/core/js/update.js index 5c1054adcb4..22d680a0e8f 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -146,22 +146,21 @@ })(); -window.addEventListener('DOMContentLoaded', function() { - $('.updateButton').on('click', function() { - var $updateEl = $('.update'); - var $progressEl = $('.update-progress'); - $progressEl.removeClass('hidden'); - $('.updateOverview').addClass('hidden'); - $('#update-progress-message-error').hide(); - $('#update-progress-message-warnings').hide(); - OC.Update.start($progressEl, { - productName: $updateEl.attr('data-productname'), - version: $updateEl.attr('data-version') - }); - return false; - }); - $('.update-show-detailed').on('click', function() { - $('#update-progress-detailed').toggleClass('hidden'); - return false; +$('.updateButton').on('click', function() { + var $updateEl = $('.update'); + var $progressEl = $('.update-progress'); + $progressEl.removeClass('hidden'); + $('.updateOverview').addClass('hidden'); + $('#update-progress-message-error').hide(); + $('#update-progress-message-warnings').hide(); + OC.Update.start($progressEl, { + productName: $updateEl.attr('data-productname'), + version: $updateEl.attr('data-version') }); + return false; +}); + +$('.update-show-detailed').on('click', function() { + $('#update-progress-detailed').toggleClass('hidden'); + return false; }); diff --git a/lib/base.php b/lib/base.php index 0f08102c81f..6578d506796 100644 --- a/lib/base.php +++ b/lib/base.php @@ -365,10 +365,10 @@ class OC { $oldTheme = $systemConfig->getValue('theme'); $systemConfig->setValue('theme', ''); - OC_Util::addScript('core', 'common'); - OC_Util::addScript('core', 'main'); - OC_Util::addTranslations('core'); - OC_Util::addScript('update', null, 'core'); + \OCP\Util::addScript('core', 'common'); + \OCP\Util::addScript('core', 'main'); + \OCP\Util::addTranslations('core'); + \OCP\Util::addScript('core', 'update'); /** @var \OC\App\AppManager $appManager */ $appManager = \OC::$server->getAppManager(); |