snuffster/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client/notes: don't rely on class names

Browse source 
The state names, used by CSS, were being broken by the minifier.
This commit is contained in:
rr- 2017-02-26 18:47:53 +01:00
parent 87b3572ce5
commit e087b83082
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
client/js/controls/post_notes_overlay_control.js
View file

@ -72,10 +72,8 @@ function _getNoteSize(note) {
} }
class State { class State {
constructor(control) { constructor(control, stateName) {
this._control = control; this._control = control;
const stateName = misc.decamelize(
this.constructor.name.replace(/State/, ''));
_setNodeState(control._hostNode, stateName); _setNodeState(control._hostNode, stateName);
_setNodeState(control._textNode, stateName); _setNodeState(control._textNode, stateName);
} }
@ -132,7 +130,7 @@ class State {
class ReadOnlyState extends State { class ReadOnlyState extends State {
constructor(control) { constructor(control) {
super(control); super(control, 'read-only');
if (_clearEditedNote(control._hostNode)) { if (_clearEditedNote(control._hostNode)) {
this._control.dispatchEvent(new CustomEvent('blur')); this._control.dispatchEvent(new CustomEvent('blur'));
} }
@ -146,7 +144,7 @@ class ReadOnlyState extends State {
class PassiveState extends State { class PassiveState extends State {
constructor(control) { constructor(control) {
super(control); super(control, 'passive');
if (_clearEditedNote(control._hostNode)) { if (_clearEditedNote(control._hostNode)) {
this._control.dispatchEvent(new CustomEvent('blur')); this._control.dispatchEvent(new CustomEvent('blur'));
} }
@ -163,13 +161,13 @@ class PassiveState extends State {
} }
class ActiveState extends State { class ActiveState extends State {
constructor(control, note) { constructor(control, note, stateName) {
super(control); super(control, stateName);
if (_clearEditedNote(control._hostNode)) { if (_clearEditedNote(control._hostNode)) {
this._control.dispatchEvent(new CustomEvent('blur')); this._control.dispatchEvent(new CustomEvent('blur'));
} }
keyboard.pause(); keyboard.pause();
if (note !== undefined) { if (note !== null) {
this._note = note; this._note = note;
this._control.dispatchEvent( this._control.dispatchEvent(
new CustomEvent('focus', { new CustomEvent('focus', {
@ -182,7 +180,7 @@ class ActiveState extends State {
class SelectedState extends ActiveState { class SelectedState extends ActiveState {
constructor(control, note) { constructor(control, note) {
super(control, note); super(control, note, 'selected');
this._clickTimeout = null; this._clickTimeout = null;
this._control._hideNoteText(); this._control._hideNoteText();
} }
@ -299,7 +297,7 @@ class SelectedState extends ActiveState {
class MovingPointState extends ActiveState { class MovingPointState extends ActiveState {
constructor(control, note, notePoint, mousePoint) { constructor(control, note, notePoint, mousePoint) {
super(control, note); super(control, note, 'moving-point');
this._notePoint = notePoint; this._notePoint = notePoint;
this._originalNotePoint = {x: notePoint.x, y: notePoint.y}; this._originalNotePoint = {x: notePoint.x, y: notePoint.y};
this._originalPosition = mousePoint; this._originalPosition = mousePoint;
@ -328,7 +326,7 @@ class MovingPointState extends ActiveState {
class MovingNoteState extends ActiveState { class MovingNoteState extends ActiveState {
constructor(control, note, mousePoint) { constructor(control, note, mousePoint) {
super(control, note); super(control, note, 'moving-note');
this._originalPolygon = [...note.polygon].map( this._originalPolygon = [...note.polygon].map(
point => ({x: point.x, y: point.y})); point => ({x: point.x, y: point.y}));
this._originalPosition = mousePoint; this._originalPosition = mousePoint;
@ -360,7 +358,7 @@ class MovingNoteState extends ActiveState {
class ScalingNoteState extends ActiveState { class ScalingNoteState extends ActiveState {
constructor(control, note, mousePoint) { constructor(control, note, mousePoint) {
super(control, note); super(control, note, 'scaling-note');
this._originalPolygon = [...note.polygon].map( this._originalPolygon = [...note.polygon].map(
point => ({x: point.x, y: point.y})); point => ({x: point.x, y: point.y}));
this._originalMousePoint = mousePoint; this._originalMousePoint = mousePoint;
@ -402,7 +400,7 @@ class ScalingNoteState extends ActiveState {
class ReadyToDrawState extends ActiveState { class ReadyToDrawState extends ActiveState {
constructor(control) { constructor(control) {
super(control); super(control, null, 'ready-to-draw');
} }
evtNoteMouseDown(e, hoveredNote) { evtNoteMouseDown(e, hoveredNote) {
@ -423,7 +421,7 @@ class ReadyToDrawState extends ActiveState {
class DrawingRectangleState extends ActiveState { class DrawingRectangleState extends ActiveState {
constructor(control, mousePoint) { constructor(control, mousePoint) {
super(control); super(control, null, 'drawing-rectangle');
this._note = this._createNote(); this._note = this._createNote();
this._note.polygon.add(new Point(mousePoint.x, mousePoint.y)); this._note.polygon.add(new Point(mousePoint.x, mousePoint.y));
this._note.polygon.add(new Point(mousePoint.x, mousePoint.y)); this._note.polygon.add(new Point(mousePoint.x, mousePoint.y));
@ -460,7 +458,7 @@ class DrawingRectangleState extends ActiveState {
class DrawingPolygonState extends ActiveState { class DrawingPolygonState extends ActiveState {
constructor(control, mousePoint) { constructor(control, mousePoint) {
super(control); super(control, null, 'drawing-polygon');
this._note = this._createNote(); this._note = this._createNote();
this._note.polygon.add(new Point(mousePoint.x, mousePoint.y)); this._note.polygon.add(new Point(mousePoint.x, mousePoint.y));
this._note.polygon.add(new Point(mousePoint.x, mousePoint.y)); this._note.polygon.add(new Point(mousePoint.x, mousePoint.y));