Skip to content

Commit

Permalink
Merge pull request #748 from aamcrae/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
jonobr1 authored Dec 24, 2024
2 parents 53962b4 + 01adb33 commit 51889b6
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/element.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Events } from './events.js';
import { Constants } from 'constants.js';
import { Constants } from './constants.js';

/**
* @name Two.Element
Expand Down
24 changes: 12 additions & 12 deletions src/group.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { Events } from './events.js';
import { _ } from './utils/underscore.js';
import { getEffectFromObject } from 'utils/shape.js';
import { getEffectFromObject } from './utils/shape.js';

import { Shape } from './shape.js';
import { Children } from './children.js';
import { Path } from 'path.js';
import { ArcSegment } from 'shapes/arc-segment.js';
import { Circle } from 'shapes/circle.js';
import { Ellipse } from 'shapes/ellipse.js';
import { Points } from 'shapes/points.js';
import { Polygon } from 'shapes/polygon.js';
import { Rectangle } from 'shapes/rectangle.js';
import { RoundedRectangle } from 'shapes/rounded-rectangle.js';
import { Star } from 'shapes/star.js';
import { Text } from 'text.js';
import { Element } from 'element.js';
import { Path } from './path.js';
import { ArcSegment } from './shapes/arc-segment.js';
import { Circle } from './shapes/circle.js';
import { Ellipse } from './shapes/ellipse.js';
import { Points } from './shapes/points.js';
import { Polygon } from './shapes/polygon.js';
import { Rectangle } from './shapes/rectangle.js';
import { RoundedRectangle } from './shapes/rounded-rectangle.js';
import { Star } from './shapes/star.js';
import { Text } from './text.js';
import { Element } from './element.js';

// Constants

Expand Down
2 changes: 1 addition & 1 deletion src/text.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { LinearGradient } from './effects/linear-gradient.js';
import { RadialGradient } from './effects/radial-gradient.js';
import { Texture } from './effects/texture.js';
import { root } from './utils/root.js';
import { getEffectFromObject } from 'utils/shape.js';
import { getEffectFromObject } from './utils/shape.js';

let canvas;
const min = Math.min,
Expand Down
8 changes: 4 additions & 4 deletions src/utils/shape.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Texture } from 'effects/texture.js';
import { Texture } from '../effects/texture.js';
import { subdivide, getCurveLength as gcl } from './curves.js';
import { Gradient } from 'effects/gradient.js';
import { LinearGradient } from 'effects/linear-gradient.js';
import { RadialGradient } from 'effects/radial-gradient.js';
import { Gradient } from '../effects/gradient.js';
import { LinearGradient } from '../effects/linear-gradient.js';
import { RadialGradient } from '../effects/radial-gradient.js';

/**
* @private
Expand Down

0 comments on commit 51889b6

Please sign in to comment.