Add: comboMaxFiles opts

Set `comboMaxFiles` opts in seajs and server. It limits the number of files pre combo.
seajs · May 4, 2015 · 225cb81 · 225cb81
1 parent 648805c
commit 225cb81
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/dist/seajs-combo-debug.js b/dist/seajs-combo-debug.js
@@ -11,6 +11,7 @@ var comboHash = data.comboHash = {}
 
 var comboSyntax = ["??", ","]
 var comboMaxLength = 2000
+var comboMaxFiles = 200
 var comboExcludes
 var comboSuffix
 
@@ -27,6 +28,7 @@ function setComboHash(uris) {
   data.comboSyntax && (comboSyntax = data.comboSyntax)
   data.comboMaxLength && (comboMaxLength = data.comboMaxLength)
   data.comboSuffix && (comboSuffix = data.comboSuffix)
+  data.comboMaxFiles && (comboMaxFiles = data.comboMaxFiles)
 
   comboExcludes = data.comboExcludes
   var needComboUris = []
@@ -232,6 +234,13 @@ function setHash(root, files) {
   for (var i = 0, len = files.length; i < len; i++) {
     copy[i] = files[i].replace(/\?.*$/, '')
   }
+  // server limit file num
+  if (files.length > comboMaxFiles) {
+    setHash(copy.splice(0, comboMaxFiles))
+    setHash(copy)
+    return
+  }
+
   var comboPath = root + comboSyntax[0] + copy.join(comboSyntax[1])
   if(comboSuffix) {
     comboPath += comboSuffix

diff --git a/dist/seajs-combo.js b/dist/seajs-combo.js
diff --git a/src/seajs-combo.js b/src/seajs-combo.js
@@ -10,6 +10,7 @@ var comboHash = data.comboHash = {}
 
 var comboSyntax = ["??", ","]
 var comboMaxLength = 2000
+var comboMaxFiles = 200
 var comboExcludes
 var comboSuffix
 
@@ -26,6 +27,7 @@ function setComboHash(uris) {
   data.comboSyntax && (comboSyntax = data.comboSyntax)
   data.comboMaxLength && (comboMaxLength = data.comboMaxLength)
   data.comboSuffix && (comboSuffix = data.comboSuffix)
+  data.comboMaxFiles && (comboMaxFiles = data.comboMaxFiles)
 
   comboExcludes = data.comboExcludes
   var needComboUris = []
@@ -231,6 +233,13 @@ function setHash(root, files) {
   for (var i = 0, len = files.length; i < len; i++) {
     copy[i] = files[i].replace(/\?.*$/, '')
   }
+  // server limit file num
+  if (files.length > comboMaxFiles) {
+    setHash(copy.splice(0, comboMaxFiles))
+    setHash(copy)
+    return
+  }
+
   var comboPath = root + comboSyntax[0] + copy.join(comboSyntax[1])
   if(comboSuffix) {
     comboPath += comboSuffix