caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
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
67b826c49e c781612e4f
commit
53e74e04e4
8 changed files with 55 additions and 55 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. 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
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;

2
bi/widget.js
Unescape View File

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

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

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

2
dist/widget.js vendored
Unescape View File

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

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/widget/pathchooser/pathregion.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save