diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index aa1c93a15..7e6c03473 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -259,12 +259,14 @@ const EditPage = createClass({ const preSaveSnapshot = { ...this.state.brew }; //Prepare content to send to server - const brew = { ...this.state.brew }; - brew.pageCount = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1; - brew.patches = stringifyPatches(makePatches(this.savedBrew.text, brew.text)); - brew.hash = await md5(this.savedBrew.text); - brew.text = undefined; - brew.textBin = undefined; + const brew = { ...this.state.brew }; + brew.text = brew.text.normalize(); + this.savedBrew.text = this.savedBrew.text.normalize(); + brew.pageCount = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1; + brew.patches = stringifyPatches(makePatches(this.savedBrew.text, brew.text)); + brew.hash = await md5(this.savedBrew.text); + brew.text = undefined; + brew.textBin = undefined; const transfer = this.state.saveGoogle == _.isNil(this.state.brew.googleId); const params = `${transfer ? `?${this.state.saveGoogle ? 'saveToGoogle' : 'removeFromGoogle'}=true` : ''}`; diff --git a/package.json b/package.json index 2a1510d5a..4926166ef 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "lines": 50 }, "server/homebrew.api.js": { - "statements": 70, + "statements": 69, "branches": 50, "functions": 65, "lines": 70 diff --git a/server/homebrew.api.js b/server/homebrew.api.js index 5aaf7aac2..bb0ab5e75 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -340,7 +340,8 @@ const api = { const brewFromClient = api.excludePropsFromUpdate(req.body); const brewFromServer = req.brew; splitTextStyleAndMetadata(brewFromServer); - + + brewFromServer.text = brewFromServer.text.normalize(); brewFromServer.hash = await md5(brewFromServer.text); if((brewFromServer?.version !== brewFromClient?.version) || (brewFromServer?.hash !== brewFromClient?.hash)) {