Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #932 in VISUAL/fineui from ~DAILER/fineui:master to master 

* commit 'a6910809813f19a513c1a48ce0bde5b8e4af43de':
  无JIRA任务,bi.html也要和bi.text 一样引入maxWidth和overflow
es6
Dailer 6 years ago
parent
f9ec1ff1dc a691080981
commit
4f49fcccaf
16 changed files with 137 additions and 101 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. 8
      dist/2.0/fineui.ie.js
  2. 26
      dist/2.0/fineui.ie.min.js
  3. 8
      dist/2.0/fineui.js
  4. 30
      dist/2.0/fineui.min.js
  5. 8
      dist/base.js
  6. 8
      dist/bundle.ie.js
  7. 26
      dist/bundle.ie.min.js
  8. 8
      dist/bundle.js
  9. 30
      dist/bundle.min.js
  10. 8
      dist/fineui.ie.js
  11. 26
      dist/fineui.ie.min.js
  12. 8
      dist/fineui.js
  13. 30
      dist/fineui.min.js
  14. 8
      dist/fineui_without_jquery_polyfill.js
  15. 2
      dist/utils.min.js
  16. 4
      src/base/single/html/html.js

8
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -44956,10 +44956,14 @@ BI.Html = BI.inherit(BI.Single, {
if (BI.isNumber(o.lineHeight)) { if (BI.isNumber(o.lineHeight)) {
this.element.css({lineHeight: o.lineHeight + "px"}); this.element.css({lineHeight: o.lineHeight + "px"});
} }
if (BI.isWidthOrHeight(o.maxWidth)) {
this.element.css({maxWidth: o.maxWidth});
}
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace, whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "", textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
overflow: o.whiteSpace === "nowrap" ? "" : "auto"
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -47331,11 +47335,11 @@ BI.Tooltip = BI.inherit(BI.Tip, {
hgap: this._const.hgap, hgap: this._const.hgap,
items: BI.map(texts, function (i, text) { items: BI.map(texts, function (i, text) {
return { return {
type: "bi.text", type: "bi.label",
textAlign: "left", textAlign: "left",
whiteSpace: "normal", whiteSpace: "normal",
text: text, text: text,
height: 18 textHeight: 18
}; };
}) })
}); });

26
dist/2.0/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/2.0/fineui.js vendored
Unescape View File

@ -45360,10 +45360,14 @@ BI.Html = BI.inherit(BI.Single, {
if (BI.isNumber(o.lineHeight)) { if (BI.isNumber(o.lineHeight)) {
this.element.css({lineHeight: o.lineHeight + "px"}); this.element.css({lineHeight: o.lineHeight + "px"});
} }
if (BI.isWidthOrHeight(o.maxWidth)) {
this.element.css({maxWidth: o.maxWidth});
}
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace, whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "", textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
overflow: o.whiteSpace === "nowrap" ? "" : "auto"
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -47735,11 +47739,11 @@ BI.Tooltip = BI.inherit(BI.Tip, {
hgap: this._const.hgap, hgap: this._const.hgap,
items: BI.map(texts, function (i, text) { items: BI.map(texts, function (i, text) {
return { return {
type: "bi.text", type: "bi.label",
textAlign: "left", textAlign: "left",
whiteSpace: "normal", whiteSpace: "normal",
text: text, text: text,
height: 18 textHeight: 18
}; };
}) })
}); });

30
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/base.js vendored
Unescape View File

@ -9484,10 +9484,14 @@ BI.Html = BI.inherit(BI.Single, {
if (BI.isNumber(o.lineHeight)) { if (BI.isNumber(o.lineHeight)) {
this.element.css({lineHeight: o.lineHeight + "px"}); this.element.css({lineHeight: o.lineHeight + "px"});
} }
if (BI.isWidthOrHeight(o.maxWidth)) {
this.element.css({maxWidth: o.maxWidth});
}
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace, whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "", textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
overflow: o.whiteSpace === "nowrap" ? "" : "auto"
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -11859,11 +11863,11 @@ BI.Tooltip = BI.inherit(BI.Tip, {
hgap: this._const.hgap, hgap: this._const.hgap,
items: BI.map(texts, function (i, text) { items: BI.map(texts, function (i, text) {
return { return {
type: "bi.text", type: "bi.label",
textAlign: "left", textAlign: "left",
whiteSpace: "normal", whiteSpace: "normal",
text: text, text: text,
height: 18 textHeight: 18
}; };
}) })
}); });

8
dist/bundle.ie.js vendored
Unescape View File

@ -44956,10 +44956,14 @@ BI.Html = BI.inherit(BI.Single, {
if (BI.isNumber(o.lineHeight)) { if (BI.isNumber(o.lineHeight)) {
this.element.css({lineHeight: o.lineHeight + "px"}); this.element.css({lineHeight: o.lineHeight + "px"});
} }
if (BI.isWidthOrHeight(o.maxWidth)) {
this.element.css({maxWidth: o.maxWidth});
}
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace, whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "", textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
overflow: o.whiteSpace === "nowrap" ? "" : "auto"
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -47331,11 +47335,11 @@ BI.Tooltip = BI.inherit(BI.Tip, {
hgap: this._const.hgap, hgap: this._const.hgap,
items: BI.map(texts, function (i, text) { items: BI.map(texts, function (i, text) {
return { return {
type: "bi.text", type: "bi.label",
textAlign: "left", textAlign: "left",
whiteSpace: "normal", whiteSpace: "normal",
text: text, text: text,
height: 18 textHeight: 18
}; };
}) })
}); });

