Browse Source

require.js对.min.js文件不加版本号

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@2892 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
yingp 10 years ago
parent
commit
117bc3b1e7

+ 1 - 1
src/main/webapp/resources/js/index/main.js

@@ -14,7 +14,7 @@ require.config({
 		'ui.bootstrap' : 'lib/angular/ui-bootstrap-tpls.min',
 		'file-upload' : 'lib/angular/angular-file-upload.min',
 		'file-upload-shim' : 'lib/angular/angular-file-upload-shim.min',
-		'ngTable' : 'lib/angular/ng-table',
+		'ngTable' : 'lib/angular/ng-table.min',
 		'ngResource' : 'lib/angular/angular-resource.min',
 		'ngSanitize': 'lib/angular/angular-sanitize.min'
 	},

+ 1 - 1
src/main/webapp/resources/js/public/main.js

@@ -10,7 +10,7 @@ require.config({
 		'service' : 'js/public/services',
 		'ui.router' : 'lib/angular/angular-ui-router.min',
 		'ui.bootstrap' : 'lib/angular/ui-bootstrap-tpls.min',
-		'ngTable' : 'lib/angular/ng-table',
+		'ngTable' : 'lib/angular/ng-table.min',
 		'ngResource' : 'lib/angular/angular-resource.min',
 		'ngSanitize': 'lib/angular/angular-sanitize.min'
 	},

+ 1 - 1
src/main/webapp/resources/js/serve/main.js

@@ -10,7 +10,7 @@ require.config({
 		'service' : 'js/serve/services',
 		'ui.router' : 'lib/angular/angular-ui-router.min',
 		'ui.bootstrap' : 'lib/angular/ui-bootstrap-tpls.min',
-		'ngTable' : 'lib/angular/ng-table',
+		'ngTable' : 'lib/angular/ng-table.min',
 		'ngResource' : 'lib/angular/angular-resource.min'
 	},
 	shim : {

+ 1 - 1
src/main/webapp/resources/lib/require.all.js

@@ -1893,7 +1893,7 @@ var requirejs, require, define;
         var config = (context && context.config) || {},
             node;
         if (isBrowser) {
-        	url = cfg.suffix ? (url + cfg.suffix) : url;
+        	url = (cfg.suffix && !/\.min\.js$/.test(url)) ? (url + cfg.suffix) : url;
             //In the browser so use a script tag
             node = req.createNode(config, moduleName, url);
             if (config.onNodeCreated) {

File diff suppressed because it is too large
+ 0 - 0
src/main/webapp/resources/lib/require.js


Some files were not shown because too many files changed in this diff