Remove isIE and associated legacy scripts

skjnldsv · skjnldsv · commit 53b49cc7b1b3 · 2021-11-30T12:46:30.000+01:00
Signed-off-by: John Molakvoæ (skjnldsv) &lt;skjnldsv@protonmail.com&gt;
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
@@ -313,7 +313,6 @@ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = fal
 		$params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
 		$params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
 		$params['showgridview'] = $this->config->getUserValue($user, 'files', 'show_grid', false);
-		$params['isIE'] = \OC_Util::isIe();
 		$showHidden = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
 		$params['showHiddenFiles'] = $showHidden ? 1 : 0;
 		$cropImagePreviews = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'crop_image_previews', true);
diff --git a/apps/files/list.php b/apps/files/list.php
@@ -32,12 +32,11 @@
 $publicUploadEnabled = $shareManager->shareApiLinkAllowPublicUpload() ? 'yes' : 'no';;
 
 $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false);
-$isIE = OC_Util::isIe();
 
 // renders the controls and table headers template
 $tmpl = new OCP\Template('files', 'list', '');
 
 // gridview not available for ie
-$tmpl->assign('showgridview', $showgridview && !$isIE);
+$tmpl->assign('showgridview', $showgridview);
 $tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
 $tmpl->printPage();
diff --git a/apps/files/recentlist.php b/apps/files/recentlist.php
@@ -29,11 +29,10 @@
 $userSession = \OC::$server->getUserSession();
 
 $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false);
-$isIE = OC_Util::isIe();
 
 $tmpl = new OCP\Template('files', 'recentlist', '');
 
 // gridview not available for ie
-$tmpl->assign('showgridview', $showgridview && !$isIE);
+$tmpl->assign('showgridview', $showgridview);
 
 $tmpl->printPage();
diff --git a/apps/files/simplelist.php b/apps/files/simplelist.php
@@ -26,11 +26,10 @@
 $userSession = \OC::$server->getUserSession();
 
 $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false);
-$isIE = OC_Util::isIe();
 
 // renders the controls and table headers template
 $tmpl = new OCP\Template('files', 'simplelist', '');
 
 // gridview not available for ie
-$tmpl->assign('showgridview', $showgridview && !$isIE);
+$tmpl->assign('showgridview', $showgridview);
 $tmpl->printPage();
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
@@ -2,13 +2,11 @@
 <?php $_['appNavigation']->printPage(); ?>
 <div id="app-content">
 
-	<?php if (!$_['isIE']) { ?>
-		<input type="checkbox" class="hidden-visually" id="showgridview"
-			aria-label="<?php p($l->t('Toggle grid view'))?>"
-			<?php if ($_['showgridview']) { ?>checked="checked" <?php } ?>/>
-		<label id="view-toggle" for="showgridview" class="button <?php p($_['showgridview'] ? 'icon-toggle-filelist' : 'icon-toggle-pictures') ?>"
-			title="<?php p($l->t('Toggle grid view'))?>"></label>
-	<?php } ?>
+	<input type="checkbox" class="hidden-visually" id="showgridview"
+		aria-label="<?php p($l->t('Toggle grid view'))?>"
+		<?php if ($_['showgridview']) { ?>checked="checked" <?php } ?>/>
+	<label id="view-toggle" for="showgridview" class="button <?php p($_['showgridview'] ? 'icon-toggle-filelist' : 'icon-toggle-pictures') ?>"
+		title="<?php p($l->t('Toggle grid view'))?>"></label>
 
 	<?php foreach ($_['appContents'] as $content) { ?>
 	<div id="app-content-<?php p($content['id']) ?>" class="hidden viewcontainer">
diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php
@@ -407,8 +407,7 @@ public function testIndexWithRegularBrowser() {
 					],
 				],
 				'hiddenFields' => [],
-				'showgridview' => false,
-				'isIE' => false,
+				'showgridview' => false
 			]
 		);
 		$policy = new Http\ContentSecurityPolicy();
diff --git a/apps/files_external/list.php b/apps/files_external/list.php
@@ -29,12 +29,11 @@
 $userSession = \OC::$server->getUserSession();
 
 $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', true);