26
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/bundle.js vendored
Unescape View File

@ -45360,10 +45360,14 @@ BI.Html = BI.inherit(BI.Single, {
if (BI.isNumber(o.lineHeight)) { if (BI.isNumber(o.lineHeight)) {
this.element.css({lineHeight: o.lineHeight + "px"}); this.element.css({lineHeight: o.lineHeight + "px"});
} }
if (BI.isWidthOrHeight(o.maxWidth)) {
this.element.css({maxWidth: o.maxWidth});
}
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace, whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "", textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
overflow: o.whiteSpace === "nowrap" ? "" : "auto"
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -47735,11 +47739,11 @@ BI.Tooltip = BI.inherit(BI.Tip, {
hgap: this._const.hgap, hgap: this._const.hgap,
items: BI.map(texts, function (i, text) { items: BI.map(texts, function (i, text) {
return { return {
type: "bi.text", type: "bi.label",
textAlign: "left", textAlign: "left",
whiteSpace: "normal", whiteSpace: "normal",
text: text, text: text,
height: 18 textHeight: 18
}; };
}) })
}); });

30
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/fineui.ie.js vendored
Unescape View File

@ -45201,10 +45201,14 @@ BI.Html = BI.inherit(BI.Single, {
if (BI.isNumber(o.lineHeight)) { if (BI.isNumber(o.lineHeight)) {
this.element.css({lineHeight: o.lineHeight + "px"}); this.element.css({lineHeight: o.lineHeight + "px"});
} }
if (BI.isWidthOrHeight(o.maxWidth)) {
this.element.css({maxWidth: o.maxWidth});
}
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace, whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "", textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
overflow: o.whiteSpace === "nowrap" ? "" : "auto"
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -47576,11 +47580,11 @@ BI.Tooltip = BI.inherit(BI.Tip, {
hgap: this._const.hgap, hgap: this._const.hgap,
items: BI.map(texts, function (i, text) { items: BI.map(texts, function (i, text) {
return { return {
type: "bi.text", type: "bi.label",
textAlign: "left", textAlign: "left",
whiteSpace: "normal", whiteSpace: "normal",
text: text, text: text,
height: 18 textHeight: 18
}; };
}) })
}); });

26
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/fineui.js vendored
Unescape View File

@ -45605,10 +45605,14 @@ BI.Html = BI.inherit(BI.Single, {
if (BI.isNumber(o.lineHeight)) { if (BI.isNumber(o.lineHeight)) {
this.element.css({lineHeight: o.lineHeight + "px"}); this.element.css({lineHeight: o.lineHeight + "px"});
} }
if (BI.isWidthOrHeight(o.maxWidth)) {
this.element.css({maxWidth: o.maxWidth});
}
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace, whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "", textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
overflow: o.whiteSpace === "nowrap" ? "" : "auto"
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -47980,11 +47984,11 @@ BI.Tooltip = BI.inherit(BI.Tip, {
hgap: this._const.hgap, hgap: this._const.hgap,
items: BI.map(texts, function (i, text) { items: BI.map(texts, function (i, text) {
return { return {
type: "bi.text", type: "bi.label",
textAlign: "left", textAlign: "left",
whiteSpace: "normal", whiteSpace: "normal",
text: text, text: text,
height: 18 textHeight: 18
}; };
}) })
}); });

30
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -32801,10 +32801,14 @@ BI.Html = BI.inherit(BI.Single, {
if (BI.isNumber(o.lineHeight)) { if (BI.isNumber(o.lineHeight)) {
this.element.css({lineHeight: o.lineHeight + "px"}); this.element.css({lineHeight: o.lineHeight + "px"});
} }
if (BI.isWidthOrHeight(o.maxWidth)) {
this.element.css({maxWidth: o.maxWidth});
}
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace, whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "", textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
overflow: o.whiteSpace === "nowrap" ? "" : "auto"
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -34551,11 +34555,11 @@ BI.Tooltip = BI.inherit(BI.Tip, {
hgap: this._const.hgap, hgap: this._const.hgap,
items: BI.map(texts, function (i, text) { items: BI.map(texts, function (i, text) {
return { return {
type: "bi.text", type: "bi.label",
textAlign: "left", textAlign: "left",
whiteSpace: "normal", whiteSpace: "normal",
text: text, text: text,
height: 18 textHeight: 18
}; };
}) })
}); });

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
src/base/single/html/html.js
Unescape View File

@ -50,10 +50,14 @@ BI.Html = BI.inherit(BI.Single, {
if (BI.isNumber(o.lineHeight)) { if (BI.isNumber(o.lineHeight)) {
this.element.css({lineHeight: o.lineHeight + "px"}); this.element.css({lineHeight: o.lineHeight + "px"});
} }
if (BI.isWidthOrHeight(o.maxWidth)) {
this.element.css({maxWidth: o.maxWidth});
}
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace, whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "", textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
overflow: o.whiteSpace === "nowrap" ? "" : "auto"
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({

Write Preview
Loading…
Cancel
Save