Browse Source

Merge pull request #231 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '0b00f33371f226202e9e447b93eb34a39a7b2f9b':
  IE9
es6
windy 7 years ago
parent
commit
ebc5e4c0d2
  1. 16
      bi/base.js
  2. 16
      dist/base.js
  3. 16
      dist/bundle.js
  4. 4
      dist/bundle.min.js
  5. 8
      src/base/collection/collection.js
  6. 8
      src/base/grid/grid.js

16
bi/base.js

@ -2805,8 +2805,12 @@ BI.CollectionView = BI.inherit(BI.Widget, {
this.container.setHeight(this._height);
this._calculateChildrenToRender();
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
//元素未挂载时不能设置scrollTop
try {
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
} catch (e) {
}
}
},
@ -14985,8 +14989,12 @@ BI.GridView = BI.inherit(BI.Widget, {
this._rowSizeAndPositionManager = new BI.ScalingCellSizeAndPositionManager(this.rowCount, o.rowHeightGetter, o.estimatedRowSize);
this._calculateChildrenToRender();
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
//元素未挂载时不能设置scrollTop
try {
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
} catch (e) {
}
},
setScrollLeft: function (scrollLeft) {

16
dist/base.js vendored

@ -2805,8 +2805,12 @@ BI.CollectionView = BI.inherit(BI.Widget, {
this.container.setHeight(this._height);
this._calculateChildrenToRender();
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
//元素未挂载时不能设置scrollTop
try {
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
} catch (e) {
}
}
},
@ -14985,8 +14989,12 @@ BI.GridView = BI.inherit(BI.Widget, {
this._rowSizeAndPositionManager = new BI.ScalingCellSizeAndPositionManager(this.rowCount, o.rowHeightGetter, o.estimatedRowSize);
this._calculateChildrenToRender();
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
//元素未挂载时不能设置scrollTop
try {
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
} catch (e) {
}
},
setScrollLeft: function (scrollLeft) {

16
dist/bundle.js vendored

@ -28583,8 +28583,12 @@ BI.CollectionView = BI.inherit(BI.Widget, {
this.container.setHeight(this._height);
this._calculateChildrenToRender();
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
//元素未挂载时不能设置scrollTop
try {
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
} catch (e) {
}
}
},
@ -40763,8 +40767,12 @@ BI.GridView = BI.inherit(BI.Widget, {
this._rowSizeAndPositionManager = new BI.ScalingCellSizeAndPositionManager(this.rowCount, o.rowHeightGetter, o.estimatedRowSize);
this._calculateChildrenToRender();
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
//元素未挂载时不能设置scrollTop
try {
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
} catch (e) {
}
},
setScrollLeft: function (scrollLeft) {

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

8
src/base/collection/collection.js

@ -279,8 +279,12 @@ BI.CollectionView = BI.inherit(BI.Widget, {
this.container.setHeight(this._height);
this._calculateChildrenToRender();
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
//元素未挂载时不能设置scrollTop
try {
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
} catch (e) {
}
}
},

8
src/base/grid/grid.js

@ -244,8 +244,12 @@ BI.GridView = BI.inherit(BI.Widget, {
this._rowSizeAndPositionManager = new BI.ScalingCellSizeAndPositionManager(this.rowCount, o.rowHeightGetter, o.estimatedRowSize);
this._calculateChildrenToRender();
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
//元素未挂载时不能设置scrollTop
try {
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
} catch (e) {
}
},
setScrollLeft: function (scrollLeft) {

Loading…
Cancel
Save