Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ GridStack no longer requires external dependencies as of v1.0.0 (lodash was remo

## API Documentation

Documentation can be found [here](https://github.com/gridstack/gridstack.js/tree/develop/doc).
Documentation can be found [here](https://github.com/gridstack/gridstack.js/tree/master/doc).


## Extend Library
Expand Down Expand Up @@ -232,7 +232,7 @@ Better yet, here is a SASS code snippet which can make life much easier (Thanks
}
```

you can also use the SASS [src/gridstack-extra.scss](https://github.com/gridstack/gridstack.js/blob/develop/src/gridstack-extra.scss) included in NPM package and modify to add more columns
you can also use the SASS [src/gridstack-extra.scss](https://github.com/gridstack/gridstack.js/tree/master/src/gridstack-extra.scss) included in NPM package and modify to add more columns
and also have the `.grid-stack-N` prefix to support letting the user change columns dynamically.

Sample gulp command for 30 columns:
Expand Down Expand Up @@ -286,13 +286,13 @@ search for ['gridstack' under NPM](https://www.npmjs.com/search?q=gridstack&rank
- **Ember**: [ember-gridstack](https://github.com/yahoo/ember-gridstack)
- **knockout**: see [demo](https://gridstackjs.com/demo/knockout.html) using component, but check [custom bindings ticket](https://github.com/gridstack/gridstack.js/issues/465) which is likely better approach.
- **Rails**: [gridstack-js-rails](https://github.com/randoum/gridstack-js-rails)
- **React**: see [demo](https://gridstackjs.com/demo/react.html) with [src](https://github.com/gridstack/gridstack.js/blob/develop/demo/react.html), or [react-gridstack-example](https://github.com/Inder2108/react-gridstack-example/blob/master/src/App.js), or read on what [hooks to use](https://github.com/gridstack/gridstack.js/issues/735#issuecomment-329888796)
- **Vue**: see [demo](https://gridstackjs.com/demo/vue3js.html) with [v3 src](https://github.com/gridstack/gridstack.js/blob/develop/demo/vue3js.html) or [v2 src](https://github.com/gridstack/gridstack.js/blob/develop/demo/vue2js.html)
- **React**: see [demo](https://gridstackjs.com/demo/react.html) with [src](https://github.com/gridstack/gridstack.js/tree/master/demo/react.html), or [react-gridstack-example](https://github.com/Inder2108/react-gridstack-example/tree/master/src/App.js), or read on what [hooks to use](https://github.com/gridstack/gridstack.js/issues/735#issuecomment-329888796)
- **Vue**: see [demo](https://gridstackjs.com/demo/vue3js.html) with [v3 src](https://github.com/gridstack/gridstack.js/tree/master/demo/vue3js.html) or [v2 src](https://github.com/gridstack/gridstack.js/tree/master/demo/vue2js.html)

# Migrating
## Migrating to v0.6

starting in 0.6.x `change` event are no longer sent (for pretty much most nodes!) when an item is just added/deleted unless it also changes other nodes (was incorrect and causing inefficiencies). You may need to track `added|removed` [events](https://github.com/gridstack/gridstack.js/tree/develop/doc#events) if you didn't and relied on the old broken behavior.
starting in 0.6.x `change` event are no longer sent (for pretty much most nodes!) when an item is just added/deleted unless it also changes other nodes (was incorrect and causing inefficiencies). You may need to track `added|removed` [events](https://github.com/gridstack/gridstack.js/tree/master/doc#events) if you didn't and relied on the old broken behavior.

## Migrating to v1

Expand Down Expand Up @@ -425,7 +425,7 @@ As for events, you can still use `$(".grid-stack").on(...)` for the version that

# Changes

View our change log [here](https://github.com/gridstack/gridstack.js/tree/develop/doc/CHANGES.md).
View our change log [here](https://github.com/gridstack/gridstack.js/tree/master/doc/CHANGES.md).


# The Team
Expand Down
2 changes: 1 addition & 1 deletion demo/react-hooks.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h1>Using GridStack.js with React hooks</h1>
<ol>
<li>Render items, each with a reference</li>
<li>Convert each rendered item to a widget using the reference and the <a
href="https://github.com/gridstack/gridstack.js/tree/develop/doc#makewidgetel">
href="https://github.com/gridstack/gridstack.js/tree/master/doc#makewidgetel">
makeWidget</a> function</li>
</ol>
</div>
Expand Down
2 changes: 1 addition & 1 deletion demo/react.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ <h1>How to integrate GridStack.js with React.js</h1>
<p>
If your app requires more complex render logic than the inline
template in `addWidget`, consider&nbsp;
<a href="https://github.com/gridstack/gridstack.js/tree/develop/doc#makewidgetel">
<a href="https://github.com/gridstack/gridstack.js/tree/master/doc#makewidgetel">
makeWidget
</a>
&nbsp;to let React deal with DOM rendering.
Expand Down
2 changes: 1 addition & 1 deletion demo/vue2js.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1>How to integrate GridStack.js with Vue.js</h1>
If your app requires more complex render logic than the inline template
in `addWidget`, consider
<a
href="https://github.com/gridstack/gridstack.js/tree/develop/doc#makewidgetel"
href="https://github.com/gridstack/gridstack.js/tree/master/doc#makewidgetel"
>makeWidget</a
>
to let Vue deal with DOM rendering.
Expand Down
2 changes: 1 addition & 1 deletion demo/vue3js.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1>How to integrate GridStack.js with Vue.js</h1>
If your app requires more complex render logic than the inline template
in `addWidget`, consider
<a
href="https://github.com/gridstack/gridstack.js/tree/develop/doc#makewidgetel"
href="https://github.com/gridstack/gridstack.js/tree/master/doc#makewidgetel"
>makeWidget</a
>
to let Vue deal with DOM rendering.
Expand Down
4 changes: 2 additions & 2 deletions doc/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ HTML5 version will require re-write to plain `mousemove` & mobile `touchmove` in
## 3.1.0 (2020-12-4)

- add new `addGrid(parent, opts)` to create a grid and load children instead of `init() + load()`, which is used by `load()` to supports nested grids creation.
see [nested.html](https://github.com/gridstack/gridstack.js/blob/develop/demo/nested.html) demo.
see [nested.html](https://github.com/gridstack/gridstack.js/tree/master/demo/nested.html) demo.
- `save()` will now work on nested grids, recursively saving info. added flag to also allow saving the current grid options + children
(needed for nested grids) so you can now call new `adddGrid()` to re-create everything from JSON.
- fix [1505](https://github.com/gridstack/gridstack.js/issues/1505) don't call `movable()`/`resizable()` on locked items error. thanks [@infime](https://github.com/infime)
Expand Down Expand Up @@ -227,7 +227,7 @@ You can now have perfect square cells (default) [723](https://github.com/gridsta
## v1.0.0 (2020-02-23)

- **breaking**: [(1084)](https://github.com/gridstack/gridstack.js/issues/1084) jquery was removed from the API and dependencies (initialize differently, and methods take/return `GridStack` or `HTMLElement` instead of `JQuery`), so your code will need to change.
See [Migrating to v1.0.0](https://github.com/gridstack/gridstack.js/blob/develop/README.md#migrating-to-v100)
See [Migrating to v1.0.0](https://github.com/gridstack/gridstack.js/tree/master/README.md#migrating-to-v100)
- `setColumn(N)` is now `column(N)` (matches other set/get methods) and `getColumn()` to get current column number
- add `grid.on(eventName, callback)` / `grid.off(eventName)` to hide native JQ events mix
- add `grid.getRow()` to get the current grid row number
Expand Down
2 changes: 1 addition & 1 deletion doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ grids.forEach(...)
* call to create a grid with the given options, including loading any children from JSON structure. This will call `GridStack.init()`, then `grid.load()` on any passed children (recursively). Great alternative to calling `init()` if you want entire grid to come from JSON serialized data, including options.
* @param parent HTML element parent to the grid
* @param opt grids options used to initialize the grid, and list of children
* see [nested.html](https://github.com/gridstack/gridstack.js/blob/develop/demo/nested.html) demo
* see [nested.html](https://github.com/gridstack/gridstack.js/tree/master/demo/nested.html) demo

### `setupDragIn(dragIn?: string, dragInOptions?: DDDragInOpt)`

Expand Down
2 changes: 1 addition & 1 deletion src/gridstack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* https://gridstackjs.com/
*
* Copyright (c) 2021 Alain Dumesny
* see root license https://github.com/gridstack/gridstack.js/blob/develop/LICENSE
* see root license https://github.com/gridstack/gridstack.js/tree/master/LICENSE
*/

import { GridStackEngine } from './gridstack-engine';
Expand Down