f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-01 21:42:44 +00:00
Code Wiki Activity

Merge branch 'master' into addEditorThemes-#362

Browse Source
This commit is contained in:
G.Ambatte
2023-09-06 07:44:24 +12:00
committed by GitHub
parent 220816a172 f4356025de
commit 74d6aa7c8a
3 changed files with 615 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/homebrew/pages/editPage/editPage.jsx
View File

@@ -91,7 +91,7 @@ const EditPage = createClass({
if(!(e.ctrlKey || e.metaKey)) return; if(!(e.ctrlKey || e.metaKey)) return;
const S_KEY = 83; const S_KEY = 83;
const P_KEY = 80; const P_KEY = 80;
if(e.keyCode == S_KEY) this.save(); if(e.keyCode == S_KEY) this.trySave(true);
if(e.keyCode == P_KEY) window.open(`/print/${this.processShareId()}?dialog=true`, '_blank').focus(); if(e.keyCode == P_KEY) window.open(`/print/${this.processShareId()}?dialog=true`, '_blank').focus();
if(e.keyCode == P_KEY || e.keyCode == S_KEY){ if(e.keyCode == P_KEY || e.keyCode == S_KEY){
e.stopPropagation(); e.stopPropagation();
@@ -137,13 +137,14 @@ const EditPage = createClass({
return !_.isEqual(this.state.brew, this.savedBrew); return !_.isEqual(this.state.brew, this.savedBrew);
}, },
trySave : function(){ trySave : function(immediate=false){
if(!this.debounceSave) this.debounceSave = _.debounce(this.save, SAVE_TIMEOUT); if(!this.debounceSave) this.debounceSave = _.debounce(this.save, SAVE_TIMEOUT);
if(this.hasChanges()){ if(this.hasChanges()){
this.debounceSave(); this.debounceSave();
} else { } else {
this.debounceSave.cancel(); this.debounceSave.cancel();
} }
if(immediate) this.debounceSave.flush();
}, },
handleGoogleClick : function(){ handleGoogleClick : function(){

1162
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
package.json
View File

@@ -78,10 +78,10 @@
] ]
}, },
"dependencies": { "dependencies": {
"@babel/core": "^7.22.10", "@babel/core": "^7.22.15",
"@babel/plugin-transform-runtime": "^7.22.10", "@babel/plugin-transform-runtime": "^7.22.15",
"@babel/preset-env": "^7.22.10", "@babel/preset-env": "^7.22.15",
"@babel/preset-react": "^7.22.5", "@babel/preset-react": "^7.22.15",
"@googleapis/drive": "^5.1.0", "@googleapis/drive": "^5.1.0",
"body-parser": "^1.20.2", "body-parser": "^1.20.2",
"classnames": "^2.3.2", "classnames": "^2.3.2",
@@ -99,11 +99,11 @@
"lodash": "^4.17.21", "lodash": "^4.17.21",
"marked": "5.1.1", "marked": "5.1.1",
"marked-extended-tables": "^1.0.6", "marked-extended-tables": "^1.0.6",
"marked-gfm-heading-id": "^3.0.6", "marked-gfm-heading-id": "^3.0.7",
"marked-smartypants-lite": "^1.0.0", "marked-smartypants-lite": "^1.0.0",
"markedLegacy": "npm:marked@^0.3.19", "markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.4", "moment": "^2.29.4",
"mongoose": "^7.4.3", "mongoose": "^7.5.0",
"nanoid": "3.3.4", "nanoid": "3.3.4",
"nconf": "^0.12.0", "nconf": "^0.12.0",
"npm": "^9.8.1", "npm": "^9.8.1",
@@ -116,10 +116,10 @@
"vitreum": "git+https://git@github.com/calculuschild/vitreum.git" "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^8.47.0", "eslint": "^8.48.0",
"eslint-plugin-jest": "^27.2.3", "eslint-plugin-jest": "^27.2.3",
"eslint-plugin-react": "^7.33.2", "eslint-plugin-react": "^7.33.2",
"jest": "^29.6.2", "jest": "^29.6.4",
"jest-expect-message": "^1.1.3", "jest-expect-message": "^1.1.3",
"postcss-less": "^6.0.0", "postcss-less": "^6.0.0",
"stylelint": "^15.10.3", "stylelint": "^15.10.3",