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

update

es6
guy 7 years ago
parent
7abc150d00
commit
a0656480e2
6 changed files with 37 additions and 37 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. 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 () { createLogic: function () {
var layout, o = this.options; var layout, o = this.options;
if (o.dynamic) { if (o.dynamic) {
layout = "bi.horizontal"; layout = "bi.vertical_adapt";
} else { } else {
layout = "bi.htape"; layout = "bi.htape";
} }
@ -17612,13 +17612,13 @@ $(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) { BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
if (isSupportFlex) { if (isSupportFlex) {
//有滚动条的情况下需要用到flex_wrapper_center布局 //有滚动条的情况下需要用到flex_wrapper_center布局
// if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) { if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// //不是IE用flex_wrapper_center布局 //不是IE用flex_wrapper_center布局
// if (!BI.isIE()) { if (!BI.isIE()) {
// return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"}); return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
// } }
// return ob; return ob;
// } }
return BI.extend(ob, {type: "bi.flex_vertical_center"}); return BI.extend(ob, {type: "bi.flex_vertical_center"});
} else { } else {
return ob; return ob;

16
dist/bundle.js vendored
Unescape View File

@ -23363,7 +23363,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
createLogic: function () { createLogic: function () {
var layout, o = this.options; var layout, o = this.options;
if (o.dynamic) { if (o.dynamic) {
layout = "bi.horizontal"; layout = "bi.vertical_adapt";
} else { } else {
layout = "bi.htape"; layout = "bi.htape";
} }
@ -28805,13 +28805,13 @@ $(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) { BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
if (isSupportFlex) { if (isSupportFlex) {
//有滚动条的情况下需要用到flex_wrapper_center布局 //有滚动条的情况下需要用到flex_wrapper_center布局
// if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) { if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// //不是IE用flex_wrapper_center布局 //不是IE用flex_wrapper_center布局
// if (!BI.isIE()) { if (!BI.isIE()) {
// return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"}); return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
// } }
// return ob; return ob;
// } }
return BI.extend(ob, {type: "bi.flex_vertical_center"}); return BI.extend(ob, {type: "bi.flex_vertical_center"});
} else { } else {
return ob; 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 () { createLogic: function () {
var layout, o = this.options; var layout, o = this.options;
if (o.dynamic) { if (o.dynamic) {
layout = "bi.horizontal"; layout = "bi.vertical_adapt";
} else { } else {
layout = "bi.htape"; layout = "bi.htape";
} }
@ -28754,13 +28754,13 @@ $(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) { BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
if (isSupportFlex) { if (isSupportFlex) {
//有滚动条的情况下需要用到flex_wrapper_center布局 //有滚动条的情况下需要用到flex_wrapper_center布局
// if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) { if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// //不是IE用flex_wrapper_center布局 //不是IE用flex_wrapper_center布局
// if (!BI.isIE()) { if (!BI.isIE()) {
// return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"}); return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center"});
// } }
// return ob; return ob;
// } }
return BI.extend(ob, {type: "bi.flex_vertical_center"}); return BI.extend(ob, {type: "bi.flex_vertical_center"});
} else { } else {
return ob; return ob;

14
src/config.js
Unescape View File

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

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

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

Write Preview
Loading…
Cancel
Save