Browse Source

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

* commit 'c781612e4f970ab600d7f7c1bf79e136e2cfca86':
  update
  update
es6
guy 7 years ago
parent
commit
53e74e04e4
  1. 14
      bi/core.js
  2. 2
      bi/widget.js
  3. 16
      dist/bundle.js
  4. 46
      dist/bundle.min.js
  5. 14
      dist/core.js
  6. 2
      dist/widget.js
  7. 14
      src/config.js
  8. 2
      src/widget/pathchooser/pathregion.js

14
bi/core.js

@ -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;

2
bi/widget.js

@ -13106,7 +13106,7 @@ BI.PathRegion = BI.inherit(BI.Widget, {
text: text, text: text,
value: value, value: value,
title: text || value, title: text || value,
height: 22 height: 24
}); });
} else { } else {
var label = BI.createWidget({ var label = BI.createWidget({

16
dist/bundle.js vendored

@ -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;
@ -91490,7 +91490,7 @@ BI.PathRegion = BI.inherit(BI.Widget, {
text: text, text: text,
value: value, value: value,
title: text || value, title: text || value,
height: 22 height: 24
}); });
} else { } else {
var label = BI.createWidget({ var label = BI.createWidget({

46
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

14
dist/core.js vendored

@ -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;

2
dist/widget.js vendored

@ -13106,7 +13106,7 @@ BI.PathRegion = BI.inherit(BI.Widget, {
text: text, text: text,
value: value, value: value,
title: text || value, title: text || value,
height: 22 height: 24
}); });
} else { } else {
var label = BI.createWidget({ var label = BI.createWidget({

14
src/config.js

@ -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/widget/pathchooser/pathregion.js

@ -50,7 +50,7 @@ BI.PathRegion = BI.inherit(BI.Widget, {
text: text, text: text,
value: value, value: value,
title: text || value, title: text || value,
height: 22 height: 24
}); });
} else { } else {
var label = BI.createWidget({ var label = BI.createWidget({

Loading…
Cancel
Save