caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

* commit 'ab5d2210c91c467790a9ce89cc87574d006d518b':
  BI-7154 IE8下的布局问题
es6
Young 8 years ago
parent
080b9c1f7c ab5d2210c9
commit
4401aa69dc
4 changed files with 36 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
Unescape View File

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

14
docs/core.js
Unescape View File

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

7
src/core/wrapper/layout/adapt/float.center.js
Unescape View File

@ -29,15 +29,20 @@ BI.FloatCenterAdaptLayout = BI.inherit(BI.Layout, {
}, },
mounted: function () { mounted: function () {
var self = this;
var width = this.left.element.outerWidth(), var width = this.left.element.outerWidth(),
height = this.left.element.outerHeight(); height = this.left.element.outerHeight();
this.left.element.width(width).height(height).css("float", "none"); 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({ BI.createWidget({
type: "bi.center_adapt", type: "bi.center_adapt",
element: this, element: this,
items: [this.left] items: [this.left]
}); });
this.removeWidget(this.container);
}, },
stroke: function (items) { stroke: function (items) {

7
src/core/wrapper/layout/adapt/float.horizontal.js
Unescape View File

@ -24,15 +24,20 @@ BI.FloatHorizontalLayout = BI.inherit(BI.Layout, {
}, },
mounted: function () { mounted: function () {
var self = this;
var width = this.left.element.width(), var width = this.left.element.width(),
height = this.left.element.height(); height = this.left.element.height();
this.left.element.width(width).height(height).css("float", "none"); 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({ BI.createWidget({
type: "bi.horizontal_auto", type: "bi.horizontal_auto",
element: this, element: this,
items: [this.left] items: [this.left]
}); });
this.removeWidget(this.container);
}, },
_addElement: function (i, item) { _addElement: function (i, item) {

Write Preview
Loading…
Cancel
Save