From 77ab9ba8304582f90b5910aca8e5e11d2337a8e0 Mon Sep 17 00:00:00 2001 From: tackchen Date: Thu, 14 Jan 2021 17:30:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=200.0.6=20disable-devtool-auto=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.cn.md | 8 ++++---- README.md | 8 ++++---- helper/testcdn.html | 2 +- helper/version.md | 11 +++++++++++ npm/README.cn.md | 8 ++++---- npm/README.md | 8 ++++---- npm/disable-devtool.min.js | 2 +- npm/package.json | 2 +- package.json | 2 +- src/main.js | 2 +- src/version.js | 2 +- 11 files changed, 33 insertions(+), 22 deletions(-) diff --git a/README.cn.md b/README.cn.md index 7a17ebd..080b046 100644 --- a/README.cn.md +++ b/README.cn.md @@ -114,11 +114,11 @@ disableDevtool对象暴露了 md5 方法，可供开发者加密时使用： disableDevtool.md5('xxx'); ``` -### 3.2 script使用属性配置 +### 3.3 script使用属性配置 ```html diff --git a/README.md b/README.md index 4234070..86a7e51 100644 --- a/README.md +++ b/README.md @@ -113,11 +113,11 @@ The disableDevtool object exposes the md5 method, which can be used by developer disableDevtool.md5('xxx'); ``` -### 3.2 script uses attribute configuration +### 3.3 script uses attribute configuration ```html diff --git a/helper/testcdn.html b/helper/testcdn.html index 6975330..e5001e9 100644 --- a/helper/testcdn.html +++ b/helper/testcdn.html @@ -7,7 +7,7 @@ Disable Devtool Demo - diff --git a/helper/version.md b/helper/version.md index db9ba71..1ba45f1 100644 --- a/helper/version.md +++ b/helper/version.md @@ -19,3 +19,14 @@ 3. 兼容ie，disableMenu参数在ie下无效，因为ie下右键会阻塞主进程，且无法监听 4. 增加config.stopIntervalTime 表示在移动端时取消监视的等待时长 5. 优化判断开发者工具打开的逻辑 + +## 0.0.4 +1. 修改 webpack 打包配置 + +## 0.0.5 +1. 优化onDevToolOpen事件触发逻辑 + +## 0.0.6 +1. 对于标签属性配置，移除id='disable-devtool' 条件，使用 disable-devtool-auto属性 +2. 修改readme + diff --git a/npm/README.cn.md b/npm/README.cn.md index 7a17ebd..080b046 100644 --- a/npm/README.cn.md +++ b/npm/README.cn.md @@ -114,11 +114,11 @@ disableDevtool对象暴露了 md5 方法，可供开发者加密时使用： disableDevtool.md5('xxx'); ``` -### 3.2 script使用属性配置 +### 3.3 script使用属性配置 ```html diff --git a/npm/README.md b/npm/README.md index 4234070..86a7e51 100644 --- a/npm/README.md +++ b/npm/README.md @@ -113,11 +113,11 @@ The disableDevtool object exposes the md5 method, which can be used by developer disableDevtool.md5('xxx'); ``` -### 3.2 script uses attribute configuration +### 3.3 script uses attribute configuration ```html diff --git a/npm/disable-devtool.min.js b/npm/disable-devtool.min.js index b877603..53ca01d 100644 --- a/npm/disable-devtool.min.js +++ b/npm/disable-devtool.min.js @@ -1 +1 @@ -!function(n,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.DisableDevtool=e():n.DisableDevtool=e()}(this,(function(){return function(n){var e={};function t(o){if(e[o])return e[o].exports;var i=e[o]={i:o,l:!1,exports:{}};return n[o].call(i.exports,i,i.exports,t),i.l=!0,i.exports}return t.m=n,t.c=e,t.d=function(n,e,o){t.o(n,e)||Object.defineProperty(n,e,{enumerable:!0,get:o})},t.r=function(n){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(n,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(n,"__esModule",{value:!0})},t.t=function(n,e){if(1&e&&(n=t(n)),8&e)return n;if(4&e&&"object"==typeof n&&n&&n.__esModule)return n;var o=Object.create(null);if(t.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:n}),2&e&&"string"!=typeof n)for(var i in n)t.d(o,i,function(e){return n[e]}.bind(null,i));return o},t.n=function(n){var e=n&&n.__esModule?function(){return n.default}:function(){return n};return t.d(e,"a",e),e},t.o=function(n,e){return Object.prototype.hasOwnProperty.call(n,e)},t.p="",t(t.s=0)}([function(n,e,t){"use strict";function o(){return(new Date).getTime()}function i(n){return(i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(n){return typeof n}:function(n){return n&&"function"==typeof Symbol&&n.constructor===Symbol&&n!==Symbol.prototype?"symbol":typeof n})(n)}t.r(e);var r={md5:"",ondevtoolopen:function(){r.url?window.location.href=r.url:(window.opener=null,window.open("","_self"),window.close(),window.history.back(),setTimeout((function(){window.location.href="http://localhost"}),100))},url:"",tkName:"ddtk",debugDelay:200,interval:200,disableMenu:!0,stopIntervalTime:5e3};function u(){window.addEventListener("keydown",(function(n){if(123===((n=n||window.event).keyCode||n.which)||n.shiftKey&&n.ctrlKey&&73===n.keyCode)return n.returnValue=!1,n.preventDefault(),!1}),!1),(r.disableMenu||function(){var n=navigator.userAgent,e=n.indexOf("compatible")>-1&&n.indexOf("MSIE")>-1,t=n.indexOf("Edge")>-1&&!e,o=n.indexOf("Trident")>-1&&n.indexOf("rv:11.0")>-1;return e||t||o}())&&window.addEventListener("contextmenu",(function(n){return(n=n||window.event).returnValue=!1,n.preventDefault(),!1}),!1)}var a=null,d=null,f=[];function c(){var n,e,t,o,i,u,c=!1,l=function(){c=!0},s=function(){c=!1};n=l,e=s,t=window.alert,o=window.confirm,i=window.prompt,u=function(t){return function(){n&&n(),t.apply(void 0,arguments),e&&e()}},window.alert=u(t),window.confirm=u(o),window.prompt=u(i),function(n,e){var t,o,i;void 0!==document.hidden?(t="hidden",i="visibilitychange",o="visibilityState"):void 0!==document.mozHidden?(t="mozHidden",i="mozvisibilitychange",o="mozVisibilityState"):void 0!==document.msHidden?(t="msHidden",i="msvisibilitychange",o="msVisibilityState"):void 0!==document.webkitHidden&&(t="webkitHidden",i="webkitvisibilitychange",o="webkitVisibilityState");var r=function(){document[o]===t?e():n()};document.removeEventListener(i,r,!1),document.addEventListener(i,r,!1)}(s,l),a=window.setInterval((function(){console.log(1),c||f.forEach((function(n){n()}))}),r.interval),d=setTimeout((function(){/(iphone|ipad|ipod|ios|android)/i.test(navigator.userAgent.toLowerCase())&&window.clearInterval(a)}),r.stopIntervalTime)}function l(n){f.push(n)}function s(n,e,t,o,i,r){return w((u=w(w(e,n),w(o,r)))<<(a=i)|u>>>32-a,t);var u,a}function v(n,e,t,o,i,r,u){return s(e&t|~e&o,n,e,i,r,u)}function m(n,e,t,o,i,r,u){return s(e&o|t&~o,n,e,i,r,u)}function p(n,e,t,o,i,r,u){return s(e^t^o,n,e,i,r,u)}function b(n,e,t,o,i,r,u){return s(t^(e|~o),n,e,i,r,u)}function w(n,e){var t=(65535&n)+(65535&e);return(n>>16)+(e>>16)+(t>>16)<<16|65535&t}var y=function(n){return function(n){for(var e="0123456789abcdef",t="",o=0;o<4*n.length;o++)t+=e.charAt(n[o>>2]>>o%4*8+4&15)+e.charAt(n[o>>2]>>o%4*8&15);return t}(function(n,e){n[e>>5]|=128<>>9<<4)]=e;for(var t=1732584193,o=-271733879,i=-1732584194,r=271733878,u=0;u>5]|=(255&n.charCodeAt(t/8))<0&&void 0!==arguments[0]?arguments[0]:{};for(var e in r)n[e]&&i(r[e])===i(n[e])&&(r[e]=n[e])}(n),function(){if(r.md5){var n=function(n){var e=window.location.search;if(""!==e){var t=new RegExp("(^|&)"+n+"=([^&]*)(&|$)","i"),o=e.substr(1).match(t);if(null!=o)return unescape(o[2])}return""}(r.tkName);if(y(n)===r.md5)return!0}return!1}())||(c(),u(),function(){var n=~navigator.userAgent.indexOf("Firefox"),e="";n?(e=/./).toString=function(){S=!0,x()}:(e=new Image).__defineGetter__("id",(function(){S=!0,x()}));l((function(){console.log(e),console.clear&&console.clear()}))}(),e=new Function("debugger"),l((function(){if(!S){var n=o();e(),o()-n>r.interval+r.debugDelay&&x()}})))}g.md5=y,g.version="0.0.5";var h=!1;function x(){h||(h=!0,window.clearTimeout(d),r.ondevtoolopen())}var S=!1;!function(){var n=document.getElementById("disable-devtool");if(n){var e={};["md5","url","tk-name","debug-delay","interval","disable-menu"].forEach((function(t){var o=n.getAttribute(t);null!==o&&("debug-delay"===t||"interval"===t?o=parseInt(o):"disable-menu"===t&&(o="false"!==o),e[function(n){if(-1===n.indexOf("-"))return n;var e=!1;return n.split("").map((function(n){return"-"===n?(e=!0,""):e?(e=!1,n.toUpperCase()):n})).join("")}(t)]=o)})),g(e)}}();e.default=g}]).default})); \ No newline at end of file +!function(n,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.DisableDevtool=e():n.DisableDevtool=e()}(this,(function(){return function(n){var e={};function t(o){if(e[o])return e[o].exports;var i=e[o]={i:o,l:!1,exports:{}};return n[o].call(i.exports,i,i.exports,t),i.l=!0,i.exports}return t.m=n,t.c=e,t.d=function(n,e,o){t.o(n,e)||Object.defineProperty(n,e,{enumerable:!0,get:o})},t.r=function(n){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(n,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(n,"__esModule",{value:!0})},t.t=function(n,e){if(1&e&&(n=t(n)),8&e)return n;if(4&e&&"object"==typeof n&&n&&n.__esModule)return n;var o=Object.create(null);if(t.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:n}),2&e&&"string"!=typeof n)for(var i in n)t.d(o,i,function(e){return n[e]}.bind(null,i));return o},t.n=function(n){var e=n&&n.__esModule?function(){return n.default}:function(){return n};return t.d(e,"a",e),e},t.o=function(n,e){return Object.prototype.hasOwnProperty.call(n,e)},t.p="",t(t.s=0)}([function(n,e,t){"use strict";function o(){return(new Date).getTime()}function i(n){return(i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(n){return typeof n}:function(n){return n&&"function"==typeof Symbol&&n.constructor===Symbol&&n!==Symbol.prototype?"symbol":typeof n})(n)}t.r(e);var r={md5:"",ondevtoolopen:function(){r.url?window.location.href=r.url:(window.opener=null,window.open("","_self"),window.close(),window.history.back(),setTimeout((function(){window.location.href="http://localhost"}),100))},url:"",tkName:"ddtk",debugDelay:200,interval:200,disableMenu:!0,stopIntervalTime:5e3};function u(){window.addEventListener("keydown",(function(n){if(123===((n=n||window.event).keyCode||n.which)||n.shiftKey&&n.ctrlKey&&73===n.keyCode)return n.returnValue=!1,n.preventDefault(),!1}),!1),(r.disableMenu||function(){var n=navigator.userAgent,e=n.indexOf("compatible")>-1&&n.indexOf("MSIE")>-1,t=n.indexOf("Edge")>-1&&!e,o=n.indexOf("Trident")>-1&&n.indexOf("rv:11.0")>-1;return e||t||o}())&&window.addEventListener("contextmenu",(function(n){return(n=n||window.event).returnValue=!1,n.preventDefault(),!1}),!1)}var a=null,f=null,d=[];function c(){var n,e,t,o,i,u,c=!1,l=function(){c=!0},s=function(){c=!1};n=l,e=s,t=window.alert,o=window.confirm,i=window.prompt,u=function(t){return function(){n&&n(),t.apply(void 0,arguments),e&&e()}},window.alert=u(t),window.confirm=u(o),window.prompt=u(i),function(n,e){var t,o,i;void 0!==document.hidden?(t="hidden",i="visibilitychange",o="visibilityState"):void 0!==document.mozHidden?(t="mozHidden",i="mozvisibilitychange",o="mozVisibilityState"):void 0!==document.msHidden?(t="msHidden",i="msvisibilitychange",o="msVisibilityState"):void 0!==document.webkitHidden&&(t="webkitHidden",i="webkitvisibilitychange",o="webkitVisibilityState");var r=function(){document[o]===t?e():n()};document.removeEventListener(i,r,!1),document.addEventListener(i,r,!1)}(s,l),a=window.setInterval((function(){console.log(1),c||d.forEach((function(n){n()}))}),r.interval),f=setTimeout((function(){/(iphone|ipad|ipod|ios|android)/i.test(navigator.userAgent.toLowerCase())&&window.clearInterval(a)}),r.stopIntervalTime)}function l(n){d.push(n)}function s(n,e,t,o,i,r){return w((u=w(w(e,n),w(o,r)))<<(a=i)|u>>>32-a,t);var u,a}function v(n,e,t,o,i,r,u){return s(e&t|~e&o,n,e,i,r,u)}function m(n,e,t,o,i,r,u){return s(e&o|t&~o,n,e,i,r,u)}function p(n,e,t,o,i,r,u){return s(e^t^o,n,e,i,r,u)}function b(n,e,t,o,i,r,u){return s(t^(e|~o),n,e,i,r,u)}function w(n,e){var t=(65535&n)+(65535&e);return(n>>16)+(e>>16)+(t>>16)<<16|65535&t}var y=function(n){return function(n){for(var e="0123456789abcdef",t="",o=0;o<4*n.length;o++)t+=e.charAt(n[o>>2]>>o%4*8+4&15)+e.charAt(n[o>>2]>>o%4*8&15);return t}(function(n,e){n[e>>5]|=128<>>9<<4)]=e;for(var t=1732584193,o=-271733879,i=-1732584194,r=271733878,u=0;u>5]|=(255&n.charCodeAt(t/8))<0&&void 0!==arguments[0]?arguments[0]:{};for(var e in r)n[e]&&i(r[e])===i(n[e])&&(r[e]=n[e])}(n),function(){if(r.md5){var n=function(n){var e=window.location.search;if(""!==e){var t=new RegExp("(^|&)"+n+"=([^&]*)(&|$)","i"),o=e.substr(1).match(t);if(null!=o)return unescape(o[2])}return""}(r.tkName);if(y(n)===r.md5)return!0}return!1}())||(c(),u(),function(){var n=~navigator.userAgent.indexOf("Firefox"),e="";n?(e=/./).toString=function(){S=!0,x()}:(e=new Image).__defineGetter__("id",(function(){S=!0,x()}));l((function(){console.log(e),console.clear&&console.clear()}))}(),e=new Function("debugger"),l((function(){if(!S){var n=o();e(),o()-n>r.interval+r.debugDelay&&x()}})))}g.md5=y,g.version="0.0.6";var h=!1;function x(){h||(h=!0,window.clearTimeout(f),r.ondevtoolopen())}var S=!1;!function(){var n=document.querySelector("[disable-devtool-auto]");if(n){var e={};["md5","url","tk-name","debug-delay","interval","disable-menu"].forEach((function(t){var o=n.getAttribute(t);null!==o&&("debug-delay"===t||"interval"===t?o=parseInt(o):"disable-menu"===t&&(o="false"!==o),e[function(n){if(-1===n.indexOf("-"))return n;var e=!1;return n.split("").map((function(n){return"-"===n?(e=!0,""):e?(e=!1,n.toUpperCase()):n})).join("")}(t)]=o)})),g(e)}}();e.default=g}]).default})); \ No newline at end of file diff --git a/npm/package.json b/npm/package.json index 7688181..dab28d4 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "disable-devtool", - "version": "0.0.5", + "version": "0.0.6", "description": "Disable web developer tools from the f12 button, right-click and browser ", "main": "disable-devtool.min.js", "scripts": { diff --git a/package.json b/package.json index 2714c6b..7436c50 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "disable-devtool", - "version": "0.0.5", + "version": "0.0.6", "description": "Disable web developer tools from the f12 button, right-click and browser ", "main": "disable-devtool.min.js", "unpkg": "disable-devtool.min.js", diff --git a/src/main.js b/src/main.js index 60f2de5..2bbeeb7 100644 --- a/src/main.js +++ b/src/main.js @@ -75,7 +75,7 @@ function initDevTool () { } function checkScriptUse () { - let dom = document.getElementById('disable-devtool'); + let dom = document.querySelector('[disable-devtool-auto]'); if (!dom) { return; } diff --git a/src/version.js b/src/version.js index 4fe8c44..377823b 100644 --- a/src/version.js +++ b/src/version.js @@ -1 +1 @@ -export default '0.0.5'; \ No newline at end of file +export default '0.0.6'; \ No newline at end of file