holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed jdots/Stylite template to contain no more inline scripts

Browse Source
This commit is contained in:
Ralf Becker 2013-08-20 18:01:49 +00:00
parent 17203aaab3
commit b5ca4ac505
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,4 +155,15 @@
}
}
});
/**
*
*/
window.callManual = function()
{
if (window.framework)
{
window.framework.callManual.call(window.framework, window.location.href);
}
};
})();

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

@ -441,7 +441,7 @@ egw.extend('links', egw.MODULE_GLOBAL, function() {
var self = this;
// bind change handler
select.change(function(){
if (this.value) self.open('', this.value, 'add');
if (this.value) self.open('', this.value, 'add', {}, this.value);
this.value = '';
});
// need to load common translations for app-names

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

@ -126,17 +126,18 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd) {
}
popup = app_registry[type+'_popup'];
}
return this.open_link(this.link(url, params), target, popup);
return this.open_link(this.link(url, params), undefined, popup, target);
},
/**
* Open a link, which can be either a menuaction, a EGroupware relative url or a full url
*
* @param string _link menuaction, EGroupware relative url or a full url (incl. "mailto:" or "javascript:")
* @param string _target optional target
* @param string _target optional target / window name
* @param string _popup widthxheight, if a popup should be used
* @param string _target_app app-name for opener
*/
open_link: function(_link, _target, _popup)
open_link: function(_link, _target, _popup, _target_app)
{
var url = _link;
if (url.indexOf('javascript:') == 0)
@ -159,7 +160,7 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd) {
{
var w_h = _popup.split('x');
if (w_h[1] == 'egw_getWindowOuterHeight()') w_h[1] = egw_getWindowOuterHeight();
return _wnd.egw_openWindowCentered2(url, _target, w_h[0], w_h[1],false,false,true);
return _wnd.egw_openWindowCentered2(url, _target, w_h[0], w_h[1], false, _target_app, true);
}
else if (typeof _wnd.egw_link_handler == 'function' && (typeof _target == 'undefined' || _target =='_self' || typeof this.link_app_list()[_target] != "undefined"))
{