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

Merge pull request #138 in FUI/fineui from ~GUY/fineui:master to master 

* commit 'e4a02f42f86c345254e13294cad3fbc8ffa17538':
  update
  tooltip是一行
es6
guy 7 years ago
parent
17f82bb6d6 e4a02f42f8
commit
588c392378
7 changed files with 358 additions and 358 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. 16
      bi/core.js
  2. 16
      dist/bundle.js
  3. 10
      dist/bundle.min.js
  4. 16
      dist/core.js
  5. 14
      src/config.js
  6. 2
      src/core/logic/logic.layout.js

16
bi/core.js
Unescape View File

@ -17386,7 +17386,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
createLogic: function () {
var layout, o = this.options;
if (o.dynamic) {
layout = "bi.horizontal";
layout = "bi.vertical_adapt";
} else {
layout = "bi.htape";
}
@ -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;

16
dist/bundle.js vendored
Unescape View File

@ -23363,7 +23363,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
createLogic: function () {
var layout, o = this.options;
if (o.dynamic) {
layout = "bi.horizontal";
layout = "bi.vertical_adapt";
} else {
layout = "bi.htape";
}
@ -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;

10
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
dist/core.js vendored
Unescape View File

@ -23312,7 +23312,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
createLogic: function () {
var layout, o = this.options;
if (o.dynamic) {
layout = "bi.horizontal";
layout = "bi.vertical_adapt";
} else {
layout = "bi.htape";
}
@ -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;

2
src/core/logic/logic.layout.js
Unescape View File

@ -79,7 +79,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
createLogic: function () {
var layout, o = this.options;
if (o.dynamic) {
layout = "bi.horizontal";
layout = "bi.vertical_adapt";
} else {
layout = "bi.htape";
}

Write Preview
Loading…
Cancel
Save