Skip to content

Commit fcda6bb

Browse files
authored
Merge pull request #1674 from adumesny/master
develp -> master branch rename
2 parents e094ff9 + f1004f2 commit fcda6bb

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ GridStack no longer requires external dependencies as of v1.0.0 (lodash was remo
145145

146146
## API Documentation
147147

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

150150

151151
## Extend Library
@@ -232,7 +232,7 @@ Better yet, here is a SASS code snippet which can make life much easier (Thanks
232232
}
233233
```
234234

235-
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
235+
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
236236
and also have the `.grid-stack-N` prefix to support letting the user change columns dynamically.
237237

238238
Sample gulp command for 30 columns:
@@ -286,13 +286,13 @@ search for ['gridstack' under NPM](https://www.npmjs.com/search?q=gridstack&rank
286286
- **Ember**: [ember-gridstack](https://github.com/yahoo/ember-gridstack)
287287
- **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.
288288
- **Rails**: [gridstack-js-rails](https://github.com/randoum/gridstack-js-rails)
289-
- **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)
290-
- **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)
289+
- **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)
290+
- **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)
291291

292292
# Migrating
293293
## Migrating to v0.6
294294

295-
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.
295+
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.
296296

297297
## Migrating to v1
298298

@@ -425,7 +425,7 @@ As for events, you can still use `$(".grid-stack").on(...)` for the version that
425425
426426
# Changes
427427
428-
View our change log [here](https://github.com/gridstack/gridstack.js/tree/develop/doc/CHANGES.md).
428+
View our change log [here](https://github.com/gridstack/gridstack.js/tree/master/doc/CHANGES.md).
429429
430430
431431
# The Team

demo/react-hooks.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h1>Using GridStack.js with React hooks</h1>
2525
<ol>
2626
<li>Render items, each with a reference</li>
2727
<li>Convert each rendered item to a widget using the reference and the <a
28-
href="https://github.com/gridstack/gridstack.js/tree/develop/doc#makewidgetel">
28+
href="https://github.com/gridstack/gridstack.js/tree/master/doc#makewidgetel">
2929
makeWidget</a> function</li>
3030
</ol>
3131
</div>

demo/react.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ <h1>How to integrate GridStack.js with React.js</h1>
8484
<p>
8585
If your app requires more complex render logic than the inline
8686
template in `addWidget`, consider&nbsp;
87-
<a href="https://github.com/gridstack/gridstack.js/tree/develop/doc#makewidgetel">
87+
<a href="https://github.com/gridstack/gridstack.js/tree/master/doc#makewidgetel">
8888
makeWidget
8989
</a>
9090
&nbsp;to let React deal with DOM rendering.

demo/vue2js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1>How to integrate GridStack.js with Vue.js</h1>
2020
If your app requires more complex render logic than the inline template
2121
in `addWidget`, consider
2222
<a
23-
href="https://github.com/gridstack/gridstack.js/tree/develop/doc#makewidgetel"
23+
href="https://github.com/gridstack/gridstack.js/tree/master/doc#makewidgetel"
2424
>makeWidget</a
2525
>
2626
to let Vue deal with DOM rendering.

demo/vue3js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1>How to integrate GridStack.js with Vue.js</h1>
2020
If your app requires more complex render logic than the inline template
2121
in `addWidget`, consider
2222
<a
23-
href="https://github.com/gridstack/gridstack.js/tree/develop/doc#makewidgetel"
23+
href="https://github.com/gridstack/gridstack.js/tree/master/doc#makewidgetel"
2424
>makeWidget</a
2525
>
2626
to let Vue deal with DOM rendering.

doc/CHANGES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ HTML5 version will require re-write to plain `mousemove` & mobile `touchmove` in
125125
## 3.1.0 (2020-12-4)
126126

127127
- 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.
128-
see [nested.html](https://github.com/gridstack/gridstack.js/blob/develop/demo/nested.html) demo.
128+
see [nested.html](https://github.com/gridstack/gridstack.js/tree/master/demo/nested.html) demo.
129129
- `save()` will now work on nested grids, recursively saving info. added flag to also allow saving the current grid options + children
130130
(needed for nested grids) so you can now call new `adddGrid()` to re-create everything from JSON.
131131
- 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)
@@ -227,7 +227,7 @@ You can now have perfect square cells (default) [723](https://github.com/gridsta
227227
## v1.0.0 (2020-02-23)
228228

229229
- **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.
230-
See [Migrating to v1.0.0](https://github.com/gridstack/gridstack.js/blob/develop/README.md#migrating-to-v100)
230+
See [Migrating to v1.0.0](https://github.com/gridstack/gridstack.js/tree/master/README.md#migrating-to-v100)
231231
- `setColumn(N)` is now `column(N)` (matches other set/get methods) and `getColumn()` to get current column number
232232
- add `grid.on(eventName, callback)` / `grid.off(eventName)` to hide native JQ events mix
233233
- add `grid.getRow()` to get the current grid row number

doc/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ grids.forEach(...)
309309
* 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.
310310
* @param parent HTML element parent to the grid
311311
* @param opt grids options used to initialize the grid, and list of children
312-
* see [nested.html](https://github.com/gridstack/gridstack.js/blob/develop/demo/nested.html) demo
312+
* see [nested.html](https://github.com/gridstack/gridstack.js/tree/master/demo/nested.html) demo
313313

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

src/gridstack.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* https://gridstackjs.com/
44
*
55
* Copyright (c) 2021 Alain Dumesny
6-
* see root license https://github.com/gridstack/gridstack.js/blob/develop/LICENSE
6+
* see root license https://github.com/gridstack/gridstack.js/tree/master/LICENSE
77
*/
88

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

0 commit comments

Comments
 (0)