Browse Source

Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fineui; branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui

# Conflicts:
#	dist/bundle.min.js
#	dist/fineui.min.js
master
windy 6 years ago
parent
commit
6c4c9a6fc8
  1. 4
      dist/bundle.js
  2. 2
      dist/bundle.min.css
  3. 4
      dist/case.js
  4. 4
      dist/fineui.js
  5. 2
      dist/fineui.min.css
  6. 1
      src/case/editor/editor.shelter.js

4
dist/bundle.js vendored

@ -54609,6 +54609,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
this._checkText();
this.text.doRedMark(this.options.keyword);
},
getValue: function () {
@ -54642,7 +54643,8 @@ BI.ShelterEditor.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.ShelterEditor.EVENT_SPACE = "EVENT_SPACE";
BI.ShelterEditor.EVENT_EMPTY = "EVENT_EMPTY";
BI.shortcut("bi.shelter_editor", BI.ShelterEditor);/**
BI.shortcut("bi.shelter_editor", BI.ShelterEditor);
/**
* 带标记的文本框
* Created by GUY on 2015/8/28.
* @class BI.SignEditor

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/case.js vendored

@ -5975,6 +5975,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
this._checkText();
this.text.doRedMark(this.options.keyword);
},
getValue: function () {
@ -6008,7 +6009,8 @@ BI.ShelterEditor.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.ShelterEditor.EVENT_SPACE = "EVENT_SPACE";
BI.ShelterEditor.EVENT_EMPTY = "EVENT_EMPTY";
BI.shortcut("bi.shelter_editor", BI.ShelterEditor);/**
BI.shortcut("bi.shelter_editor", BI.ShelterEditor);
/**
* 带标记的文本框
* Created by GUY on 2015/8/28.
* @class BI.SignEditor

4
dist/fineui.js vendored

@ -54830,6 +54830,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
this._checkText();
this.text.doRedMark(this.options.keyword);
},
getValue: function () {
@ -54863,7 +54864,8 @@ BI.ShelterEditor.EVENT_RESTRICT = "EVENT_RESTRICT";
BI.ShelterEditor.EVENT_SPACE = "EVENT_SPACE";
BI.ShelterEditor.EVENT_EMPTY = "EVENT_EMPTY";
BI.shortcut("bi.shelter_editor", BI.ShelterEditor);/**
BI.shortcut("bi.shelter_editor", BI.ShelterEditor);
/**
* 带标记的文本框
* Created by GUY on 2015/8/28.
* @class BI.SignEditor

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

1
src/case/editor/editor.shelter.js

@ -224,6 +224,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
this._checkText();
this.text.doRedMark(this.options.keyword);
},
getValue: function () {

Loading…
Cancel
Save