Merge pull request #326 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit 'dda9af97165d9f6543afda98da7f188dbaf2def8':
  update

demo/js/base/button/demo.text_button.js

@@ -8,7 +8,8 @@ Demo.Button = BI.inherit(BI.Widget, {
                 el: {
                     type: "bi.text_button",
                     text: "文字按钮",
-                    height: 30
+                    height: 30,
+                    keyword: "w"
                 }
             }
         ];

demo/js/case/editor/demo.shelter_editor.js

@@ -13,7 +13,8 @@ Demo.ClearEditor = BI.inherit(BI.Widget, {
                 return v != "a";
             },
             watermark: "可以设置标记的输入框",
-            text: "这是一个遮罩"
+            value: "这是一个遮罩",
+            keyword: "z"
         });
         BI.createWidget({
             type: "bi.vertical",

dist/base.js

@@ -16688,7 +16688,8 @@ BI.TextButton = BI.inherit(BI.BasicButton, {
             rgap: o.rgap,
             text: o.text,
             value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
         });
     },
 

dist/bundle.js

@@ -42735,7 +42735,8 @@ BI.TextButton = BI.inherit(BI.BasicButton, {
             rgap: o.rgap,
             text: o.text,
             value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
         });
     },
 
@@ -68831,8 +68832,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
             tipType: o.tipType,
             textAlign: o.textAlign,
             height: o.height,
-            hgap: 4,
-            keyword: o.keyword
+            hgap: 4
         });
         BI.createWidget({
             type: "bi.absolute",
@@ -68912,6 +68912,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
         });
         this._showHint();
         self._checkText();
+        this.text.doRedMark(o.keyword);
     },
 
     _checkText: function () {
@@ -69002,7 +69003,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
 
     setValue: function (k) {
         this.editor.setValue(k);
-        this._checkText();node
+        this._checkText();
     },
 
     getValue: function () {

dist/case.js

@@ -6316,8 +6316,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
             tipType: o.tipType,
             textAlign: o.textAlign,
             height: o.height,
-            hgap: 4,
-            keyword: o.keyword
+            hgap: 4
         });
         BI.createWidget({
             type: "bi.absolute",
@@ -6397,6 +6396,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
         });
         this._showHint();
         self._checkText();
+        this.text.doRedMark(o.keyword);
     },
 
     _checkText: function () {
@@ -6487,7 +6487,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
 
     setValue: function (k) {
         this.editor.setValue(k);
-        this._checkText();node
+        this._checkText();
     },
 
     getValue: function () {

dist/demo.js

@@ -272,7 +272,8 @@ BI.shortcut("demo.image_button", Demo.Button);Demo.Button = BI.inherit(BI.Widget
                 el: {
                     type: "bi.text_button",
                     text: "文字按钮",
-                    height: 30
+                    height: 30,
+                    keyword: "w"
                 }
             }
         ];
@@ -2248,7 +2249,8 @@ Demo.ClearEditor = BI.inherit(BI.Widget, {
                 return v != "a";
             },
             watermark: "可以设置标记的输入框",
-            text: "这是一个遮罩"
+            value: "这是一个遮罩",
+            keyword: "z"
         });
         BI.createWidget({
             type: "bi.vertical",

dist/fineui.js

@@ -44499,7 +44499,8 @@ BI.TextButton = BI.inherit(BI.BasicButton, {
             rgap: o.rgap,
             text: o.text,
             value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
         });
     },
 
@@ -70595,8 +70596,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
             tipType: o.tipType,
             textAlign: o.textAlign,
             height: o.height,
-            hgap: 4,
-            keyword: o.keyword
+            hgap: 4
         });
         BI.createWidget({
             type: "bi.absolute",
@@ -70676,6 +70676,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
         });
         this._showHint();
         self._checkText();
+        this.text.doRedMark(o.keyword);
     },
 
     _checkText: function () {
@@ -70766,7 +70767,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
 
     setValue: function (k) {
         this.editor.setValue(k);
-        this._checkText();node
+        this._checkText();
     },
 
     getValue: function () {

src/base/single/button/buttons/button.text.js

@@ -41,7 +41,8 @@ BI.TextButton = BI.inherit(BI.BasicButton, {
             rgap: o.rgap,
             text: o.text,
             value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
         });
     },
 

src/case/editor/editor.shelter.js

@@ -52,8 +52,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
             tipType: o.tipType,
             textAlign: o.textAlign,
             height: o.height,
-            hgap: 4,
-            keyword: o.keyword
+            hgap: 4
         });
         BI.createWidget({
             type: "bi.absolute",
@@ -133,6 +132,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
         });
         this._showHint();
         self._checkText();
+        this.text.doRedMark(o.keyword);
     },
 
     _checkText: function () {
@@ -223,7 +223,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
 
     setValue: function (k) {
         this.editor.setValue(k);
-        this._checkText();node
+        this._checkText();
     },
 
     getValue: function () {