4.49 release

kalcaddle · Aug 25, 2022 · 8252376 · 8252376
1 parent 881b9a2
commit 8252376
Show file tree

Hide file tree

Showing 29 changed files with 48 additions and 88 deletions.
diff --git a/app/controller/utils.php b/app/controller/utils.php
diff --git a/app/template/api/view.html b/app/template/api/view.html
@@ -83,9 +83,7 @@
 		seajs.config({
 			base: "<?php echo STATIC_PATH;?>js/",
 			preload: ["lib/jquery-1.8.0.min",'lib/ace/src-min-noconflict/ace'],
-			map:[
-				[ /^(.*\.(?:css|js))(.*)$/i,'$1$2?ver='+G.version]
-			]
+			map:[[/^(.*\.(?:css|js|html|htm|json|text))([\?|#].*)$/i,'$1$2?ver='+G.version]]
 		});
 		seajs.use("<?php echo STATIC_JS;?>/src/api/view/main");
 	</script>

diff --git a/app/template/app/index.html b/app/template/app/index.html
@@ -27,13 +27,6 @@ <h1><?php echo LNG('app');?></h1>
 
 	<?php include(TEMPLATE.'common/footerCommon.html');?>
 	<script type="text/javascript">
-		seajs.config({
-			base: "<?php echo STATIC_PATH;?>js/",
-			preload: ["lib/jquery-1.8.0.min"],
-			map:[
-				[ /^(.*\.(?:css|js))(.*)$/i,'$1$2?ver='+G.version]
-			]
-		});
 		seajs.use('app/src/app/main');
 	</script>
 </body>

diff --git a/app/template/common/footerCommon.html b/app/template/common/footerCommon.html
@@ -36,13 +36,9 @@
 	?>
 	seajs.config({
 		base: "<?php echo STATIC_PATH;?>js/",
-		preload: [
-			"lib/jquery-1.8.0.min",
-		],
-		map:[
-			[ /^(.*\.(?:css|js))(.*)$/i,'$1$2?ver='+G.version]
-		]
+		preload: ["lib/jquery-1.8.0.min"],
+		map:[[/^(.*\.(?:css|js|html|htm|json|text))([\?|#].*)$/i,'$1$2?ver='+G.version]]
 	});
 	if(navigator.serviceWorker){navigator.serviceWorker.register('./?share/manifestJS');}
 </script>
-<?php Hook::trigger('templateCommonFooter');?>
+<?php Hook::trigger('templateCommonFooter');?>
diff --git a/app/template/user/install.html b/app/template/user/install.html
@@ -56,13 +56,6 @@ <h3><?php echo LNG('php_env_check');?></h3>
 				alert('js文件不完整,请查看浏览器控制台和服务器配置是否正常。或检查文件是否被修改(或咨询主机商压缩js导致文件损坏);[js load error!]');
 			}
 		},1000);
-		seajs.config({
-			base: "<?php echo STATIC_PATH;?>js/",
-			preload: ["lib/jquery-1.8.0.min"],
-			map:[
-				[ /^(.*\.(?:css|js))(.*)$/i,'$1$2?ver='+G.version]
-			]
-		});
 		seajs.use("<?php echo STATIC_JS;?>/src/user/main");
 	</script>
 

diff --git a/app/template/user/license.html b/app/template/user/license.html
@@ -24,13 +24,6 @@
 	<?php $GLOBALS['loadCommonJs'] = true;?>
 	<?php include(TEMPLATE.'common/footer.html');?>
 	<script type="text/javascript" >
-		seajs.config({
-			base: "<?php echo STATIC_PATH;?>js/",
-			preload: ["lib/jquery-1.8.0.min"],
-			map:[
-				[ /^(.*\.(?:css|js))(.*)$/i,'$1$2?ver='+G.version]
-			]
-		});
 		seajs.use("<?php echo STATIC_JS;?>/src/user/main");
 	</script>
 </body>

diff --git a/app/template/user/login.html b/app/template/user/login.html
@@ -85,13 +85,6 @@
 				alert('js文件不完整,请查看浏览器控制台和服务器配置是否正常。或检查文件是否被修改(或咨询主机商压缩js导致文件损坏);[js load error!]');
 			}
 		},1000);
-		seajs.config({
-			base: "<?php echo STATIC_PATH;?>js/",
-			preload: ["lib/jquery-1.8.0.min"],
-			map:[
-				[ /^(.*\.(?:css|js))(.*)$/i,'$1$2?ver='+G.version]
-			]
-		});
 		seajs.use("<?php echo STATIC_JS;?>/src/user/main");
 	</script>
 </body>

diff --git a/app/template/user/loginWap.html b/app/template/user/loginWap.html
@@ -59,13 +59,6 @@
 	<?php $GLOBALS['loadCommonJs'] = true;?>
 	<?php include(TEMPLATE.'common/footer.html');?>
 	<script type="text/javascript" >
-		seajs.config({
-			base: "<?php echo STATIC_PATH;?>js/",
-			preload: ["lib/jquery-1.8.0.min"],
-			map:[
-				[ /^(.*\.(?:css|js))(.*)$/i,'$1$2?ver='+G.version]
-			]
-		});
 		seajs.use("<?php echo STATIC_JS;?>/src/user/main");
 	</script>
 </body>

diff --git a/plugins/toolsCommon/static/pie/.pie.tif b/plugins/toolsCommon/static/pie/.pie.tif
diff --git a/static/js/app/src/api/default/main.js b/static/js/app/src/api/default/main.js
diff --git a/static/js/app/src/api/view/main.js b/static/js/app/src/api/view/main.js
diff --git a/static/js/app/src/app/main.js b/static/js/app/src/app/main.js
diff --git a/static/js/app/src/desktop/main.js b/static/js/app/src/desktop/main.js
diff --git a/static/js/app/src/edit/main.js b/static/js/app/src/edit/main.js
diff --git a/static/js/app/src/editor/main.js b/static/js/app/src/editor/main.js
diff --git a/static/js/app/src/explorer/main.js b/static/js/app/src/explorer/main.js
diff --git a/static/js/app/src/explorerWap/main.js b/static/js/app/src/explorerWap/main.js
diff --git a/static/js/app/src/plugins/main.js b/static/js/app/src/plugins/main.js
diff --git a/static/js/app/src/setting/main.js b/static/js/app/src/setting/main.js
diff --git a/static/js/app/src/shareEditor/main.js b/static/js/app/src/shareEditor/main.js
diff --git a/static/js/app/src/shareExplorer/main.js b/static/js/app/src/shareExplorer/main.js
diff --git a/static/js/app/src/shareIndex/main.js b/static/js/app/src/shareIndex/main.js
diff --git a/static/js/app/src/user/main.js b/static/js/app/src/user/main.js
diff --git a/static/js/lib/seajs/sea.js b/static/js/lib/seajs/sea.js
diff --git a/static/style/skin/base/app_code_edit.css b/static/style/skin/base/app_code_edit.css
diff --git a/static/style/skin/base/app_desktop.css b/static/style/skin/base/app_desktop.css
diff --git a/static/style/skin/base/app_editor.css b/static/style/skin/base/app_editor.css
diff --git a/static/style/skin/base/app_explorer.css b/static/style/skin/base/app_explorer.css
diff --git a/static/style/skin/base/app_setting.css b/static/style/skin/base/app_setting.css