From 81bea17aefb26859f825b9293c7c99192874806e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 8 Nov 2011 20:40:44 +0400 Subject: upgrade Dojo to 1.6.1 --- lib/dojo/regexp.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'lib/dojo/regexp.js') diff --git a/lib/dojo/regexp.js b/lib/dojo/regexp.js index 1da68f452..947ecf1d5 100644 --- a/lib/dojo/regexp.js +++ b/lib/dojo/regexp.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved. + Copyright (c) 2004-2011, The Dojo Foundation All Rights Reserved. Available via Academic Free License >= 2.1 OR the modified BSD license. see: http://dojotoolkit.org/license for details */ @@ -9,6 +9,8 @@ if(!dojo._hasResource["dojo.regexp"]){ //_hasResource checks added by build. Do dojo._hasResource["dojo.regexp"] = true; dojo.provide("dojo.regexp"); +dojo.getObject("regexp", true, dojo); + /*===== dojo.regexp = { // summary: Regular expressions and Builder resources @@ -27,7 +29,7 @@ dojo.regexp.escapeString = function(/*String*/str, /*String?*/except){ } return "\\" + ch; }); // String -} +}; dojo.regexp.buildGroupRE = function(/*Object|Array*/arr, /*Function*/re, /*Boolean?*/nonCapture){ // summary: @@ -42,7 +44,7 @@ dojo.regexp.buildGroupRE = function(/*Object|Array*/arr, /*Function*/re, /*Boole // A single value or an array of values. // re: // A function. Takes one parameter and converts it to a regular - // expression. + // expression. // nonCapture: // If true, uses non-capturing match, otherwise matches are retained // by regular expression. Defaults to false @@ -61,15 +63,15 @@ dojo.regexp.buildGroupRE = function(/*Object|Array*/arr, /*Function*/re, /*Boole // join the REs as alternatives in a RE group. return dojo.regexp.group(b.join("|"), nonCapture); // String -} +}; dojo.regexp.group = function(/*String*/expression, /*Boolean?*/nonCapture){ // summary: // adds group match to expression // nonCapture: // If true, uses non-capturing match, otherwise matches are retained - // by regular expression. + // by regular expression. return "(" + (nonCapture ? "?:":"") + expression + ")"; // String -} +}; } -- cgit v1.2.3-54-g00ecf