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

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

* commit '1a606c9bc25a8a44d62d32b2c5e54fe50c91e65c':
  tooltip是一行
es6
windy 7 years ago
parent
17f82bb6d6 1a606c9bc2
commit
d6fef6f1f4
6 changed files with 353 additions and 353 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. 14
      bi/core.js
  2. 14
      dist/bundle.js
  3. 8
      dist/bundle.min.js
  4. 14
      dist/core.js
  5. 14
      src/config.js

14
bi/core.js
Unescape View File

@ -17612,13 +17612,13 @@ $(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
if (isSupportFlex) {
//有滚动条的情况下需要用到flex_wrapper_center布局
// if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// //不是IE用flex_wrapper_center布局
// if (!BI.isIE()) {
// return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
// }
// return ob;
// }
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
//不是IE用flex_wrapper_center布局
if (!BI.isIE()) {
return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
}
return ob;
}
return BI.extend(ob, {type: "bi.flex_vertical_center"});
} else {
return ob;

14
dist/bundle.js vendored
Unescape View File

@ -28805,13 +28805,13 @@ $(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
if (isSupportFlex) {
//有滚动条的情况下需要用到flex_wrapper_center布局
// if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// //不是IE用flex_wrapper_center布局
// if (!BI.isIE()) {
// return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
// }
// return ob;
// }
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
//不是IE用flex_wrapper_center布局
if (!BI.isIE()) {
return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
}
return ob;
}
return BI.extend(ob, {type: "bi.flex_vertical_center"});
} else {
return ob;

8
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
dist/core.js vendored
Unescape View File

@ -28754,13 +28754,13 @@ $(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
if (isSupportFlex) {
//有滚动条的情况下需要用到flex_wrapper_center布局
// if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// //不是IE用flex_wrapper_center布局
// if (!BI.isIE()) {
// return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
// }
// return ob;
// }
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
//不是IE用flex_wrapper_center布局
if (!BI.isIE()) {
return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
}
return ob;
}
return BI.extend(ob, {type: "bi.flex_vertical_center"});
} else {
return ob;

14
src/config.js
Unescape View File

@ -27,13 +27,13 @@ $(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
if (isSupportFlex) {
//有滚动条的情况下需要用到flex_wrapper_center布局
// if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// //不是IE用flex_wrapper_center布局
// if (!BI.isIE()) {
// return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
// }
// return ob;
// }
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
//不是IE用flex_wrapper_center布局
if (!BI.isIE()) {
return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
}
return ob;
}
return BI.extend(ob, {type: "bi.flex_vertical_center"});
} else {
return ob;

Write Preview
Loading…
Cancel
Save