Skip to content

Commit

Permalink
Merge pull request #50 from geospoc/fix/update-code-to-adhere-to-vue-…
Browse files Browse the repository at this point in the history 
…lint-standards
  • Loading branch information
@vinayakkulkarni
vinayakkulkarni committed Nov 6, 2020
2 parents 76d8653 + 8622d9c commit 3239786
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 59 deletions.
61 changes: 49 additions & 12 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"babel-preset-vue": "^2.0.2",
"eslint-config-vue": "^2.0.2",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-vue": "^6.2.2",
"eslint-plugin-vue": "^7.1.0",
"husky": "^4.3.0",
"jsdom": "^16.4.0",
"jsdom-global": "^3.0.2",
Expand Down
30 changes: 15 additions & 15 deletions src/components/GridItem.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,26 +373,26 @@
const setColNum = (colNum) => {
cols.value = parseInt(colNum);
};
eventBus.$on('updateWidth', updateWidthHandler);
eventBus.$on('update-width', updateWidthHandler);
eventBus.$on('compact', compactHandler);
eventBus.$on('setDraggable', setDraggableHandler);
eventBus.$on('setResizable', setResizableHandler);
eventBus.$on('setRowHeight', setRowHeightHandler);
eventBus.$on('setMaxRows', setMaxRowsHandler);
eventBus.$on('set-draggable', setDraggableHandler);
eventBus.$on('set-resizable', setResizableHandler);
eventBus.$on('set-row-height', setRowHeightHandler);
eventBus.$on('set-max-rows', setMaxRowsHandler);
eventBus.$on('directionchange', directionchangeHandler);
eventBus.$on('setColNum', setColNum);
eventBus.$on('set-col-num', setColNum);
rtl.value = getDocumentDir() === 'rtl';
// before unmount
onBeforeUnmount(() => {
//Remove listeners
eventBus.$off('updateWidth', updateWidthHandler);
eventBus.$off('update-width', updateWidthHandler);
eventBus.$off('compact', compactHandler);
eventBus.$off('setDraggable', setDraggableHandler);
eventBus.$off('setResizable', setResizableHandler);
eventBus.$off('setRowHeight', setRowHeightHandler);
eventBus.$off('setMaxRows', setMaxRowsHandler);
eventBus.$off('set-draggable', setDraggableHandler);
eventBus.$off('set-resizable', setResizableHandler);
eventBus.$off('set-row-height', setRowHeightHandler);
eventBus.$off('set-max-rows', setMaxRowsHandler);
eventBus.$off('directionchange', directionchangeHandler);
eventBus.$off('setColNum', setColNum);
eventBus.$off('set-col-num', setColNum);
if (interactObj) {
interactObj.unset(); // destroy interact intance
}
Expand Down Expand Up @@ -575,7 +575,7 @@
emit('resized', props.i, pos.h, pos.w, newSize.height, newSize.width);
}
eventBus.$emit(
'resizeEvent',
'resize-event',
event.type,
props.i,
innerX.value,
Expand Down Expand Up @@ -662,7 +662,7 @@
emit('moved', props.i, pos.x, pos.y);
}
eventBus.$emit(
'dragEvent',
'drag-event',
event.type,
props.i,
pos.x,
Expand Down Expand Up @@ -873,7 +873,7 @@
if (previousW.value !== pos.w || previousH.value !== pos.h) {
emit('resized', props.i, pos.h, pos.w, newSize.height, newSize.width);
eventBus.$emit(
'resizeEvent',
'resize-event',
'resizeend',
props.i,
innerX.value,
Expand Down
33 changes: 17 additions & 16 deletions src/components/GridLayout.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
() => width.value,
(width, oldWidth) => {
root.$nextTick(() => {
eventBus.$emit('updateWidth', width);
eventBus.$emit('update-width', width);
if (oldWidth === null) {
/*
If oldval == null is when the width has never been
Expand Down Expand Up @@ -193,28 +193,28 @@
watch(
() => props.colNum,
(colNum, oldColNum) => {
eventBus.$emit('setColNum', colNum);
eventBus.$emit('set-col-num', colNum);
},
);
// rowHeight
watch(
() => props.rowHeight,
(rowHeight, oldrowHeight) => {
eventBus.$emit('setRowHeight', rowHeight);
eventBus.$emit('set-row-height', rowHeight);
},
);
// isDraggable
watch(
() => props.isDraggable,
(isDraggable, oldIsDraggable) => {
eventBus.$emit('setDraggable', isDraggable);
eventBus.$emit('set-draggable', isDraggable);
},
);
// isResizable
watch(
() => props.isResizable,
(isResizable, oldIsResizable) => {
eventBus.$emit('setResizable', isResizable);
eventBus.$emit('set-resizable', isResizable);
},
);
// responsive
Expand All @@ -223,7 +223,7 @@
(responsive, oldResponsive) => {
if (!responsive) {
emit('update:layout', originalLayout);
eventBus.$emit('setColNum', props.colNum);
eventBus.$emit('set-col-num', props.colNum);
}
onWindowResize();
},
Expand All @@ -232,7 +232,7 @@
watch(
() => props.maxRows,
(maxRows, oldMaxRows) => {
eventBus.$emit('setMaxRows', maxRows);
eventBus.$emit('set-max-rows', maxRows);
},
);
// margin
Expand All @@ -249,8 +249,8 @@
const dragEventHandler = (eventType, i, x, y, h, w) => {
dragEvent(eventType, i, x, y, h, w);
};
eventBus.$on('resizeEvent', resizeEventHandler);
eventBus.$on('dragEvent', dragEventHandler);
eventBus.$on('resize-event', resizeEventHandler);
eventBus.$on('drag-event', dragEventHandler);
emit('layout-created', props.layout);
onBeforeMount(() => {
Expand Down Expand Up @@ -286,8 +286,8 @@
});
onBeforeUnmount(() => {
//Remove listeners
eventBus.$off('resizeEvent', resizeEventHandler);
eventBus.$off('dragEvent', dragEventHandler);
eventBus.$off('resize-event', resizeEventHandler);
eventBus.$off('drag-event', dragEventHandler);
eventBus.$destroy();
removeWindowEventListener('resize', onWindowResize);
if (erd) {
Expand Down Expand Up @@ -316,7 +316,7 @@
}
compact(props.layout, props.verticalCompact);
eventBus.$emit('updateWidth', width.value);
eventBus.$emit('update-width', width.value);
updateHeight();
emit('layout-updated', props.layout);
Expand All @@ -331,7 +331,7 @@
if (gridLayout.value !== null && gridLayout.value !== undefined) {
width.value = gridLayout.value.offsetWidth;
}
eventBus.$emit('resizeEvent');
eventBus.$emit('resize-event');
}
function containerHeight() {
if (!props.autoSize) return;
Expand All @@ -357,14 +357,15 @@
root.$nextTick(() => {
isDragging.value = true;
});
eventBus.$emit('updateWidth', width.value);
eventBus.$emit('update-width', width.value);
} else {
root.$nextTick(() => {
isDragging.value = false;
});
}
// Move the element to the dragged location.
// eslint-disable-next-line vue/no-mutating-props
props.layout = moveElement(
props.layout,
l,
Expand Down Expand Up @@ -427,7 +428,7 @@
root.$nextTick(() => {
isDragging.value = true;
});
eventBus.$emit('updateWidth', width.value);
eventBus.$emit('update-width', width.value);
} else {
root.$nextTick(() => {
isDragging.value = false;
Expand Down Expand Up @@ -476,7 +477,7 @@
lastBreakpoint.value = newBreakpoint;
eventBus.$emit(
'setColNum',
'set-col-num',
getColsFromBreakpoint(newBreakpoint, props.cols),
);
}
Expand Down

0 comments on commit 3239786

Please sign in to comment.