[Pkg-javascript-commits] [dojo] 14/87: backport [27292] and [27291]; fixes #1440; fixes #14161

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag 1.7.5
in repository dojo.

commit 5d903d14066f102e452e47c50238952f525635f1
Author: Rawld Gill <rgill at altoviso.com>
Date:   Tue Dec 6 08:23:08 2011 +0000

    backport [27292] and [27291]; fixes #1440; fixes #14161
    
    git-svn-id: http://svn.dojotoolkit.org/src/branches/1.7/dojo@27300 560b804f-0ae3-0310-86f3-f6aa0a117693
---
 dojo.profile.js | 67 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/dojo.profile.js b/dojo.profile.js
index d8b4292..40e45f9 100644
--- a/dojo.profile.js
+++ b/dojo.profile.js
@@ -1,37 +1,40 @@
-var testResourceRe = /^dojo\/tests\//,
-	copyOnly = function(mid){
-		var list = {
-			"dojo/dojo.profile":1,
-			"dojo/package.json":1,
-			"dojo/OpenAjax":1,
-			"dojo/tests":1,
-			// these are test modules that are not intended to ever be built
-			"dojo/tests/_base/loader/requirejs/requirejs-setup":1,
-			"dojo/tests/_base/loader/requirejs/dataMain":1,
-			"dojo/tests/_base/loader/requirejs/depoverlap":1,
-			"dojo/tests/_base/loader/requirejs/simple-tests":1,
-			"dojo/tests/_base/loader/requirejs/relative/relative-tests":1,
-			"dojo/tests/_base/loader/requirejs/exports/exports-tests":1
+var profile = (function(){
+	var testResourceRe = /^dojo\/tests\//,
+
+		copyOnly = function(filename, mid){
+			var list = {
+				"dojo/dojo.profile":1,
+				"dojo/package.json":1,
+				"dojo/OpenAjax":1,
+				"dojo/tests":1,
+				// these are test modules that are not intended to ever be built
+				"dojo/tests/_base/loader/requirejs/requirejs-setup":1,
+				"dojo/tests/_base/loader/requirejs/dataMain":1,
+				"dojo/tests/_base/loader/requirejs/depoverlap":1,
+				"dojo/tests/_base/loader/requirejs/simple-tests":1,
+				"dojo/tests/_base/loader/requirejs/relative/relative-tests":1,
+				"dojo/tests/_base/loader/requirejs/exports/exports-tests":1
+			};
+			return (mid in list) || /^dojo\/_base\/config\w+$/.test(mid) || (/^dojo\/resources\//.test(mid) && !/\.css$/.test(filename)) || /(png|jpg|jpeg|gif|tiff)$/.test(filename);
 		};
-		return (mid in list) || ((/^dojo\/_base\/config\w+$/.test(mid) || /^dojo\/resources\//.test(mid)) && !/\.css$/.test(mid));
-	};
 
-var profile = {
-	resourceTags:{
-		test: function(filename, mid){
-			return testResourceRe.test(mid) || mid=="dojo/tests" || mid=="dojo/robot" || mid=="dojo/robotx";
-		},
+	return {
+		resourceTags:{
+			test: function(filename, mid){
+				return testResourceRe.test(mid) || mid=="dojo/tests" || mid=="dojo/robot" || mid=="dojo/robotx";
+			},
 
-		copyOnly: function(filename, mid){
-			return copyOnly(mid);
-		},
+			copyOnly: function(filename, mid){
+				return copyOnly(filename, mid);
+			},
 
-		amd: function(filename, mid){
-			return !testResourceRe.test(mid) && !copyOnly(mid) && /\.js$/.test(filename);
-		}
-	},
+			amd: function(filename, mid){
+				return !testResourceRe.test(mid) && !copyOnly(filename, mid) && /\.js$/.test(filename);
+			}
+		},
 
-	trees:[
-		[".", ".", /(\/\.)|(~$)/]
-	]
-};
+		trees:[
+			[".", ".", /(\/\.)|(~$)/]
+		]
+	};
+})();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git