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

moved egw_links.js window contect specific parts to egw_open.js: egw().open() and egw().open_link() renamed from egw().call_link()

Browse Source
This commit is contained in:
Ralf Becker 2012-03-28 12:37:03 +00:00
parent d4b960e8bb
commit 2630a39651
5 changed files with 167 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etemplate/js/et2_widget_image.js
View File

@ -82,7 +82,7 @@ var et2_image = et2_baseWidget.extend([et2_IDetachedDOM], {
{
if(this.options.href)
{
this.egw().call_link(this.options.href, this.options.extra_link_target, this.options.extra_link_popup);
this.egw().open_link(this.options.href, this.options.extra_link_target, this.options.extra_link_popup);
}
},

2
etemplate/js/et2_widget_progress.js
View File

@ -81,7 +81,7 @@ var et2_progress = et2_valueWidget.extend([et2_IDetachedDOM],
if(this.options.href)
{
this.egw().call_link(this.options.href, this.options.extra_link_target, this.options.extra_link_popup);
this.egw().open_link(this.options.href, this.options.extra_link_target, this.options.extra_link_popup);
}
},

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

@ -18,6 +18,7 @@
egw_preferences;
egw_lang;
egw_links;
egw_open;
egw_user;
egw_config;
egw_images;

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

@ -1,5 +1,5 @@
/**
* EGroupware clientside API object
* EGroupware clientside API: link-registry, link-titles, generation links
*
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package etemplate
@ -14,7 +14,6 @@
/*egw:uses
egw_core;
egw_link;
*/
egw.extend('links', egw.MODULE_GLOBAL, function() {
@ -49,106 +48,6 @@ egw.extend('links', egw.MODULE_GLOBAL, function() {
var title_uid = null;
return {
/**
* View an EGroupware entry: opens a popup of correct size or redirects window.location to requested url
*
* Examples:
* - egw.open(123,'infolog') or egw.open('infolog:123') opens popup to edit or view (if no edit rights) infolog entry 123
* - egw.open('infolog:123','timesheet','add') opens popup to add new timesheet linked to infolog entry 123
* - egw.open(123,'addressbook','view') opens addressbook view for entry 123 (showing linked infologs)
* - egw.open('','addressbook','view_list',{ search: 'Becker' }) opens list of addresses containing 'Becker'
*
* @param string|int|object id_data either just the id or if app=="" "app:id" or object with all data
* to be able to open files you need to give: (mine-)type, path or id, app2 and id2 (path=/apps/app2/id2/id"
* @param string app app-name or empty (app is part of id)
* @param string type default "edit", possible "view", "view_list", "edit" (falls back to "view") and "add"
* @param object|string extra extra url parameters to append as object or string
* @param string target target of window to open
*/
open: function(id_data, app, type, extra, target)
{
if (typeof link_registry != 'object')
{
alert('egw.open() link registry is NOT defined!');
return;
}
var id;
if (!app)
{
if (typeof id_data != 'object')
{
var app_id = id.split(':',2);
app = app_id[0];
id = app_id[1];
}
else
{
app = id_data.app;
id = id_data.id;
}
}
else if (app != 'file')
{
id_data = { 'id': id, 'app': app, 'extra': extra };
}
var url;
var popup;
var params;
if (app == 'file')
{
url = this.mime_open(id_data);
if (typeof url == 'object')
{
if(typeof url.mime_popup != 'undefined')
{
popup = url.mime_popup;
delete url.mime_popup;
}
params = url;
url = '/index.php';
}
}
else
{
if (!app || typeof link_registry[app] != 'object')
{
alert('egw.open() app "'+app+'" NOT defined in link registry!');
return;
}
var app_registry = link_registry[app];
if (typeof type == 'undefined') type = 'edit';
if (type == 'edit' && typeof app_registry.edit == 'undefined') type = 'view';
if (typeof app_registry[type] == 'undefined')
{
alert('egw.open() type "'+type+'" is NOT defined in link registry for app "'+app+'"!');
return;
}
url = '/index.php';
params = app_registry[type];
if (type == 'view' || type == 'edit') // add id parameter for type view or edit
{
params[app_registry[type+'_id']] = id;
}
else if (type == 'add' && id) // add add_app and app_id parameters, if given for add
{
var app_id = id.split(':',2);
params[app_registry.add_app] = app_id[0];
params[app_registry.add_id] = app_id[1];
}
if (typeof extra == 'string')
{
url += '?'+extra;
}
else if (typeof extra == 'object')
{
$j.extend(params, extra);
}
popup = app_registry[type+'_popup'];
}
this.call_link(this.link(url, params), target, popup);
},
/**
* Check if $app is in the registry and has an entry for $name
*
@ -158,6 +57,11 @@ egw.extend('links', egw.MODULE_GLOBAL, function() {
*/
link_get_registry: function(_app, _name)
{
if (typeof link_registry != 'object')
{
alert('egw.open() link registry is NOT defined!');
return false;
}
if (typeof link_registry[_app] == 'undefined')
{
return false;
@ -318,44 +222,6 @@ egw.extend('links', egw.MODULE_GLOBAL, function() {
link_registry[_app] = _registry;
}
},
/**
* Call 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 _popup widthxheight, if a popup should be used
*/
call_link: function(_link, _target, _popup)
{
var url = _link;
if (url.indexOf('javascript:') == 0)
{
eval(url.substr(11));
return;
}
// link is not necessary an url, it can also be a menuaction!
if (url.indexOf('/') == -1 && url.split('.').length >= 3 &&
!(url.indexOf('mailto:') == 0 || url.indexOf('/index.php') == 0 || url.indexOf('://') != -1))
{
url = "/index.php?menuaction="+url;
}
// append the url to the webserver url, if not already contained or empty
if (url[0] == '/' && this.webserverUrl && this.webserverUrl != '/' && url.indexOf(this.webserverUrl+'/') != 0)
{
url = this.webserverUrl + url;
}
if (_popup)
{
var w_h = _popup.split('x');
if (w_h[1] == 'egw_getWindowOuterHeight()') w_h[1] = egw_getWindowOuterHeight();
egw_openWindowCentered2(url, _target, w_h[0], w_h[1]);
}
else
{
window.open(url, _target);
}
},
/**
* Generate a url which supports url or cookies based sessions
@ -371,6 +237,7 @@ egw.extend('links', egw.MODULE_GLOBAL, function() {
{
if (_url[0] != '/')
{
alert("egw.link('"+_url+"') called with url starting NOT with a slash!");
var app = window.egw_appName;
if (app != 'login' && app != 'logout') _url = app+'/'+_url;
}

157
phpgwapi/js/jsapi/egw_open.js Normal file
View File

@ -0,0 +1,157 @@
/**
* EGroupware clientside API: opening of windows, popups or application entries
*
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package etemplate
* @subpackage api
* @link http://www.egroupware.org
* @author Andreas Stöckel (as AT stylite.de)
* @author Ralf Becker <RalfBecker@outdoor-training.de>
* @version $Id$
*/
"use strict";
/*egw:uses
egw_core;
egw_links;
*/
egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd) {
return {
/**
* View an EGroupware entry: opens a popup of correct size or redirects window.location to requested url
*
* Examples:
* - egw.open(123,'infolog') or egw.open('infolog:123') opens popup to edit or view (if no edit rights) infolog entry 123
* - egw.open('infolog:123','timesheet','add') opens popup to add new timesheet linked to infolog entry 123
* - egw.open(123,'addressbook','view') opens addressbook view for entry 123 (showing linked infologs)
* - egw.open('','addressbook','view_list',{ search: 'Becker' }) opens list of addresses containing 'Becker'
*
* @param string|int|object id_data either just the id or if app=="" "app:id" or object with all data
* to be able to open files you need to give: (mine-)type, path or id, app2 and id2 (path=/apps/app2/id2/id"
* @param string app app-name or empty (app is part of id)
* @param string type default "edit", possible "view", "view_list", "edit" (falls back to "view") and "add"
* @param object|string extra extra url parameters to append as object or string
* @param string target target of window to open
*/
open: function(id_data, app, type, extra, target)
{
var id;
if (!app)
{
if (typeof id_data != 'object')
{
var app_id = id.split(':',2);
app = app_id[0];
id = app_id[1];
}
else
{
app = id_data.app;
id = id_data.id;
}
}
else if (app != 'file')
{
id_data = { 'id': id, 'app': app, 'extra': extra };
}
var url;
var popup;
var params;
if (app == 'file')
{
url = this.mime_open(id_data);
if (typeof url == 'object')
{
if(typeof url.mime_popup != 'undefined')
{
popup = url.mime_popup;
delete url.mime_popup;
}
params = url;
url = '/index.php';
}
}
else
{
var app_registry = this.link_get_registry(app);
if (!app || !app_registry)
{
alert('egw.open() app "'+app+'" NOT defined in link registry!');
return;
}
if (typeof type == 'undefined') type = 'edit';
if (type == 'edit' && typeof app_registry.edit == 'undefined') type = 'view';
if (typeof app_registry[type] == 'undefined')
{
alert('egw.open() type "'+type+'" is NOT defined in link registry for app "'+app+'"!');
return;
}
url = '/index.php';
params = app_registry[type];
if (type == 'view' || type == 'edit') // add id parameter for type view or edit
{
params[app_registry[type+'_id']] = id;
}
else if (type == 'add' && id) // add add_app and app_id parameters, if given for add
{
var app_id = id.split(':',2);
params[app_registry.add_app] = app_id[0];
params[app_registry.add_id] = app_id[1];
}
if (typeof extra == 'string')
{
url += '?'+extra;
}
else if (typeof extra == 'object')
{
$j.extend(params, extra);
}
popup = app_registry[type+'_popup'];
}
this.open_link(this.link(url, params), target, popup);
},
/**
* 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 _popup widthxheight, if a popup should be used
*/
open_link: function(_link, _target, _popup)
{
var url = _link;
if (url.indexOf('javascript:') == 0)
{
eval(url.substr(11));
return;
}
// link is not necessary an url, it can also be a menuaction!
if (url.indexOf('/') == -1 && url.split('.').length >= 3 &&
!(url.indexOf('mailto:') == 0 || url.indexOf('/index.php') == 0 || url.indexOf('://') != -1))
{
url = "/index.php?menuaction="+url;
}
// append the url to the webserver url, if not already contained or empty
if (url[0] == '/' && this.webserverUrl && this.webserverUrl != '/' && url.indexOf(this.webserverUrl+'/') != 0)
{
url = this.webserverUrl + url;
}
if (_popup)
{
var w_h = _popup.split('x');
if (w_h[1] == 'egw_getWindowOuterHeight()') w_h[1] = egw_getWindowOuterHeight();
_wnd.egw_openWindowCentered2(url, _target, w_h[0], w_h[1]);
}
else
{
_wnd.open(url, _target);
}
}
};
});