Skip to content

Commit 1587a1e

Browse files
committed
Merge branch 'release/v1.0.8'
# Conflicts: # package-lock.json
2 parents 214d142 + c3daa62 commit 1587a1e

File tree

9 files changed

+2694
-3068
lines changed

9 files changed

+2694
-3068
lines changed

dist/tasty.js

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 2659 additions & 3023 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "tasty.js",
3-
"version": "1.0.7",
3+
"version": "1.0.8",
44
"description": "A Pie- and Marking-Menu Framework written in TypeScript.",
55
"scripts": {
66
"type-check": "tsc --noEmit",
77
"type-check:watch": "npm run type-check -- --watch",
88
"build:types": "tsc --emitDeclarationOnly",
99
"build:js": "webpack --mode=production",
10-
"build": "npm run build:types && npm run build:js",
10+
"build": "npm run lint:fix && npm run build:types && npm run build:js",
1111
"lint": "eslint --ext .js,.jsx,.ts,.tsx ./src",
1212
"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx ./src --fix",
1313
"start:dev": "webpack-dev-server"
@@ -20,34 +20,34 @@
2020
"types": "dist/index.d.ts",
2121
"license": "MIT",
2222
"devDependencies": {
23-
"@babel/core": "^7.8.4",
24-
"@babel/plugin-proposal-class-properties": "^7.8.3",
25-
"@babel/plugin-proposal-object-rest-spread": "^7.8.3",
26-
"@babel/preset-env": "^7.8.4",
27-
"@babel/preset-typescript": "^7.8.3",
28-
"@fortawesome/free-solid-svg-icons": "^5.12.1",
29-
"@types/lodash": "^4.14.149",
30-
"@typescript-eslint/eslint-plugin": "^2.20.0",
31-
"@typescript-eslint/parser": "^2.20.0",
32-
"babel-loader": "^8.0.6",
33-
"eslint": "^6.8.0",
34-
"eslint-config-airbnb-typescript": "^7.0.0",
35-
"eslint-plugin-import": "^2.20.1",
36-
"fork-ts-checker-webpack-plugin": "^4.0.4",
37-
"html-loader": "^0.5.5",
38-
"html-webpack-plugin": "^3.2.0",
39-
"typescript": "^3.7.5",
40-
"webpack": "^4.41.6",
41-
"webpack-cli": "^3.3.11",
42-
"webpack-dev-server": "^3.10.3"
23+
"@babel/core": "^7.10.3",
24+
"@babel/plugin-proposal-class-properties": "^7.10.1",
25+
"@babel/plugin-proposal-object-rest-spread": "^7.10.3",
26+
"@babel/preset-env": "^7.10.3",
27+
"@babel/preset-typescript": "^7.10.1",
28+
"@fortawesome/free-solid-svg-icons": "^5.13.1",
29+
"@types/lodash": "^4.14.157",
30+
"@typescript-eslint/eslint-plugin": "^3.4.0",
31+
"@typescript-eslint/parser": "^3.4.0",
32+
"babel-loader": "^8.1.0",
33+
"eslint": "^7.3.1",
34+
"eslint-config-airbnb-typescript": "^8.0.2",
35+
"eslint-plugin-import": "^2.21.2",
36+
"fork-ts-checker-webpack-plugin": "^5.0.5",
37+
"html-loader": "^1.1.0",
38+
"html-webpack-plugin": "^4.3.0",
39+
"typescript": "^3.9.5",
40+
"webpack": "^4.43.0",
41+
"webpack-cli": "^3.3.12",
42+
"webpack-dev-server": "^3.11.0"
4343
},
4444
"resolutions": {
4545
"terser": "3.14.1"
4646
},
4747
"dependencies": {
4848
"lodash": "^4.17.15",
4949
"paper": "^0.12.4",
50-
"rxjs": "^6.5.4"
50+
"rxjs": "^6.5.5"
5151
},
5252
"files": [
5353
"dist"

src/lib/constants.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ export const ZERO_POINT = new Point(0, 0);
44
export const REFERENCE_POINT = new Point(0, -1);
55
export const DEFAULT_SCALE = new Point(1, 1);
66

7-
87
Object.freeze(ZERO_POINT);
98
Object.freeze(REFERENCE_POINT);
109
Object.freeze(DEFAULT_SCALE);

src/lib/interfaces/slider-definition.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/**
32
* Slider configuration data
43
* min: Min value

src/lib/menu/menu-item.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,6 @@ export default class MenuItem extends Base implements MenuIdentifier {
495495
this.reset();
496496
}
497497

498-
499498
if (this.state !== ItemState.SUBMENU) {
500499
this.connector.opacity = 1;
501500
this.geometry.opacity = 1;

src/lib/menu/menu.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ export default class Menu implements MenuData {
6666
*/
6767
private readonly _dragging$: Subject<DragDefinition>;
6868

69-
7069
/**
7170
* HTML Element selector passed to `document.querySelector`
7271
*
@@ -163,7 +162,6 @@ export default class Menu implements MenuData {
163162
this._click$ = new Subject<ClickState>();
164163
}
165164

166-
167165
/**
168166
* @see {_inputPosition}
169167
* @return {Observable<paper.Point>}
@@ -240,7 +238,6 @@ export default class Menu implements MenuData {
240238
return this._canvas;
241239
}
242240

243-
244241
/**
245242
* Initializes the menu, sets up the canvas and scope
246243
*
@@ -406,7 +403,6 @@ export default class Menu implements MenuData {
406403
(<paper.Project> this._scope.project).currentStyle = this._settings.projectStyle;
407404
}
408405

409-
410406
/**
411407
* Sets up needed Observable data mapping and subscribing
412408
*/

src/lib/menu/ribbonslider.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,6 @@ export default class Ribbonslider extends MenuItem {
663663
this.moveRibbonToValuePosition(this.value, true);
664664
};
665665

666-
667666
for (let i = 0; i <= this.getRibbonLength() / (this.configuration.stepDist / 2); i += 1) {
668667
const position = new paper.Point(
669668
i * (this.configuration.stepDist / 2) + this.settings[SettingsGroup.RIBBONSLIDER].gradientLength / 2,
@@ -783,7 +782,6 @@ export default class Ribbonslider extends MenuItem {
783782
return mask;
784783
}
785784

786-
787785
/**
788786
* Calculate the ribbon length
789787
*/

src/utlis/animation.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ export abstract class IAnimation {
6161
public abstract stop(goToEnd: boolean): void;
6262
}
6363

64-
6564
/**
6665
* Class representing an animation
6766
*

0 commit comments

Comments
 (0)