diff options
| author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-04-20 21:36:27 +0300 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-04-20 21:36:27 +0300 |
| commit | 01b09b4f92f7a73873875b29ad11d39415adfa77 (patch) | |
| tree | 14215e15b2648d65117a1da3485eb8502f6bcec2 /settings | |
| parent | f92054acf291109fd6d6ade5e2cdf708b1a4c6f7 (diff) | |
| parent | c670c23455f68a4d2dce1a0cf078c05429d200d9 (diff) | |
Merge pull request #24118 from owncloud/add-load-script-events-for-settings
Add loadAdditionalScripts events to admin and personal settings
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/admin.php | 2 | ||||
| -rw-r--r-- | settings/personal.php | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/settings/admin.php b/settings/admin.php index e0d3a907f47..cfb7eb5c541 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -41,6 +41,8 @@ OC_Util::addScript('settings', 'certificates'); OC_Util::addScript('files', 'jquery.iframe-transport'); OC_Util::addScript('files', 'jquery.fileupload'); +\OC::$server->getEventDispatcher()->dispatch('OC\Settings\Admin::loadAdditionalScripts'); + $showLog = (\OC::$server->getConfig()->getSystemValue('log_type', 'owncloud') === 'owncloud'); $numEntriesToLoad = 3; $entries = OC_Log_Owncloud::getEntries($numEntriesToLoad + 1); diff --git a/settings/personal.php b/settings/personal.php index 62a718985f8..90b8bb2fbbb 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -54,6 +54,8 @@ if ($config->getSystemValue('enable_avatars', true) === true) { \OC_Util::addVendorStyle('jcrop/css/jquery.Jcrop'); } +\OC::$server->getEventDispatcher()->dispatch('OC\Settings\Personal::loadAdditionalScripts'); + // Highlight navigation entry OC::$server->getNavigationManager()->setActiveEntry('personal'); |