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/dojo/regexp.js | |
| parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
| parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) | |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'lib/dojo/regexp.js')
| -rw-r--r-- | lib/dojo/regexp.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/dojo/regexp.js b/lib/dojo/regexp.js index e46f70fec..d34670c47 100644 --- a/lib/dojo/regexp.js +++ b/lib/dojo/regexp.js @@ -1,8 +1,8 @@ /* - Copyright (c) 2004-2012, The Dojo Foundation All Rights Reserved. + Copyright (c) 2004-2016, The JS Foundation All Rights Reserved. Available via Academic Free License >= 2.1 OR the modified BSD license. see: http://dojotoolkit.org/license for details */ //>>built -define("dojo/regexp",["./_base/kernel","./_base/lang"],function(_1,_2){var _3={};_2.setObject("dojo.regexp",_3);_3.escapeString=function(_4,_5){return _4.replace(/([\.$?*|{}\(\)\[\]\\\/\+^])/g,function(ch){if(_5&&_5.indexOf(ch)!=-1){return ch;}return "\\"+ch;});};_3.buildGroupRE=function(_6,re,_7){if(!(_6 instanceof Array)){return re(_6);}var b=[];for(var i=0;i<_6.length;i++){b.push(re(_6[i]));}return _3.group(b.join("|"),_7);};_3.group=function(_8,_9){return "("+(_9?"?:":"")+_8+")";};return _3;});
\ No newline at end of file +define("dojo/regexp",["./_base/kernel","./_base/lang"],function(_1,_2){var _3={};_2.setObject("dojo.regexp",_3);_3.escapeString=function(_4,_5){return _4.replace(/([\.$?*|{}\(\)\[\]\\\/\+\-^])/g,function(ch){if(_5&&_5.indexOf(ch)!=-1){return ch;}return "\\"+ch;});};_3.buildGroupRE=function(_6,re,_7){if(!(_6 instanceof Array)){return re(_6);}var b=[];for(var i=0;i<_6.length;i++){b.push(re(_6[i]));}return _3.group(b.join("|"),_7);};_3.group=function(_8,_9){return "("+(_9?"?:":"")+_8+")";};return _3;});
\ No newline at end of file |