-$isIE = OC_Util::isIe();
 
 $tmpl = new OCP\Template('files_external', 'list', '');
 
 // gridview not available for ie
-$tmpl->assign('showgridview', $showgridview && !$isIE);
+$tmpl->assign('showgridview', $showgridview);
 
 /* Load Status Manager */
 \OCP\Util::addStyle('files_external', 'external');
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
@@ -37,12 +37,11 @@
 $eventDispatcher = \OC::$server->get(OCP\EventDispatcher\IEventDispatcher::class);
 
 $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false);
-$isIE = OC_Util::isIe();
 
 $tmpl = new OCP\Template('files_sharing', 'list', '');
 
 // gridview not available for ie
-$tmpl->assign('showgridview', $showgridview && !$isIE);
+$tmpl->assign('showgridview', $showgridview);
 
 // fire script events
 $legacyEventDispatcher->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts', new GenericEvent());
diff --git a/apps/files_trashbin/list.php b/apps/files_trashbin/list.php
@@ -31,11 +31,10 @@
 $userSession = \OC::$server->getUserSession();
 
 $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false);
-$isIE = OC_Util::isIe();
 
 $tmpl = new OCP\Template('files_trashbin', 'index', '');
 
 // gridview not available for ie
-$tmpl->assign('showgridview', $showgridview && !$isIE);
+$tmpl->assign('showgridview', $showgridview);
 OCP\Util::addScript('files_trashbin', 'files_trashbin');
 $tmpl->printPage();
diff --git a/core/css/ie.scss b/core/css/ie.scss
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js
@@ -304,20 +304,12 @@ const Dialogs = {
 				multiselect = false
 			}
 
-			// No grid for IE!
-			if (OC.Util.isIE()) {
-				self.$filePicker.find('#picker-view-toggle').remove()
-				self.$filePicker.find('#picker-filestable').removeClass('view-grid')
-			}
+			self.$filePicker.find('#picker-view-toggle').remove()
+			self.$filePicker.find('#picker-filestable').removeClass('view-grid')
 
 			$('body').append(self.$filePicker)
 
-			self.$showGridView = $('input#picker-showgridview')
-			self.$showGridView.on('change', _.bind(self._onGridviewChange, self))
-
-			if (!OC.Util.isIE()) {
-				self._getGridSettings()
-			}
+			self._getGridSettings()
 
 			var newButton = self.$filePicker.find('.actions.creatable .button-add')
 			if (type === self.FILEPICKER_TYPE_CHOOSE && !options.allowDirectoryChooser) {
diff --git a/core/src/OC/util.js b/core/src/OC/util.js
@@ -141,15 +141,6 @@ export default {
 		return moment(timestamp).fromNow()
 	},
 
-	/**
-	 * Returns whether this is IE
-	 *
-	 * @returns {bool} true if this is IE, false otherwise
-	 */
-	isIE() {
-		return $('html').hasClass('ie')
-	},
-
 	/**
 	 * Returns the width of a generic browser scrollbar
 	 *
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
@@ -82,10 +82,6 @@ public function __construct($renderAs, $appId = '') {
 		/** @var IInitialStateService */
 		$this->initialState = \OC::$server->get(IInitialStateService::class);
 
-		if (\OC_Util::isIe()) {
-			Util::addStyle('ie');
-		}
-
 		// Decide which page we show
 		if ($renderAs === TemplateResponse::RENDER_AS_USER) {
 			/** @var INavigationManager */
diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php
@@ -1444,17 +1444,4 @@ public static function needUpgrade(\OC\SystemConfig $config) {
 			return false;
 		}
 	}
-
-	/**
-	 * is this Internet explorer ?
-	 *
-	 * @return boolean
-	 */
-	public static function isIe() {
-		if (!isset($_SERVER['HTTP_USER_AGENT'])) {
-			return false;
-		}
-
-		return preg_match(Request::USER_AGENT_IE, $_SERVER['HTTP_USER_AGENT']) === 1;
-	}
 }
