extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-31 19:19:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Override window.close() with framework specific close function

Browse Source
This commit is contained in:
Hadi Nategh 2014-11-27 17:01:47 +00:00
parent 81ef504361
commit 7984f04078
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/js/jsapi/egw.js
View File

@ -174,7 +174,7 @@
{ {
egw(window.opener).message(JSON.parse(egw_script.getAttribute('data-message'))); egw(window.opener).message(JSON.parse(egw_script.getAttribute('data-message')));
} }
window.close(); egw(window).close();
} }
// call egw.open_link, if popup attr specified // call egw.open_link, if popup attr specified

17
phpgwapi/js/jsapi/egw_open.js
View File

@ -336,6 +336,21 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
} }
}, },
/**
* Close current window / popup
*/
close: function()
{
if (_wnd.framework && typeof _wnd.framework.popup_close == "function")
{
_wnd.framework.popup_close(_wnd);
}
else
{
_wnd.close();
}
},
/** /**
* Check if browser pop-up blocker is on/off * Check if browser pop-up blocker is on/off
* *
@ -385,4 +400,4 @@ try {
} }
} catch (e) {} } catch (e) {}
}); });
*/ */