Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87f221e6 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

Merge branch 'dev/remove-snappymail-minimalmurena-change' into 'main' 

revert snappymail change

See merge request e/infra/ecloud/nextcloud-apps/ecloud-theme-helper!148
parents 0085f04f 595f6bef

lib/Listeners/BeforeTemplateRenderedListener.php

+0 −3
Original line number Diff line number Diff line
@@ -118,8 +118,5 @@ class BeforeTemplateRenderedListener implements IEventListener { 
		if ($pathInfo === '/settings/help') {

			$this->util->addStyle($this->appName, 'settings-help');

		}

		if (strpos($pathInfo, '/apps/snappymail') !== false) {

			$this->util->addScript($this->appName, $this->appName .'-snappymail-settings');

		}

	}

}

src/snappymail-settings.js

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
/**

 *

 */

function checkAndRedirect() {

	const currentHash = window.location.hash.toLowerCase()

	const currentPath = window.location.pathname.toLowerCase()

	const normalizedHash = currentHash.replace(/^#\/?|\/$/g, '')

	if (currentPath.includes('/apps/snappymail') && (normalizedHash === 'settings')) {

		window.location.href = '/apps/snappymail/'

	}

}

window.addEventListener('hashchange', checkAndRedirect)

checkAndRedirect()

webpack.config.js

+1 −2
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ module.exports = { 
		'personal-info-settings': path.join(__dirname, 'src/personal-info-settings.js'),

		'settings-user-security': path.join(__dirname, 'src/settings-user-security.js'),

		'files-icon-alignment': path.join(__dirname, 'src/files-icon-alignment.js'),

		'unified-search-encryption-message': path.join(__dirname, 'src/unified-search-encryption-message.js'),

		'snappymail-settings': path.join(__dirname, 'src/snappymail-settings.js')

		'unified-search-encryption-message': path.join(__dirname, 'src/unified-search-encryption-message.js')

	},

}