Merge branch 'master' of github.com:theajack/disable-devtool

helper/version.en.md

@@ -64,4 +64,7 @@
 ## 0.1.8
 1. Disable macos option+commond+i
 2. Delete some debugging code and useless code
-3. Modify the event model
+3. Modify the event model
+
+## 0.1.9
+1. Fix the bug of accidental injury in IFrame

helper/version.md

@@ -64,4 +64,7 @@
 ## 0.1.8
 1. 禁用 macos option+commond+i
 2. 删除部分调试代码与无用代码
-3. 修改事件模型
+3. 修改事件模型
+   
+## 0.1.9
+1. 修复IFrame中误伤的bug

index.html

@@ -182,7 +182,7 @@ declare type DETECTOR_TYPE = -1 | 0 | 1 | 2 | 3;</code></p>
     <script 
         disable-devtool-auto 
         md5='1aabac6d068eef6a7bad3fdf50a05cc8' 
-        src='https://cdn.jsdelivr.net/npm/disable-devtool@0.1.8/disable-devtool.min.js#use'
+        src='https://cdn.jsdelivr.net/npm/disable-devtool@0.1.9/disable-devtool.min.js#use'
     ></script>
     <!-- <script disable-devtool-auto md5='1aabac6d068eef6a7bad3fdf50a05cc8' src='./npm/disable-devtool.min.js'></script> -->
     <script>

npm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "disable-devtool",
-    "version": "0.1.8",
+    "version": "0.1.9",
     "description": "Disable web developer tools from the f12 button, right-click and browser ",
     "main": "disable-devtool.min.js",
     "unpkg": "disable-devtool.min.js",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "disable-devtool",
-    "version": "0.1.8",
+    "version": "0.1.9",
     "description": "Disable web developer tools from the f12 button, right-click and browser ",
     "main": "disable-devtool.min.js",
     "unpkg": "disable-devtool.min.js",

src/detector/size.js

@@ -2,16 +2,17 @@
  * @Author: theajack
  * @Date: 2021-07-24 23:15:54
  * @LastEditor: theajack
- * @LastEditTime: 2021-11-15 23:44:27
+ * @LastEditTime: 2021-11-17 12:02:49
  * @Description: Coding something
- * @FilePath: /disable-devtool/src/detector/size.js
+ * @FilePath: \disable-devtool\src\detector\size.js
  */
 
+import {isInIframe} from '../util';
 import {DETECTOR_TYPE, triggerOnDevOpen} from './detector';
 
 function checkWindowSizeUneven () {
-    const widthUneven = window.outerWidth - window.innerWidth > 20;
-    const heightUneven = window.outerHeight - window.innerHeight > 250; // 调大一点防止误伤
+    const widthUneven = window.outerWidth - window.innerWidth > 100;
+    const heightUneven = window.outerHeight - window.innerHeight > 300; // 调大一点防止误伤
     if (widthUneven || heightUneven) {
         triggerOnDevOpen(DETECTOR_TYPE.SIZE);
         return false;
@@ -20,6 +21,10 @@ function checkWindowSizeUneven () {
 }
 
 export default function detector () {
+    if (isInIframe()) {
+        console.warn('SizeDetector is disabled in IFrame');
+        return;
+    }
     checkWindowSizeUneven();
     window.addEventListener('resize', () => {
         setTimeout(checkWindowSizeUneven, 100);

src/util.js

@@ -121,4 +121,12 @@ export function isMacOs () {
 
 function hasUaName (name) {
     return navigator.userAgent.toLocaleLowerCase().indexOf(name) !== -1;
+}
+
+export function isInIframe () {
+    try {
+        return window.self !== window.top;
+    } catch (e) {
+        return true;
+    }
 }

src/version.js

@@ -1 +1 @@
-export default '0.1.8';
+export default '0.1.9';