From c064115501b61116f1904ad08559c3d187d80564 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 21 Jan 2019 14:46:09 +0800
Subject: [PATCH] bootstrap-table-mobile.js

---
 .../extensions/mobile/bootstrap-table-mobile.js    |  2 +-
 .../ajax/libs/fullscreen/jquery.fullscreen.js      | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js
index ebe7b7f60..2376f9444 100644
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js
@@ -16,7 +16,7 @@
     // 判断是否 iphone
     var isIPhone = function () {
 	    let browserName = navigator.userAgent.toLowerCase();
-	    return /(iphone)/i.test(browserName);
+	    return /(iPhone|iPad|iPod|iOS)/i.test(browserName);
 	};
 
     var changeView = function (that, width, height) {
diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/fullscreen/jquery.fullscreen.js b/ruoyi-admin/src/main/resources/static/ajax/libs/fullscreen/jquery.fullscreen.js
index 9d8f46910..1b5d91b6f 100644
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/fullscreen/jquery.fullscreen.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/fullscreen/jquery.fullscreen.js
@@ -1,9 +1,7 @@
 /**
- * @name        jQuery FullScreen Plugin
- * @author      Martin Angelov, Morten Sjøgren
- * @version     1.2
- * @url         http://tutorialzine.com/2012/02/enhance-your-website-fullscreen-api/
- * @license     MIT License
+ * 基于jQuery FullScreen修改
+ * 新增支持IE全屏显示
+ * Copyright (c) 2019 ruoyi
  */
 
 /*jshint browser: true, jquery: true */
@@ -15,6 +13,7 @@
 		var doc = document.documentElement;
 
 		return ('requestFullscreen' in doc) ||
+		        ('msRequestFullscreen' in doc) ||
 				('mozRequestFullScreen' in doc && document.mozFullScreenEnabled) ||
 				('webkitRequestFullScreen' in doc);
 	}
@@ -26,6 +25,8 @@
 			elem.mozRequestFullScreen();
 		} else if (elem.webkitRequestFullScreen) {
 			elem.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT);
+		} else if (elem.msRequestFullscreen) {
+			elem.msRequestFullscreen();
 		}
 	}
 
@@ -33,6 +34,7 @@
 		return document.fullscreen ||
 				document.mozFullScreen ||
 				document.webkitIsFullScreen ||
+				document.msFullscreenElement ||
 				false;
 	}
 
@@ -43,6 +45,8 @@
 			document.mozCancelFullScreen();
 		} else if (document.webkitCancelFullScreen) {
 			document.webkitCancelFullScreen();
+		} else if (document.msExitFullscreen) {
+			document.msExitFullscreen();
 		}
 	}