Browse Source

Merge pull request #92 in ~GUY/fineui from ~YOUNG/fineuig:master to master

* commit 'ab5d2210c91c467790a9ce89cc87574d006d518b':
  BI-7154 IE8下的布局问题
es6
Young 7 years ago
parent
commit
4401aa69dc
  1. 14
      bi/core.js
  2. 14
      docs/core.js
  3. 7
      src/core/wrapper/layout/adapt/float.center.js
  4. 7
      src/core/wrapper/layout/adapt/float.horizontal.js

14
bi/core.js

@ -12258,15 +12258,20 @@ BI.FloatCenterAdaptLayout = BI.inherit(BI.Layout, {
},
mounted: function () {
var self = this;
var width = this.left.element.outerWidth(),
height = this.left.element.outerHeight();
this.left.element.width(width).height(height).css("float", "none");
BI.remove(this._children, function (i, wi) {
if (wi === self.container) {
delete self._children[i];
}
});
BI.createWidget({
type: "bi.center_adapt",
element: this,
items: [this.left]
});
this.removeWidget(this.container);
},
stroke: function (items) {
@ -12321,15 +12326,20 @@ BI.FloatHorizontalLayout = BI.inherit(BI.Layout, {
},
mounted: function () {
var self = this;
var width = this.left.element.width(),
height = this.left.element.height();
this.left.element.width(width).height(height).css("float", "none");
BI.remove(this._children, function (i, wi) {
if (wi === self.container) {
delete self._children[i];
}
});
BI.createWidget({
type: "bi.horizontal_auto",
element: this,
items: [this.left]
});
this.removeWidget(this.container);
},
_addElement: function (i, item) {

14
docs/core.js

@ -25766,15 +25766,20 @@ BI.FloatCenterAdaptLayout = BI.inherit(BI.Layout, {
},
mounted: function () {
var self = this;
var width = this.left.element.outerWidth(),
height = this.left.element.outerHeight();
this.left.element.width(width).height(height).css("float", "none");
BI.remove(this._children, function (i, wi) {
if (wi === self.container) {
delete self._children[i];
}
});
BI.createWidget({
type: "bi.center_adapt",
element: this,
items: [this.left]
});
this.removeWidget(this.container);
},
stroke: function (items) {
@ -25829,15 +25834,20 @@ BI.FloatHorizontalLayout = BI.inherit(BI.Layout, {
},
mounted: function () {
var self = this;
var width = this.left.element.width(),
height = this.left.element.height();
this.left.element.width(width).height(height).css("float", "none");
BI.remove(this._children, function (i, wi) {
if (wi === self.container) {
delete self._children[i];
}
});
BI.createWidget({
type: "bi.horizontal_auto",
element: this,
items: [this.left]
});
this.removeWidget(this.container);
},
_addElement: function (i, item) {

7
src/core/wrapper/layout/adapt/float.center.js

@ -29,15 +29,20 @@ BI.FloatCenterAdaptLayout = BI.inherit(BI.Layout, {
},
mounted: function () {
var self = this;
var width = this.left.element.outerWidth(),
height = this.left.element.outerHeight();
this.left.element.width(width).height(height).css("float", "none");
BI.remove(this._children, function (i, wi) {
if (wi === self.container) {
delete self._children[i];
}
});
BI.createWidget({
type: "bi.center_adapt",
element: this,
items: [this.left]
});
this.removeWidget(this.container);
},
stroke: function (items) {

7
src/core/wrapper/layout/adapt/float.horizontal.js

@ -24,15 +24,20 @@ BI.FloatHorizontalLayout = BI.inherit(BI.Layout, {
},
mounted: function () {
var self = this;
var width = this.left.element.width(),
height = this.left.element.height();
this.left.element.width(width).height(height).css("float", "none");
BI.remove(this._children, function (i, wi) {
if (wi === self.container) {
delete self._children[i];
}
});
BI.createWidget({
type: "bi.horizontal_auto",
element: this,
items: [this.left]
});
this.removeWidget(this.container);
},
_addElement: function (i, item) {

Loading…
Cancel
Save