Merge pull request #1341 from naturalcrit/v2.11.2

Up version to 2.11.2

changelog.md

@@ -6,6 +6,11 @@ h5 {
 
 # changelog
 
+### Saturday, 02/5/2021 - v2.11.2
+
+- Fix for edge case where brews could accidentally transfer from Google Drive back to Homebrewery.
+- Move cursor to end of snippet after insertion
+
 ### Saturday, 20/3/2021 - v2.11.1
 
 - Warning when opening brew in your Google Drive trash
@@ -52,10 +57,6 @@ h5 {
 ### Monday, 19/10/2020 - v2.10.2
 - Fixed issue with "recent" item links not updating when transferring between Google Drive.
 
-
-```
-```
-
 ### Monday, 12/10/2020 - v2.10.1
 - Fixed issue with users unable to create new brews
 - Fixing brews being lost when loaded via back button
@@ -73,6 +74,13 @@ h5 {
 ### Wednesday, 20/05/2020 - v2.9.0
 - Major refactoring of site backend to work with updated dependencies for security (should be invisible to users)
 
+
+
+
+
+
+\page
+
 ### Wednesday, 11/03/2020 - v2.8.2
 - Fixed delete button removing everyone's copy for brews with multiple authors
 - Compressed homebrew text in database
@@ -100,9 +108,6 @@ h5 {
 ### Saturday, 22/04/2017 - v2.7.4
 - Give ability to hide the render warning notification
 
-
-\page
-
 ### Friday, 03/03/2017 - v2.7.3
 - Increasing the range on the Partial Page Rendering for a quick-fix for it getting out of sync on long brews.
 
@@ -144,9 +149,6 @@ h5 {
 - Added in a snippet for a split table
 - Added an account nav item to new page
 
-```
-```
-
 ### Sunday, 27/11/2016 - v2.5.1
 - Fixed the column rendering on the new user page. Really should have tested that better
 - Added a hover tooltip to fully read the brew description
@@ -167,6 +169,8 @@ h5 {
 - You can now print from a new page without saving
 - Added the ability to use ctrl+p and ctrl+s to print and save respectively.
 
+\page
+
 ### Monday, 07/11/2016
 - Added final touches to the html validator and updating the rest of the branch
 - If anyone finds issues with the new HTML validator, please let me know. I hope this will bring a more consistent feel to Homebrewery rendering.
@@ -186,8 +190,6 @@ h5 {
 - Fixed the noteblock overlapping into titles (thanks u/dsompura!)
 - Fixed a bad search route in the admin panel (thanks u/SnappyTom!)
 
-\page
-
 ### Friday, 29/07/2016 - v2.2.7
 - Adding in descriptive note blocks. (Thanks calculuschild!)
 

client/homebrew/editor/snippetbar/snippets/snippets.js

@@ -6,6 +6,7 @@ const MonsterBlockGen = require('./monsterblock.gen.js');
 const ClassFeatureGen = require('./classfeature.gen.js');
 const CoverPageGen = require('./coverpage.gen.js');
 const TableOfContentsGen = require('./tableOfContents.gen.js');
+const dedent = require('dedent-tabs').default;
 
 
 module.exports = [
@@ -201,63 +202,61 @@ module.exports = [
 				name : 'Table',
 				icon : 'fas fa-th-list',
 				gen  : function(){
-					return [
+					return dedent`
-						'##### Cookie Tastiness',
+						##### Character Advancement
-						'| Tastiness | Cookie Type |',
+						| Experience Points | Level | Proficiency Bonus |
-						'|:----:|:-------------|',
+						|:------------------|:-----:|:-----------------:|
-						'| -5  | Raisin |',
+						| 0                 | 1     | +2                |
-						'| 8th  | Chocolate Chip |',
+						| 300               | 2     | +2                |
-						'| 11th | 2 or lower |',
+						| 900               | 3     | +2                |
-						'| 14th | 3 or lower |',
+						| 2,700             | 4     | +2                |
-						'| 17th | 4 or lower |\n\n',
+						| 6,500             | 5     | +3                |
-					].join('\n');
+						| 14,000            | 6     | +3                |
-				},
+						\n`;
+				}
 			},
 			{
 				name : 'Wide Table',
 				icon : 'fas fa-list',
 				gen  : function(){
-					return [
+					return dedent`
-						'<div class=\'wide\'>',
+						{{wide
-						'##### Cookie Tastiness',
+						##### Weapons
-						'| Tastiness | Cookie Type |',
+						| Name                    | Cost  | Damage          | Weight  | Properties |
-						'|:----:|:-------------|',
+						|:------------------------|:-----:|:----------------|--------:|:-----------|
-						'| -5  | Raisin |',
+						| *Simple Melee Weapons*  |       |                 |         |            |
-						'| 8th  | Chocolate Chip |',
+						| &emsp; Club             | 1 sp  | 1d4 bludgeoning | 2 lb.   | Light      |
-						'| 11th | 2 or lower |',
+						| &emsp; Dagger           | 2 gp  | 1d4 piercing    | 1 lb.   | Finesse    |
-						'| 14th | 3 or lower |',
+						| &emsp; Spear            | 1 gp  | 1d6 piercing    | 3 lb.   | Thrown     |
-						'| 17th | 4 or lower |',
+						| *Simple Ranged Weapons* |       |                 |         |            |
-						'</div>\n\n'
+						| &emsp; Dart             | 5 cp  | 1d4 piercig     | 1/4 lb. | Finesse    |
-					].join('\n');
+						| &emsp; Shortbow         | 25 gp | 1d6 piercing    | 2 lb.   | Ammunition |
-				},
+						| &emsp; Sling            | 1 sp  | 1d4 bludgeoning | &mdash; | Ammunition |
+						}}
+						\n`;
+				}
 			},
 			{
 				name : 'Split Table',
 				icon : 'fas fa-th-large',
 				gen  : function(){
-					return [
+					return dedent`
-						'<div style=\'column-count:2\'>',
+						##### Typical Difficulty Classes
-						'| d10 | Damage Type |',
+						{{column-count="2"
-						'|:---:|:------------|',
+						| Task Difficulty | DC |
-						'|  1  | Acid        |',
+						|:----------------|:--:|
-						'|  2  | Cold        |',
+						| Very easy       | 5  |
-						'|  3  | Fire        |',
+						| Easy            | 10 |
-						'|  4  | Force       |',
+						| Medium          | 15 |
-						'|  5  | Lightning   |',
+
-						'',
+						| Task Difficulty   | DC |
-						'```',
+						|:------------------|:--:|
-						'```',
+						| Hard              | 20 |
-						'',
+						| Very hard         | 25 |
-						'| d10 | Damage Type |',
+						| Nearly impossible | 30 |
-						'|:---:|:------------|',
+						}}
-						'|  6  | Necrotic    |',
+						\n`;
-						'|  7  | Poison      |',
+				}
-						'|  8  | Psychic     |',
-						'|  9  | Radiant     |',
-						'|  10 | Thunder     |',
-						'</div>\n\n',
-					].join('\n');
-				},
 			}
 		]
 	},

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "homebrewery",
-  "version": "2.11.1",
+  "version": "2.11.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "2.11.1",
+  "version": "2.11.2",
   "engines": {
     "node": "14.15.x"
   },