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

dist/bundle.js

@@ -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

dist/case.js

@@ -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

dist/fineui.js

@@ -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

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 () {
@@ -257,4 +258,4 @@ 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);