From e6f85d694a6de310fa2d0b25bab4edbb847d3a75 Mon Sep 17 00:00:00 2001 From: Arcko Date: Mon, 18 Aug 2014 01:47:20 +0800 Subject: [PATCH 1/3] Null check for frameElement to avoid firebug error when loading default home page after login in --- jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js b/jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js index ffa6e9d1..3008e23e 100644 --- a/jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js +++ b/jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js @@ -8,7 +8,9 @@ window.onerror = function() { var iframe;// iframe操作对象 var win;//窗口对象 var gridname="";//操作datagrid对象名称 -var windowapi = frameElement.api, W = windowapi.opener;//内容页中调用窗口实例对象接口 +if ( "" != frameElement.api) { + var windowapi = frameElement.api, W = windowapi.opener;//内容页中调用窗口实例对象接口 +} function upload(curform) { upload(); } From aa8dd8324791dadbfa55066be0a830134e5bf967 Mon Sep 17 00:00:00 2001 From: Arcko Date: Mon, 18 Aug 2014 09:51:13 +0800 Subject: [PATCH 2/3] Null check for frameElement to avoid firebug error when loading default home page after login in --- jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js b/jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js index 3008e23e..3d4b0267 100644 --- a/jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js +++ b/jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js @@ -8,7 +8,7 @@ window.onerror = function() { var iframe;// iframe操作对象 var win;//窗口对象 var gridname="";//操作datagrid对象名称 -if ( "" != frameElement.api) { +if ( frameElement) { var windowapi = frameElement.api, W = windowapi.opener;//内容页中调用窗口实例对象接口 } function upload(curform) { From 84d3045d053c5046a1f893056a19339b9429d27c Mon Sep 17 00:00:00 2001 From: Arcko Date: Mon, 18 Aug 2014 09:51:30 +0800 Subject: [PATCH 3/3] Null check for frameElement to avoid firebug error when loading default home page after login in --- jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js b/jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js index 3d4b0267..a4b15b3d 100644 --- a/jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js +++ b/jeecg-framework/src/main/webapp/plug-in/tools/curdtools.js @@ -8,7 +8,7 @@ window.onerror = function() { var iframe;// iframe操作对象 var win;//窗口对象 var gridname="";//操作datagrid对象名称 -if ( frameElement) { +if ( frameElement ) { var windowapi = frameElement.api, W = windowapi.opener;//内容页中调用窗口实例对象接口 } function upload(curform) {