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

fixed not always enabled iframe when its source was set

Browse Source
This commit is contained in:
Ralf Becker 2014-04-02 14:32:52 +00:00
parent 79126ae745
commit f456109f5b
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
admin/js/app.js
View File

@ -28,6 +28,13 @@ app.classes.admin = AppJS.extend(
*/ */
iframe: null, iframe: null,
/**
* reference to nextmatch
*
* {et2_extension_nextmatch}
*/
nm: null,
/** /**
* Constructor * Constructor
* *
@ -87,6 +94,21 @@ app.classes.admin = AppJS.extend(
} }
}, },
/**
* Show given url in (visible) iframe or nextmatch with accounts (!_url)
*
* @param {string} [_url=] url to show in iframe or nothing for showing
*/
load: function(_url)
{
if (_url)
{
this.iframe.set_src(_url);
}
this.iframe.set_disabled(!_url);
this.nm.set_disabled(!!_url);
},
/** /**
* Special handling for egw_refresh() in admin, to refresh the iframe when * Special handling for egw_refresh() in admin, to refresh the iframe when
* the framework detects a simple refresh can be used (same URL). * the framework detects a simple refresh can be used (same URL).
@ -188,7 +210,7 @@ app.classes.admin = AppJS.extend(
var id = _senders[0].id.split('::'); var id = _senders[0].id.split('::');
var url = _action.data.url.replace(/(%24|\$)id/, id[1]); var url = _action.data.url.replace(/(%24|\$)id/, id[1]);
this.iframe.set_src(url); this.load(url);
}, },
/** /**
@ -206,7 +228,7 @@ app.classes.admin = AppJS.extend(
{ {
_url = _url.replace(/menuaction=admin.admin_ui.index/, 'menuaction='+matches[1]).replace(/&(ajax=true|load=[^&]+)/g, ''); _url = _url.replace(/menuaction=admin.admin_ui.index/, 'menuaction='+matches[1]).replace(/&(ajax=true|load=[^&]+)/g, '');
} }
this.iframe.set_src(_url); this.load(_url);
return true; return true;
} }
// can not load our own index page, has to be done by framework // can not load our own index page, has to be done by framework
@ -225,8 +247,7 @@ app.classes.admin = AppJS.extend(
if (_id == '/accounts' || _id.substr(0, 8) == '/groups/') if (_id == '/accounts' || _id.substr(0, 8) == '/groups/')
{ {
this.nm.set_disabled(false); this.load();
this.iframe.set_disabled(true);
var parts = _id.split('/'); var parts = _id.split('/');
this.et2.getWidgetById('nm').applyFilters({ filter: parts[2] ? parts[2] : '', search: ''}); this.et2.getWidgetById('nm').applyFilters({ filter: parts[2] ? parts[2] : '', search: ''});
} }
@ -236,9 +257,7 @@ app.classes.admin = AppJS.extend(
} }
else if (link[0] == '/' || link.substr(0,4) == 'http') else if (link[0] == '/' || link.substr(0,4) == 'http')
{ {
this.nm.set_disabled(true); this.load(link+(link.match(/\?/)?'&':'?')+'nonavbar=1');
this.iframe.set_disabled(false);
this.iframe.set_src(link+(link.match(/\?/)?'&':'?')+'nonavbar=1');
} }
else if (link.substr(0,11) == 'javascript:') else if (link.substr(0,11) == 'javascript:')
{ {
@ -282,9 +301,7 @@ app.classes.admin = AppJS.extend(
} }
else else
{ {
this.nm.set_disabled(true); this.load(url);
this.iframe.set_disabled(false);
this.iframe.set_src(url);
} }
break; break;
} }