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

Merge pull request #98 in ~GUY/fineui from ~YOUNG/fineuig:master to master 

* commit '19ce7b32d6e8e505833a28c7e954e6f59fdc92dc':
  wartermark
es6
Young 8 years ago
parent
5ed6c2b68a 19ce7b32d6
commit
439e8fdeeb
4 changed files with 24 additions and 24 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/base.js
  2. 16
      docs/base.js
  3. 6
      src/base/formula/formulaeditor.js
  4. 10
      src/base/single/editor/editor.js

16
bi/base.js
Unescape View File

@ -14351,15 +14351,15 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
_checkWaterMark: function () { _checkWaterMark: function () {
var o = this.options; var o = this.options;
if (!this.disabledWarterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) { if (!this.disabledWaterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) {
this.watermark && this.watermark.visible(); this.watermark && this.watermark.visible();
} else { } else {
this.watermark && this.watermark.invisible(); this.watermark && this.watermark.invisible();
} }
}, },
disableWarterMark: function () { disableWaterMark: function () {
this.disabledWarterMark = true; this.disabledWaterMark = true;
this._checkWaterMark(); this._checkWaterMark();
}, },
@ -18111,7 +18111,7 @@ BI.Editor = BI.inherit(BI.Single, {
_checkWaterMark: function () { _checkWaterMark: function () {
var o = this.options; var o = this.options;
if (!this.disabledWarterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) { if (!this.disabledWaterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) {
this.watermark && this.watermark.visible(); this.watermark && this.watermark.visible();
} else { } else {
this.watermark && this.watermark.invisible(); this.watermark && this.watermark.invisible();
@ -18149,13 +18149,13 @@ BI.Editor = BI.inherit(BI.Single, {
this._checkError(); this._checkError();
}, },
disableWarterMark: function () { disableWaterMark: function () {
this.disabledWarterMark = true; this.disabledWaterMark = true;
this._checkWaterMark(); this._checkWaterMark();
}, },
enableWarterMark: function () { enableWaterMark: function () {
this.disabledWarterMark = false; this.disabledWaterMark = false;
this._checkWaterMark(); this._checkWaterMark();
}, },

16
docs/base.js
Unescape View File

@ -14351,15 +14351,15 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
_checkWaterMark: function () { _checkWaterMark: function () {
var o = this.options; var o = this.options;
if (!this.disabledWarterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) { if (!this.disabledWaterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) {
this.watermark && this.watermark.visible(); this.watermark && this.watermark.visible();
} else { } else {
this.watermark && this.watermark.invisible(); this.watermark && this.watermark.invisible();
} }
}, },
disableWarterMark: function () { disableWaterMark: function () {
this.disabledWarterMark = true; this.disabledWaterMark = true;
this._checkWaterMark(); this._checkWaterMark();
}, },
@ -18111,7 +18111,7 @@ BI.Editor = BI.inherit(BI.Single, {
_checkWaterMark: function () { _checkWaterMark: function () {
var o = this.options; var o = this.options;
if (!this.disabledWarterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) { if (!this.disabledWaterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) {
this.watermark && this.watermark.visible(); this.watermark && this.watermark.visible();
} else { } else {
this.watermark && this.watermark.invisible(); this.watermark && this.watermark.invisible();
@ -18149,13 +18149,13 @@ BI.Editor = BI.inherit(BI.Single, {
this._checkError(); this._checkError();
}, },
disableWarterMark: function () { disableWaterMark: function () {
this.disabledWarterMark = true; this.disabledWaterMark = true;
this._checkWaterMark(); this._checkWaterMark();
}, },
enableWarterMark: function () { enableWaterMark: function () {
this.disabledWarterMark = false; this.disabledWaterMark = false;
this._checkWaterMark(); this._checkWaterMark();
}, },

6
src/base/formula/formulaeditor.js
Unescape View File

@ -90,15 +90,15 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
_checkWaterMark: function () { _checkWaterMark: function () {
var o = this.options; var o = this.options;
if (!this.disabledWarterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) { if (!this.disabledWaterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) {
this.watermark && this.watermark.visible(); this.watermark && this.watermark.visible();
} else { } else {
this.watermark && this.watermark.invisible(); this.watermark && this.watermark.invisible();
} }
}, },
disableWarterMark: function () { disableWaterMark: function () {
this.disabledWarterMark = true; this.disabledWaterMark = true;
this._checkWaterMark(); this._checkWaterMark();
}, },

10
src/base/single/editor/editor.js
Unescape View File

@ -204,7 +204,7 @@ BI.Editor = BI.inherit(BI.Single, {
_checkWaterMark: function () { _checkWaterMark: function () {
var o = this.options; var o = this.options;
if (!this.disabledWarterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) { if (!this.disabledWaterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) {
this.watermark && this.watermark.visible(); this.watermark && this.watermark.visible();
} else { } else {
this.watermark && this.watermark.invisible(); this.watermark && this.watermark.invisible();
@ -242,13 +242,13 @@ BI.Editor = BI.inherit(BI.Single, {
this._checkError(); this._checkError();
}, },
disableWarterMark: function () { disableWaterMark: function () {
this.disabledWarterMark = true; this.disabledWaterMark = true;
this._checkWaterMark(); this._checkWaterMark();
}, },
enableWarterMark: function () { enableWaterMark: function () {
this.disabledWarterMark = false; this.disabledWaterMark = false;
this._checkWaterMark(); this._checkWaterMark();
}, },

Write Preview
Loading…
Cancel
Save