diff options
| author | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
| commit | e2e2479984b3aaadb4c0947e5ec15276e5c9a337 (patch) | |
| tree | 1662c1772cbcb6e44d017cea28e35d45de44921f /lib/dijit/form/CurrencyTextBox.js | |
| parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
| parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) | |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'lib/dijit/form/CurrencyTextBox.js')
| -rw-r--r-- | lib/dijit/form/CurrencyTextBox.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/dijit/form/CurrencyTextBox.js b/lib/dijit/form/CurrencyTextBox.js index 08485969d..3f9776e2f 100644 --- a/lib/dijit/form/CurrencyTextBox.js +++ b/lib/dijit/form/CurrencyTextBox.js @@ -1,2 +1,2 @@ //>>built -define("dijit/form/CurrencyTextBox",["dojo/currency","dojo/_base/declare","dojo/_base/lang","./NumberTextBox"],function(_1,_2,_3,_4){return _2("dijit.form.CurrencyTextBox",_4,{currency:"",baseClass:"dijitTextBox dijitCurrencyTextBox",pattern:function(_5){return "("+(this.focused?this.inherited(arguments,[_3.mixin({},_5,this.editOptions)])+"|":"")+_1.regexp(_5)+")";},_formatter:_1.format,_parser:_1.parse,parse:function(_6,_7){var v=this.inherited(arguments);if(isNaN(v)&&/\d+/.test(_6)){v=_3.hitch(_3.mixin({},this,{_parser:_4.prototype._parser}),"inherited")(arguments);}return v;},_setConstraintsAttr:function(_8){if(!_8.currency&&this.currency){_8.currency=this.currency;}this.inherited(arguments,[_1._mixInDefaults(_3.mixin(_8,{exponent:false}))]);}});});
\ No newline at end of file +define("dijit/form/CurrencyTextBox",["dojo/currency","dojo/_base/declare","dojo/_base/lang","./NumberTextBox"],function(_1,_2,_3,_4){var _5=_2("dijit.form.CurrencyTextBox",_4,{currency:"",baseClass:"dijitTextBox dijitCurrencyTextBox",_formatter:_1.format,_parser:_1.parse,_regExpGenerator:_1.regexp,parse:function(_6,_7){var v=this.inherited(arguments);if(isNaN(v)&&/\d+/.test(_6)){v=_3.hitch(_3.delegate(this,{_parser:_4.prototype._parser}),"inherited")(arguments);}return v;},_setConstraintsAttr:function(_8){if(!_8.currency&&this.currency){_8.currency=this.currency;}this.inherited(arguments,[_1._mixInDefaults(_3.mixin(_8,{exponent:false}))]);}});return _5;});
\ No newline at end of file |