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

Don't initialize a hidden splitter, it ruins the size calculations. Initialization for hidden splitter is done (if needed) in resize().

Browse Source 
Fixes mail splitter in hidden tab initializing to top, wrecking nextmatch grid.
This commit is contained in:
Nathan Gray 2014-01-27 22:04:56 +00:00
parent ace95f26b0
commit d3e9f43b94
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
etemplate/js/et2_widget_split.js
View File

@ -159,6 +159,11 @@ var et2_split = et2_DOMWidget.extend([et2_IResizeable],
*/ */
_init_splitter: function() { _init_splitter: function() {
if(!this.isAttached()) return; if(!this.isAttached()) return;
// Avoid trying to do anything while hidden - it ruins all the calculations
// Try again in resize()
if(!this.div.is(':visible')) return;
var options = { var options = {
type: this.orientation, type: this.orientation,
dock: this.dock_side, dock: this.dock_side,
@ -174,6 +179,7 @@ var et2_split = et2_DOMWidget.extend([et2_IResizeable],
if(pref) if(pref)
{ {
options = $j.extend(options, pref); options = $j.extend(options, pref);
this.prefSize = pref[this.orientation == "v" ?'sizeLeft' : 'sizeTop'];
} }
} }
@ -192,7 +198,9 @@ var et2_split = et2_DOMWidget.extend([et2_IResizeable],
if(options.dock) if(options.dock)
{ {
if(options.dock == "bottomDock" && Math.abs(options.sizeTop - this.div.height()) < et2_split.DOCK_TOLERANCE || if(options.dock == "bottomDock" && Math.abs(options.sizeTop - this.div.height()) < et2_split.DOCK_TOLERANCE ||
options.dock == "topDock" && options.sizeTop == 0) options.dock == "topDock" && options.sizeTop == 0 ||
!this.div.is(':visible') // Starting docked if hidden simplifies life when resizing
)
{ {
this.dock(); this.dock();
} }
@ -217,6 +225,7 @@ var et2_split = et2_DOMWidget.extend([et2_IResizeable],
{ {
// Store current position in preferences // Store current position in preferences
var size = self.orientation == "v" ? {sizeLeft: self.left.width()} : {sizeTop: self.left.height()}; var size = self.orientation == "v" ? {sizeLeft: self.left.width()} : {sizeTop: self.left.height()};
self.prefSize = size[this.orientation == "v" ?'sizeLeft' : 'sizeTop'];
self.egw().set_preference(self.egw().getAppName(), 'splitter-size-' + self.id, size); self.egw().set_preference(self.egw().getAppName(), 'splitter-size-' + self.id, size);
} }
// Force immediate layout, so proper layout & sizes are available // Force immediate layout, so proper layout & sizes are available
@ -246,6 +255,11 @@ var et2_split = et2_DOMWidget.extend([et2_IResizeable],
* Implement the et2_IResizable interface to resize * Implement the et2_IResizable interface to resize
*/ */
resize: function() { resize: function() {
// Avoid doing anything while hidden - check here, and init if needed
if(this.div.children().length <= 2)
{
this._init_splitter();
}
if(this.dynheight) if(this.dynheight)
{ {
var old = {w: this.div.width(), h: this.div.height()}; var old = {w: this.div.width(), h: this.div.height()};
@ -274,7 +288,7 @@ var et2_split = et2_DOMWidget.extend([et2_IResizeable],
} }
if(w != old.w || h != old.h) if(w != old.w || h != old.h)
{ {
this.div.trigger('resize.et2_split.'+this.id); this.div.trigger('resize.et2_split.'+this.id, this.prefSize);
} }
}, this); }, this);
} }