Skip to content

Commit

Permalink
Merge pull request #1671 from adumesny/develop
Browse files Browse the repository at this point in the history
v4.0.1
  • Loading branch information
adumesny authored Mar 20, 2021
2 parents b8997a5 + 5bba391 commit dc09cc4
Show file tree
Hide file tree
Showing 24 changed files with 107 additions and 48 deletions.
4 changes: 2 additions & 2 deletions doc/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Change log
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
**Table of Contents** *generated with [DocToc](http://doctoc.herokuapp.com/)*

- [4.0.0-dev](#400-dev)
- [4.0.1 (2021-3-20)](#401-2021-3-20)
- [4.0.0 (2021-3-19)](#400-2021-3-19)
- [3.3.0 (2021-2-2)](#330-2021-2-2)
- [3.2.0 (2021-1-25)](#320-2021-1-25)
Expand Down Expand Up @@ -49,7 +49,7 @@ Change log
- [v0.1.0 (2014-11-18)](#v010-2014-11-18)

<!-- END doctoc generated TOC please keep comment here to allow auto update -->
## 4.0.0-dev
## 4.0.1 (2021-3-20)

- fix [#1669](https://github.com/gridstack/gridstack.js/issues/1669) JQ resize broken
- fix [#1661](https://github.com/gridstack/gridstack.js/issues/1661) serialization of nested grid
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gridstack",
"version": "4.0.0-dev",
"version": "4.0.1",
"description": "TypeScript/JS lib for dashboard layout and creation, no external dependencies, with many wrappers (React, Angular, Vue, Ember, knockout...)",
"main": "./dist/gridstack.js",
"types": "./dist/gridstack.d.ts",
Expand Down Expand Up @@ -46,7 +46,7 @@
"Dylan Weiss <[email protected]> (https://dylandreams.com)",
"Alain Dumesny <[email protected]> (https://github.com/adumesny)"
],
"license": "MIT",
"license": "see GridStack root license",
"bugs": {
"url": "https://github.com/gridstack/gridstack.js/issues"
},
Expand Down
7 changes: 5 additions & 2 deletions src/gridstack-dd.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// gridstack-GridStackDD.get().ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
/**
* gridstack-dd.ts 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

/* eslint-disable @typescript-eslint/no-unused-vars */
import { GridStackDDI } from './gridstack-ddi';
import { GridItemHTMLElement, GridStackNode, GridStackElement, DDUIData, DDDragInOpt, GridStackPosition } from './types';
Expand Down
7 changes: 5 additions & 2 deletions src/gridstack-ddi.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// gridstack-ddi.ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
/**
* gridstack-ddi.ts 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

import { GridItemHTMLElement } from './types';

/**
Expand Down
8 changes: 5 additions & 3 deletions src/gridstack-engine.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
// gridstack-engine.ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
/**
* gridstack-engine.ts 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

import { Utils } from './utils';
import { GridStackNode, ColumnOptions, GridStackPosition, GridStackMoveOpts } from './types';

export type onChangeCB = (nodes: GridStackNode[], removeDOM?: boolean) => void;

/** options used for creations - similar to GridStackOptions */
export interface GridStackEngineOptions {
column?: number;
Expand Down
7 changes: 5 additions & 2 deletions src/gridstack-extra.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// (c) 2021 Alain Dumesny - see root license
// default to generate [2-11] columns as 1 (oneColumnMode) and 12 (default) are in the main css
/**
* default to generate [2-11] columns as 1 (oneColumnMode) and 12 (default) are in the main css
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

$gridstack-columns-start: 2 !default;
$gridstack-columns: 11 !default;

Expand Down
7 changes: 5 additions & 2 deletions src/gridstack-poly.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// gridstack-poly.js 2.0.0
// (c) 2021 Alain Dumesny - see root license
/**
* gridstack-poly.ts 4.0.1 - used for older browser support (not currently supported in v2+)
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

/* eslint-disable prefer-rest-params */
/* eslint-disable no-var */

Expand Down
6 changes: 5 additions & 1 deletion src/gridstack.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
// (c) 2021 Alain Dumesny - see root license
/**
* gridstack SASS styles 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

$gridstack-columns: 12 !default;
$animation_speed: .3s !default;

Expand Down
8 changes: 6 additions & 2 deletions src/gridstack.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
// gridstack.ts 4.0.0-dev
/*!
* (c) 2021 Alain Dumesny - see root license
* GridStack 4.0.1
* https://gridstackjs.com/
*
* Copyright (c) 2021 Alain Dumesny
* see root license https://github.com/gridstack/gridstack.js/blob/develop/LICENSE
*/

import { GridStackEngine } from './gridstack-engine';
import { Utils, HeightData } from './utils';
import { ColumnOptions, GridItemHTMLElement, GridStackElement, GridStackEventHandlerCallback,
Expand Down
7 changes: 5 additions & 2 deletions src/h5/dd-base-impl.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// dd-base-impl.ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
/**
* dd-base-impl.ts 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

export type EventCallback = (event: Event) => boolean|void;
export abstract class DDBaseImplement {
/** returns the enable state, but you have to call enable()/disable() to change (as other things need to happen) */
Expand Down
7 changes: 5 additions & 2 deletions src/h5/dd-draggable.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// dd-draggable.ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
/**
* dd-draggable.ts 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

import { DDManager } from './dd-manager';
import { DDUtils } from './dd-utils';
import { DDBaseImplement, HTMLElementExtendOpt } from './dd-base-impl';
Expand Down
7 changes: 5 additions & 2 deletions src/h5/dd-droppable.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// dd-droppable.ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
/**
* dd-droppable.ts 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

import { DDDraggable } from './dd-draggable';
import { DDManager } from './dd-manager';
import { DDBaseImplement, HTMLElementExtendOpt } from './dd-base-impl';
Expand Down
7 changes: 5 additions & 2 deletions src/h5/dd-element.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// dd-elements.ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
/**
* dd-elements.ts 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

import { DDResizable, DDResizableOpt } from './dd-resizable';
import { GridItemHTMLElement } from './../types';
import { DDDraggable, DDDraggableOpt } from './dd-draggable';
Expand Down
7 changes: 5 additions & 2 deletions src/h5/dd-manager.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// dd-manager.ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
/**
* dd-manager.ts 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

import { DDDraggable } from './dd-draggable';

export class DDManager {
Expand Down
7 changes: 5 additions & 2 deletions src/h5/dd-resizable-handle.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// dd-resizable-handle.ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
/**
* dd-resizable-handle.ts 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

export interface DDResizableHandleOpt {
start?: (event) => void;
move?: (event) => void;
Expand Down
7 changes: 5 additions & 2 deletions src/h5/dd-resizable.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// dd-resizable.ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
/**
* dd-resizable.ts 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

import { DDResizableHandle } from './dd-resizable-handle';
import { DDBaseImplement, HTMLElementExtendOpt } from './dd-base-impl';
import { DDUtils } from './dd-utils';
Expand Down
6 changes: 4 additions & 2 deletions src/h5/dd-utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// dd-utils.ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
/**
* dd-utils.ts 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/
export class DDUtils {

public static isEventSupportPassiveOption = ((() => {
Expand Down
7 changes: 5 additions & 2 deletions src/h5/gridstack-dd-native.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// gridstack-dd-native.ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
/**
* gridstack-dd-native.ts 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

import { DDManager } from './dd-manager';
import { DDElement, DDElementHost } from './dd-element';

Expand Down
7 changes: 5 additions & 2 deletions src/index-h5.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// index.html5.ts 4.0.0-dev - everything you need for a Grid that uses HTML5 native drag&drop (work in progress)
// (c) 2021 Alain Dumesny - see root license
/**
* index-h5.ts 4.0.1 - everything you need for a Grid that uses HTML5 native drag&drop
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

export * from './types';
export * from './utils';
export * from './gridstack-engine';
Expand Down
6 changes: 4 additions & 2 deletions src/index-jq.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// index.jq.ts 4.0.0-dev - everything you need for a Grid that uses Jquery-ui drag&drop (original, full feature)
// (c) 2021 Alain Dumesny - see root license
/**
* index-jq.ts 4.0.1 - everything you need for a Grid that uses Jquery-ui drag&drop (original, full feature)
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

export * from './types';
export * from './utils';
Expand Down
6 changes: 4 additions & 2 deletions src/index-static.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// index.static.ts 4.0.0-dev - everything you need for a static Grid (non draggable)
// (c) 2021 Alain Dumesny - see root license
/**
* index-static.ts 4.0.1 - much smaller, everything you need for a static Grid (non draggable, API driven)
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

export * from './types';
export * from './utils';
Expand Down
4 changes: 2 additions & 2 deletions src/jq/gridstack-dd-jqueryui.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// gridstack-dd-jqueryui.ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
// gridstack-dd-jqueryui.ts 4.0.1
// Copyright (c) 2021 Alain Dumesny - see root license
import { GridStackElement } from '../gridstack';
import { GridStackDD, DDOpts, DDKey, DDDropOpt, DDCallback, DDValue } from '../gridstack-dd';
import { GridItemHTMLElement, DDDragInOpt } from '../types';
Expand Down
6 changes: 4 additions & 2 deletions src/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// types.ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
/**
* types.ts 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

import { GridStack } from './gridstack';

Expand Down
6 changes: 4 additions & 2 deletions src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// utils.ts 4.0.0-dev
// (c) 2021 Alain Dumesny - see root license
/**
* utils.ts 4.0.1
* Copyright (c) 2021 Alain Dumesny - see GridStack root license
*/

import { GridStackElement, GridStackNode, GridStackOptions, numberOrString, GridStackPosition } from './types';

Expand Down

0 comments on commit dc09cc4

Please sign in to comment.