extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of splitter

Browse Source
This commit is contained in:
Nathan Gray 2014-04-01 22:51:26 +00:00
parent 210dea829b
commit 51a083e112
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
admin/js/app.js
View File

@ -20,15 +20,9 @@ app.classes.admin = AppJS.extend(
*/ */
{ {
appname: 'admin', appname: 'admin',
/**
* reference to splitter
*
* {et2_splitter}
*/
splitter: null,
/** /**
* reference to splitter * reference to iframe
* *
* {et2_iframe} * {et2_iframe}
*/ */
@ -51,7 +45,6 @@ app.classes.admin = AppJS.extend(
destroy: function() destroy: function()
{ {
this.iframe = null; this.iframe = null;
this.splitter = null;
// call parent // call parent
this._super.apply(this, arguments); this._super.apply(this, arguments);
@ -74,21 +67,19 @@ app.classes.admin = AppJS.extend(
{ {
case 'admin.index': case 'admin.index':
var iframe = this.iframe = this.et2.getWidgetById('iframe'); var iframe = this.iframe = this.et2.getWidgetById('iframe');
this.nm = this.et2.getWidgetById('nm');
if (iframe) if (iframe)
{ {
var self = this; var self = this;
jQuery(iframe.getDOMNode()).off('load.admin') jQuery(iframe.getDOMNode()).off('load.admin')
.bind('load.admin', function(){ .bind('load.admin', function(){
self._hide_navbar.call(self); self._hide_navbar.call(self);
self.splitter.dock();
self.splitter.resize();
} }
); );
// Register app refresh now that iframe is available // Register app refresh now that iframe is available
register_app_refresh('admin',jQuery.proxy(this.refresh,this)); register_app_refresh('admin',jQuery.proxy(this.refresh,this));
} }
this.splitter = this.et2.getWidgetById('splitter');
break; break;
case 'admin.categories.index': case 'admin.categories.index':
@ -234,7 +225,8 @@ app.classes.admin = AppJS.extend(
if (_id == '/accounts' || _id.substr(0, 8) == '/groups/') if (_id == '/accounts' || _id.substr(0, 8) == '/groups/')
{ {
this.splitter.undock(); this.nm.set_disabled(false);
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: ''});
} }
@ -244,7 +236,8 @@ app.classes.admin = AppJS.extend(
} }
else if (link[0] == '/' || link.substr(0,4) == 'http') else if (link[0] == '/' || link.substr(0,4) == 'http')
{ {
this.splitter.dock(); this.nm.set_disabled(true);
this.iframe.set_disabled(false);
this.iframe.set_src(link+(link.match(/\?/)?'&':'?')+'nonavbar=1'); this.iframe.set_src(link+(link.match(/\?/)?'&':'?')+'nonavbar=1');
} }
else if (link.substr(0,11) == 'javascript:') else if (link.substr(0,11) == 'javascript:')
@ -289,7 +282,8 @@ app.classes.admin = AppJS.extend(
} }
else else
{ {
this.splitter.dock(); this.nm.set_disabled(true);
this.iframe.set_disabled(false);
this.iframe.set_src(url); this.iframe.set_src(url);
} }
break; break;

6
admin/templates/default/index.xet
View File

@ -45,9 +45,7 @@
</template> </template>
<template id="admin.index" template="" lang="" group="0" version="1.9.001"> <template id="admin.index" template="" lang="" group="0" version="1.9.001">
<tree autoloading="admin_ui::ajax_tree" id="tree" onclick="app.admin.run" parent_node="admin_tree_target" std_images="bullet"/> <tree autoloading="admin_ui::ajax_tree" id="tree" onclick="app.admin.run" parent_node="admin_tree_target" std_images="bullet"/>
<split dock_side="topDock" id="splitter" orientation="h"> <nextmatch id="nm" template="admin.index.rows"/>
<nextmatch id="nm" template="admin.index.rows"/> <iframe frameborder="1" height="100%" id="iframe" scrolling="auto" width="100%" disabled="true"/>
<iframe frameborder="1" height="100%" id="iframe" scrolling="auto" width="100%"/>
</split>
</template> </template>
</overlay> </overlay>