Browse Source

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

* commit 'ea99065925fe6057773bd5972f38a063e68c3a63':
  build
  ie下textarea的whitespace会继承父级的
master
imp 6 years ago
parent
commit
40f1d6f579
  1. 10
      dist/_fineui.min.js
  2. 2
      dist/base.js
  3. 2
      dist/bundle.js
  4. 66
      dist/bundle.min.js
  5. 2
      dist/fineui.js
  6. 10
      dist/fineui.min.js
  7. 2
      src/base/single/editor/editor.textarea.js

10
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/base.js vendored

@ -18720,7 +18720,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
height: "100%", height: "100%",
cls: "bi-textarea textarea-editor-content display-block" cls: "bi-textarea textarea-editor-content display-block"
}); });
this.content.element.css({resize: "none"}); this.content.element.css({resize: "none", whiteSpace: "normal"});
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,

2
dist/bundle.js vendored

@ -54528,7 +54528,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
height: "100%", height: "100%",
cls: "bi-textarea textarea-editor-content display-block" cls: "bi-textarea textarea-editor-content display-block"
}); });
this.content.element.css({resize: "none"}); this.content.element.css({resize: "none", whiteSpace: "normal"});
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,

66
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.js vendored

@ -54777,7 +54777,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
height: "100%", height: "100%",
cls: "bi-textarea textarea-editor-content display-block" cls: "bi-textarea textarea-editor-content display-block"
}); });
this.content.element.css({resize: "none"}); this.content.element.css({resize: "none", whiteSpace: "normal"});
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,

10
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
src/base/single/editor/editor.textarea.js

@ -21,7 +21,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
height: "100%", height: "100%",
cls: "bi-textarea textarea-editor-content display-block" cls: "bi-textarea textarea-editor-content display-block"
}); });
this.content.element.css({resize: "none"}); this.content.element.css({resize: "none", whiteSpace: "normal"});
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,

Loading…
Cancel
Save