Browse Source

ie8 window.console fix https://github.com/javascript-obfuscator/webpack-obfuscator/issues/13

sanex3339 8 years ago
parent
commit
75c925f1d3

+ 4 - 3
dist/index.js

@@ -88,7 +88,7 @@ module.exports =
 /******/ 	__webpack_require__.p = "";
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 87);
+/******/ 	return __webpack_require__(__webpack_require__.s = 88);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -4269,7 +4269,7 @@ exports.SingleNodeCallControllerTemplate = SingleNodeCallControllerTemplate;
 "use strict";
 
 function ConsoleOutputDisableExpressionTemplate() {
-    return "\n        var {consoleLogDisableFunctionName} = {singleNodeCallControllerFunctionName}(this, function () {\n            var getGlobal = Function('return (function() ' + '{}.constructor(\"return this\")( )' + ');');\n            \n            var func = function () {};\n            var that = getGlobal();\n            \n            that.console = (function (func){ \n                var c = {}; \n                \n                c.log = c.warn = c.debug = c.info = c.error = c.exception = c.trace = func; \n                \n                return c; \n            })(func);\n        });\n        \n        {consoleLogDisableFunctionName}();\n    ";
+    return "\n        var {consoleLogDisableFunctionName} = {singleNodeCallControllerFunctionName}(this, function () {\n            var getGlobal = Function('return (function() ' + '{}.constructor(\"return this\")( )' + ');');\n            \n            var func = function () {};\n            var that = getGlobal();\n            \n            if (!that.console) {\n                that.console = (function (func){ \n                    var c = {}; \n                    \n                    c.log = func;\n                    c.warn = func; \n                    c.debug = func;\n                    c.info = func;\n                    c.error = func;\n                    c.exception = func;\n                    c.trace = func;\n                    \n                    return c; \n                })(func);\n            } else {\n                that.console.log = func;\n                that.console.warn = func; \n                that.console.debug = func;\n                that.console.info = func;\n                that.console.error = func;\n                that.console.exception = func;\n                that.console.trace = func;\n            }\n        });\n        \n        {consoleLogDisableFunctionName}();\n    ";
 }
 exports.ConsoleOutputDisableExpressionTemplate = ConsoleOutputDisableExpressionTemplate;
 
@@ -4460,7 +4460,8 @@ module.exports = require("fs");
 module.exports = require("mkdirp");
 
 /***/ },
-/* 87 */
+/* 87 */,
+/* 88 */
 /***/ function(module, exports, __webpack_require__) {
 
 "use strict";

+ 23 - 7
src/templates/custom-nodes/console-output-nodes/console-output-disable-expression-node/ConsoleOutputDisableExpressionTemplate.ts

@@ -9,13 +9,29 @@ export function ConsoleOutputDisableExpressionTemplate (): string {
             var func = function () {};
             var that = getGlobal();
             
-            that.console = (function (func){ 
-                var c = {}; 
-                
-                c.log = c.warn = c.debug = c.info = c.error = c.exception = c.trace = func; 
-                
-                return c; 
-            })(func);
+            if (!that.console) {
+                that.console = (function (func){ 
+                    var c = {}; 
+                    
+                    c.log = func;
+                    c.warn = func; 
+                    c.debug = func;
+                    c.info = func;
+                    c.error = func;
+                    c.exception = func;
+                    c.trace = func;
+                    
+                    return c; 
+                })(func);
+            } else {
+                that.console.log = func;
+                that.console.warn = func; 
+                that.console.debug = func;
+                that.console.info = func;
+                that.console.error = func;
+                that.console.exception = func;
+                that.console.trace = func;
+            }
         });
         
         {consoleLogDisableFunctionName}();