Browse Source

FIX: some small fixes

Giancarlo Voci 7 years ago
parent
commit
52feffecae
3 changed files with 6 additions and 13 deletions
  1. 1 0
      .gitignore
  2. 4 4
      package.json
  3. 1 9
      ui/frontend/js/frontend.js

+ 1 - 0
.gitignore

@@ -51,6 +51,7 @@ tmp
 src_minified
 src_minified
 import
 import
 /cfg/*.old
 /cfg/*.old
+/cfg/*.bin
 /fbtpl
 /fbtpl
 
 
 # webpack generated files
 # webpack generated files

+ 4 - 4
package.json

@@ -1,6 +1,6 @@
 {
 {
 	"name": "omlink",
 	"name": "omlink",
-	"version": "1.9.33",
+	"version": "1.9.34",
 	"codename": "Barricade",
 	"codename": "Barricade",
 	"private": true,
 	"private": true,
 	"description": "OM-Link Engine",
 	"description": "OM-Link Engine",
@@ -18,7 +18,7 @@
 		"popper.js": "^1.15.0"
 		"popper.js": "^1.15.0"
 	},
 	},
 	"devDependencies": {
 	"devDependencies": {
-		"acorn": "^6.1.1",
+		"acorn": "^6.2.1",
 		"clean-webpack-plugin": "^3.0.0",
 		"clean-webpack-plugin": "^3.0.0",
 		"css-loader": "^2.1.1",
 		"css-loader": "^2.1.1",
 		"file-loader": "^3.0.1",
 		"file-loader": "^3.0.1",
@@ -31,8 +31,8 @@
 		"shx": "^0.3.2",
 		"shx": "^0.3.2",
 		"terser-webpack-plugin": "^1.3.0",
 		"terser-webpack-plugin": "^1.3.0",
 		"url-loader": "^1.1.2",
 		"url-loader": "^1.1.2",
-		"webpack": "^4.32.2",
-		"webpack-cli": "^3.3.2"
+		"webpack": "^4.38.0",
+		"webpack-cli": "^3.3.6"
 	},
 	},
 	"files": [
 	"files": [
 		"index.php",
 		"index.php",

+ 1 - 9
ui/frontend/js/frontend.js

@@ -7,19 +7,11 @@
  */
  */
 
 
 import './common';
 import './common';
+import {AjaxReq, fetchHeaders} from "./OMGUtils";
 
 
 let CUSTOM_NOTIFY = 0x4000;
 let CUSTOM_NOTIFY = 0x4000;
 let REFRESH_FILTERS = CUSTOM_NOTIFY + 1;
 let REFRESH_FILTERS = CUSTOM_NOTIFY + 1;
 
 
-const fetchHeaders = {
-	'Accept': 'text/html',
-	'Content-Type': 'text/html',
-	'X-Requested-With': 'XMLHttpRequest',
-	'Cache-Control': 'no-cache',
-	'Pragma': 'no-cache',
-	'Expires': '0'
-};
-
 /* usefull if a blinking text is need, like in MaxMara project, you need to place this code in html:
 /* usefull if a blinking text is need, like in MaxMara project, you need to place this code in html:
  *
  *
  * <nav class="navbar navbar-collapse p-0">
  * <nav class="navbar navbar-collapse p-0">