Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* Prevent popup error

* Splitter adheres to minwidth
  • Loading branch information...
commit fe5b7e6c3ff3c006c082217ca32f0225663a1e20 1 parent bbfdb1d
@javruben javruben authored
View
3  core/lib/util/popup.js
@@ -345,6 +345,9 @@ apf.popup = {
if (apf.isChildOf(this.cache[uId].content, htmlNode, true))
return;
+ if (!this.cache[uId].options)
+ return;
+
uId = this.cache[uId].options.allowTogether;
}
View
3  elements/hbox.js
@@ -828,7 +828,8 @@ apf.vbox = function(struct, tagName){
if (!apf.window.vManager.check(this, this.$uniqueId, this.$resize))
return;
-this.$noResize = true;
+
+ this.$noResize = true;
this.$lastSize = [this.$int.offsetWidth, this.$int.offsetHeight];
//this.$ext.style.border = "1px solid " + (["red", "green", "blue", "orange", "pink", "yellow"])[Math.round(Math.random() * 5)];
View
7 elements/splitter.js
@@ -240,11 +240,14 @@ apf.splitter = function(struct, tagName){
else {
if (_self.$previous) {
var posPrev = apf.getAbsolutePosition(_self.$previous.$ext, _self.parentNode.$int);
- var min = _self.$scale ? 0 : posPrev[d1] || 0;
+ var min = _self.$scale
+ ? 0
+ : (posPrev[d1] || 0) + (parseInt(_self.$previous.minwidth) || 0);
}
if (_self.$next) {
var posNext = apf.getAbsolutePosition(_self.$next.$ext, _self.parentNode.$int);
- var max = posNext[d1] + _self.$next.$ext[offsetSize] - this[offsetSize];
+ var max = posNext[d1] + _self.$next.$ext[offsetSize]
+ - this[offsetSize] - (parseInt(_self.$next.minwidth) || 0);
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.