[Pkg-javascript-commits] [dojo] 25/28: fix regression introduced by #17155
David Prévot
taffit at moszumanska.debian.org
Thu Aug 21 17:39:49 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to annotated tag 1.8.6
in repository dojo.
commit e2c3f17f4d2614d33bb2f2008ed59ea1cda265a6
Author: Clement Mathieu <clement.mathieu at outlook.com>
Date: Tue Feb 4 08:34:49 2014 +0100
fix regression introduced by #17155
---
i18n.js | 7 ++++++-
tests/_base/i18nExhaustive.js | 18 ++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/i18n.js b/i18n.js
index 7b8743a..720bb3c 100644
--- a/i18n.js
+++ b/i18n.js
@@ -367,7 +367,12 @@ define(["./_base/kernel", "require", "./has", "./_base/array", "./_base/config",
for(var p in rollup){
var bundle = rollup[p],
match = p.match(/(.+)\/([^\/]+)$/),
- bundleName = match[2],
+ bundleName, bundlePath;
+
+ // If there is no match, the bundle is not a regular bundle from an AMD layer.
+ if (!match){continue;}
+
+ bundleName = match[2];
bundlePath = match[1] + "/";
// backcompat
diff --git a/tests/_base/i18nExhaustive.js b/tests/_base/i18nExhaustive.js
index 227d7c5..2119eae 100644
--- a/tests/_base/i18nExhaustive.js
+++ b/tests/_base/i18nExhaustive.js
@@ -4,6 +4,9 @@ define([
"require"
], function(dojo, doh, require){
var testParams = [
+ "sync,,src,./dojo,src,./i18n-test,legacy",
+ "sync,,src,./dojo,legacy-built,./built-i18n-test/152-build,legacy",
+ "sync,,src,./dojo,legacy-built-layer,./built-i18n-test/152-build-with-layers-and-preloads,legacy",
"sync,,src,./dojo,src,./i18n-test,amd",
"sync,,src,./dojo,built,./built-i18n-test/built/i18nTest,amd",
"sync,,src,./dojo,built,./built-i18n-test/built-with-layers/i18nTest,amd",
@@ -16,6 +19,10 @@ define([
"sync,,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built/i18nTest,amd",
"sync,,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built-with-layers/i18nTest,amd",
"sync,,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built-with-layers-and-preloads/i18nTest,amd",
+
+ "sync,ab,src,./dojo,src,./i18n-test,legacy",
+ "sync,ab,src,./dojo,legacy-built,./built-i18n-test/152-build,legacy",
+ "sync,ab,src,./dojo,legacy-built-layer,./built-i18n-test/152-build-with-layers-and-preloads,legacy",
"sync,ab,src,./dojo,src,./i18n-test,amd",
"sync,ab,src,./dojo,built,./built-i18n-test/built/i18nTest,amd",
"sync,ab,src,./dojo,built,./built-i18n-test/built-with-layers/i18nTest,amd",
@@ -28,6 +35,10 @@ define([
"sync,ab,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built/i18nTest,amd",
"sync,ab,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built-with-layers/i18nTest,amd",
"sync,ab,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built-with-layers-and-preloads/i18nTest,amd",
+
+ "sync,ab-cd,src,./dojo,src,./i18n-test,legacy",
+ "sync,ab-cd,src,./dojo,legacy-built,./built-i18n-test/152-build,legacy",
+ "sync,ab-cd,src,./dojo,legacy-built-layer,./built-i18n-test/152-build-with-layers-and-preloads,legacy",
"sync,ab-cd,src,./dojo,src,./i18n-test,amd",
"sync,ab-cd,src,./dojo,built,./built-i18n-test/built/i18nTest,amd",
"sync,ab-cd,src,./dojo,built,./built-i18n-test/built-with-layers/i18nTest,amd",
@@ -40,6 +51,10 @@ define([
"sync,ab-cd,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built/i18nTest,amd",
"sync,ab-cd,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built-with-layers/i18nTest,amd",
"sync,ab-cd,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built-with-layers-and-preloads/i18nTest,amd",
+
+ "sync,ab-cd-ef,src,./dojo,src,./i18n-test,legacy",
+ "sync,ab-cd-ef,src,./dojo,legacy-built,./built-i18n-test/152-build,legacy",
+ "sync,ab-cd-ef,src,./dojo,legacy-built-layer,./built-i18n-test/152-build-with-layers-and-preloads,legacy",
"sync,ab-cd-ef,src,./dojo,src,./i18n-test,amd",
"sync,ab-cd-ef,src,./dojo,built,./built-i18n-test/built/i18nTest,amd",
"sync,ab-cd-ef,src,./dojo,built,./built-i18n-test/built-with-layers/i18nTest,amd",
@@ -64,6 +79,7 @@ define([
"async,,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built/i18nTest,amd",
"async,,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built-with-layers/i18nTest,amd",
"async,,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built-with-layers-and-preloads/i18nTest,amd",
+
"async,ab,src,./dojo,src,./i18n-test,amd",
"async,ab,src,./dojo,built,./built-i18n-test/built/i18nTest,amd",
"async,ab,src,./dojo,built,./built-i18n-test/built-with-layers/i18nTest,amd",
@@ -76,6 +92,7 @@ define([
"async,ab,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built/i18nTest,amd",
"async,ab,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built-with-layers/i18nTest,amd",
"async,ab,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built-with-layers-and-preloads/i18nTest,amd",
+
"async,ab-cd,src,./dojo,src,./i18n-test,amd",
"async,ab-cd,src,./dojo,built,./built-i18n-test/built/i18nTest,amd",
"async,ab-cd,src,./dojo,built,./built-i18n-test/built-with-layers/i18nTest,amd",
@@ -88,6 +105,7 @@ define([
"async,ab-cd,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built/i18nTest,amd",
"async,ab-cd,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built-with-layers/i18nTest,amd",
"async,ab-cd,cdn,http://192.168.1.114/dev/dtk/built-i18n-test/cdn/dojo,built,./built-i18n-test/built-with-layers-and-preloads/i18nTest,amd",
+
"async,ab-cd-ef,src,./dojo,src,./i18n-test,amd",
"async,ab-cd-ef,src,./dojo,built,./built-i18n-test/built/i18nTest,amd",
"async,ab-cd-ef,src,./dojo,built,./built-i18n-test/built-with-layers/i18nTest,amd",
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git
More information about the Pkg-javascript-commits
mailing list