fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #751 in VISUAL/fineui from ~WINDY/fineui:master to master 

* commit '77d6590f0f81794ffd8213aec9450ef351598805':
  BI-34242 popover的small配置高度调整
es6
windy 6 years ago
parent
3bdfdbfe6a 77d6590f0f
commit
1ddf07cf2f
12 changed files with 32 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      dist/base.js
  2. 5
      dist/bundle.ie.js
  3. 4
      dist/bundle.ie.min.js
  4. 5
      dist/bundle.js
  5. 6
      dist/bundle.min.js
  6. 5
      dist/fineui.ie.js
  7. 4
      dist/fineui.ie.min.js
  8. 5
      dist/fineui.js
  9. 6
      dist/fineui.min.js
  10. 5
      dist/fineui_without_jquery_polyfill.js
  11. 2
      dist/utils.min.js
  12. 5
      src/base/layer/layer.popover.js

5
dist/base.js vendored
Unescape View File

@ -5761,8 +5761,9 @@ BI.Popover = BI.inherit(BI.Widget, {
self.tracker.captureMouseMoves(e);
});
if (o.logic.dynamic) {
var size = this._calculateSize();
var height = this.element.height();
var compareHeight = BI.clamp(height, 200, 600) - (o.footer ? 84 : 44);
var compareHeight = BI.clamp(height, size.height, 600) - (o.footer ? 84 : 44);
this.body.element.height(compareHeight);
}
},
@ -5774,7 +5775,7 @@ BI.Popover = BI.inherit(BI.Widget, {
switch (o.size) {
case this._constant.SIZE.SMALL:
size.width = 450;
size.height = 220;
size.height = 200;
break;
case this._constant.SIZE.BIG:
size.width = 900;

5
dist/bundle.ie.js vendored
Unescape View File

@ -40771,8 +40771,9 @@ BI.Popover = BI.inherit(BI.Widget, {
self.tracker.captureMouseMoves(e);
});
if (o.logic.dynamic) {
var size = this._calculateSize();
var height = this.element.height();
var compareHeight = BI.clamp(height, 200, 600) - (o.footer ? 84 : 44);
var compareHeight = BI.clamp(height, size.height, 600) - (o.footer ? 84 : 44);
this.body.element.height(compareHeight);
}
},
@ -40784,7 +40785,7 @@ BI.Popover = BI.inherit(BI.Widget, {
switch (o.size) {
case this._constant.SIZE.SMALL:
size.width = 450;
size.height = 220;
size.height = 200;
break;
case this._constant.SIZE.BIG:
size.width = 900;

4
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/bundle.js vendored
Unescape View File

@ -41175,8 +41175,9 @@ BI.Popover = BI.inherit(BI.Widget, {
self.tracker.captureMouseMoves(e);
});
if (o.logic.dynamic) {
var size = this._calculateSize();
var height = this.element.height();
var compareHeight = BI.clamp(height, 200, 600) - (o.footer ? 84 : 44);
var compareHeight = BI.clamp(height, size.height, 600) - (o.footer ? 84 : 44);
this.body.element.height(compareHeight);
}
},
@ -41188,7 +41189,7 @@ BI.Popover = BI.inherit(BI.Widget, {
switch (o.size) {
case this._constant.SIZE.SMALL:
size.width = 450;
size.height = 220;
size.height = 200;
break;
case this._constant.SIZE.BIG:
size.width = 900;

6
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/fineui.ie.js vendored
Unescape View File

@ -41013,8 +41013,9 @@ BI.Popover = BI.inherit(BI.Widget, {
self.tracker.captureMouseMoves(e);
});
if (o.logic.dynamic) {
var size = this._calculateSize();
var height = this.element.height();
var compareHeight = BI.clamp(height, 200, 600) - (o.footer ? 84 : 44);
var compareHeight = BI.clamp(height, size.height, 600) - (o.footer ? 84 : 44);
this.body.element.height(compareHeight);
}
},
@ -41026,7 +41027,7 @@ BI.Popover = BI.inherit(BI.Widget, {
switch (o.size) {
case this._constant.SIZE.SMALL:
size.width = 450;
size.height = 220;
size.height = 200;
break;
case this._constant.SIZE.BIG:
size.width = 900;

4
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/fineui.js vendored
Unescape View File

@ -41417,8 +41417,9 @@ BI.Popover = BI.inherit(BI.Widget, {
self.tracker.captureMouseMoves(e);
});
if (o.logic.dynamic) {
var size = this._calculateSize();
var height = this.element.height();
var compareHeight = BI.clamp(height, 200, 600) - (o.footer ? 84 : 44);
var compareHeight = BI.clamp(height, size.height, 600) - (o.footer ? 84 : 44);
this.body.element.height(compareHeight);
}
},
@ -41430,7 +41431,7 @@ BI.Popover = BI.inherit(BI.Widget, {
switch (o.size) {
case this._constant.SIZE.SMALL:
size.width = 450;
size.height = 220;
size.height = 200;
break;
case this._constant.SIZE.BIG:
size.width = 900;

6
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -29066,8 +29066,9 @@ BI.Popover = BI.inherit(BI.Widget, {
self.tracker.captureMouseMoves(e);
});
if (o.logic.dynamic) {
var size = this._calculateSize();
var height = this.element.height();
var compareHeight = BI.clamp(height, 200, 600) - (o.footer ? 84 : 44);
var compareHeight = BI.clamp(height, size.height, 600) - (o.footer ? 84 : 44);
this.body.element.height(compareHeight);
}
},
@ -29079,7 +29080,7 @@ BI.Popover = BI.inherit(BI.Widget, {
switch (o.size) {
case this._constant.SIZE.SMALL:
size.width = 450;
size.height = 220;
size.height = 200;
break;
case this._constant.SIZE.BIG:
size.width = 900;

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
src/base/layer/layer.popover.js
Unescape View File

@ -147,8 +147,9 @@ BI.Popover = BI.inherit(BI.Widget, {
self.tracker.captureMouseMoves(e);
});
if (o.logic.dynamic) {
var size = this._calculateSize();
var height = this.element.height();
var compareHeight = BI.clamp(height, 200, 600) - (o.footer ? 84 : 44);
var compareHeight = BI.clamp(height, size.height, 600) - (o.footer ? 84 : 44);
this.body.element.height(compareHeight);
}
},
@ -160,7 +161,7 @@ BI.Popover = BI.inherit(BI.Widget, {
switch (o.size) {
case this._constant.SIZE.SMALL:
size.width = 450;
size.height = 220;
size.height = 200;
break;
case this._constant.SIZE.BIG:
size.width = 900;

Write Preview
Loading…
Cancel
Save