Merge branch 'pass-entry'

seajs · Jun 25, 2014 · 648805c · 648805c
2 parents aff0500 + c61f5d1
commit 648805c
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 7 deletions.
diff --git a/dist/seajs-combo-debug.js b/dist/seajs-combo-debug.js
@@ -12,6 +12,7 @@ var comboHash = data.comboHash = {}
 var comboSyntax = ["??", ","]
 var comboMaxLength = 2000
 var comboExcludes
+var comboSuffix
 
 
 seajs.on("load", setComboHash)
@@ -25,6 +26,7 @@ function setComboHash(uris) {
 
   data.comboSyntax && (comboSyntax = data.comboSyntax)
   data.comboMaxLength && (comboMaxLength = data.comboMaxLength)
+  data.comboSuffix && (comboSuffix = data.comboSuffix)
 
   comboExcludes = data.comboExcludes
   var needComboUris = []
@@ -226,7 +228,14 @@ function paths2hash(paths) {
 }
 
 function setHash(root, files) {
-  var comboPath = root + comboSyntax[0] + files.join(comboSyntax[1])
+  var copy = []
+  for (var i = 0, len = files.length; i < len; i++) {
+    copy[i] = files[i].replace(/\?.*$/, '')
+  }
+  var comboPath = root + comboSyntax[0] + copy.join(comboSyntax[1])
+  if(comboSuffix) {
+    comboPath += comboSuffix
+  }
   var exceedMax = comboPath.length > comboMaxLength
 
   // http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url

diff --git a/dist/seajs-combo.js b/dist/seajs-combo.js
diff --git a/src/seajs-combo.js b/src/seajs-combo.js
@@ -11,6 +11,7 @@ var comboHash = data.comboHash = {}
 var comboSyntax = ["??", ","]
 var comboMaxLength = 2000
 var comboExcludes
+var comboSuffix
 
 
 seajs.on("load", setComboHash)
@@ -24,6 +25,7 @@ function setComboHash(uris) {
 
   data.comboSyntax && (comboSyntax = data.comboSyntax)
   data.comboMaxLength && (comboMaxLength = data.comboMaxLength)
+  data.comboSuffix && (comboSuffix = data.comboSuffix)
 
   comboExcludes = data.comboExcludes
   var needComboUris = []
@@ -225,7 +227,14 @@ function paths2hash(paths) {
 }
 
 function setHash(root, files) {
-  var comboPath = root + comboSyntax[0] + files.join(comboSyntax[1])
+  var copy = []
+  for (var i = 0, len = files.length; i < len; i++) {
+    copy[i] = files[i].replace(/\?.*$/, '')
+  }
+  var comboPath = root + comboSyntax[0] + copy.join(comboSyntax[1])
+  if(comboSuffix) {
+    comboPath += comboSuffix
+  }
   var exceedMax = comboPath.length > comboMaxLength
 
   // http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url

diff --git a/tests/spec/combo-map/main.js b/tests/spec/combo-map/main.js
@@ -17,7 +17,7 @@ define(function(require) {
 
   test.assert(a.name == 'a', a.name)
   test.assert(b.name == 'b', b.name)
-  test.assert(c === null, 'return null when c is not found')
+  test.assert(c === void 0, 'return undefined when c is not found' + c)
 
   test.next()
 

diff --git a/tests/spec/test.html b/tests/spec/test.html
@@ -4,8 +4,8 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=0">
 <title>test</title>
-<script src="http://assets.spmjs.org/seajs/seajs/2.1.1/sea.js"></script>
-<script src="http://assets.spmjs.org/seajs/seajs-css/1.0.3/seajs-css.js"></script>
+<script src="https://raw.githubusercontent.com/seajs/seajs/master/dist/sea-debug.js"></script>
+<script src="https://raw.githubusercontent.com/seajs/seajs-css/master/dist/seajs-css.js"></script>
 </head>
 <body>
 <div id="out"></div>
@@ -14,7 +14,7 @@
 //  seajs.data.preload.length = 0
 
   seajs.use(['../test'], function(test) {
-    test.run(['combo', 'combo-map'])
+    test.run(['combo', 'combo-map', 'timestamp'])
   })
 
 </script>

diff --git a/tests/spec/timestamp/a.js,b.js,c.js b/tests/spec/timestamp/a.js,b.js,c.js
@@ -0,0 +1,2 @@
+define('a', [], { name: 'a' })
+define('b', [], { name: 'b' })
diff --git a/tests/spec/timestamp/main.js b/tests/spec/timestamp/main.js
@@ -0,0 +1,25 @@
+seajs.config({
+  base: './timestamp/'
+})
+
+define(function(require) {
+
+  var test = require('../../test')
+
+  seajs.use('../../dist/seajs-combo', function() {
+    seajs.config({
+      comboSyntax: ['', ','],
+      comboSuffix: '?1',
+      map: [
+        [/^(.*)$/, '$1?1']
+      ]
+    })
+    seajs.use(['a', 'b', 'c'], function(a, b, c) {
+      test.assert(a.name == 'a', a.name)
+      test.assert(b.name == 'b', b.name)
+      test.assert(c === void 0, 'return undefined when c is not found' + c)
+
+      test.next()
+    })
+  });
+});