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
10 changes: 0 additions & 10 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ module.exports = function(grunt) {
dist: {
files: {
'dist/gridstack-poly.js': ['src/gridstack-poly.js'],
//'dist/jq/jquery.js': ['src/jq/jquery.js'],
//'dist/jq/jquery-ui.js': ['src/jq/jquery-ui.js'],
'dist/src/gridstack.scss': ['src/gridstack.scss'],
'dist/src/gridstack-extra.scss': ['src/gridstack-extra.scss'],
}
Expand All @@ -58,14 +56,6 @@ module.exports = function(grunt) {
files: {
'dist/jq/jquery.js': 'src/jq/jquery.js',
'dist/jq/jquery-ui.js': 'src/jq/jquery-ui.js',
/*
'dist/jq/gridstack-dd-jqueryui.min.js': 'dist/jq/gridstack-dd-jqueryui.js',
'dist/gridstack-dd.min.js': 'dist/gridstack-dd.js',
'dist/gridstack-engine.min.js': 'dist/gridstack-engine.js',
'dist/gridstack-poly.min.js': 'src/gridstack-poly.js',
'dist/types.min.js': 'dist/types.js',
'dist/utils.min.js': 'dist/utils.js',
*/
}
}
},
Expand Down
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ alternatively in html

```html
<link href="node_modules/gridstack/dist/gridstack.min.css" rel="stylesheet"/>
<script src="node_modules/gridstack/dist/gridstack.all.js"></script>
<script src="node_modules/gridstack/dist/gridstack-h5.js"></script>
```

## Basic usage
Expand Down Expand Up @@ -127,7 +127,7 @@ see [jsfiddle sample](https://jsfiddle.net/adumesny/jqhkry7g) as running example

## Requirements

GridStack no longer requires external dependencies as of v1.0.0 (lodash was removed in v0.5.0 and jquery API in v1.0.0). All you need to include is `gridstack.all.js` and `gridstack.min.css` (layouts are done using CSS column based %).
GridStack no longer requires external dependencies as of v1.0.0 (lodash was removed in v0.5.0 and jquery API in v1.0.0). All you need to include is `gridstack-h5.js` and `gridstack.min.css` (layouts are done using CSS column based %).

## API Documentation

Expand Down Expand Up @@ -262,7 +262,7 @@ Please use [jQuery UI Touch Punch](https://github.com/furf/jquery-ui-touch-punch
working on touch-based devices.

```html
<script src="gridstack.all.js"></script>
<script src="gridstack-jq.js"></script>
<script src="jquery.ui.touch-punch.min.js"></script>
```

Expand Down Expand Up @@ -358,12 +358,11 @@ v2.x is a Typescript rewrite of 1.x, removing all jquery events, using classes a

# jQuery Application

We're working on implementing HTML5 drag'n'drop through the plugin system. Right now it is still jquery-ui based. Because of that we are still bundling `jquery` (3.5.1) + `jquery-ui` (1.12.1 minimal drag|drop|resize) internally in `gridstack.all.js`. IFF your app needs to bring your own version instead, you should **instead** include `gridstack-poly.min.js` (optional IE support) + `gridstack.min.js` + `gridstack.jQueryUI.min.js` after you import your JQ libs. But note that there are issue with jQuery and ES6 import (see [1306](https://github.com/gridstack/gridstack.js/issues/1306)).
We now have a native HTML5 drag'n'drop through the plugin system (default), but the jquery-ui version can be used instead. It will bundle `jquery` (3.5.1) + `jquery-ui` (1.12.1 minimal drag|drop|resize) in `gridstack-jq.js`. IFF your app needs to bring your own version instead, you should **instead** include `gridstack-poly.min.js` (optional IE support) + `gridstack.min.js` + `gridstack.jQueryUI.min.js` after you import your JQ libs. But note that there are issue with jQuery and ES6 import (see [1306](https://github.com/gridstack/gridstack.js/issues/1306)).

Note: v2.0.0 does not currently support importing GridStack Drag&Drop without also including our jquery + jqueryui. Still trying to figure how to make that bundle possible. You will have to use 1.x

As for events, you can still use `$(".grid-stack").on(...)` while jqueryui is used internally for things we don't support, but recommended you don't as that will get dropped at some point.
NOTE: v2.x / v3.0.0 does not currently support importing GridStack Drag&Drop without also including our jquery + jquery-ui. Still trying to figure how to make that bundle possible. You will have to use 1.x for now...

As for events, you can still use `$(".grid-stack").on(...)` for the version that uses jquery-ui for things we don't support.

# Changes

Expand Down
96 changes: 0 additions & 96 deletions demo/advance-h5.html

This file was deleted.

2 changes: 1 addition & 1 deletion demo/advance.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<script type="module" src="https://unpkg.com/ionicons@4.5.10-0/dist/ionicons/ionicons.esm.js"></script>
<script nomodule="" src="https://unpkg.com/ionicons@4.5.10-0/dist/ionicons/ionicons.js"></script>

<script src="../dist/gridstack.all.js"></script>
<script src="../dist/gridstack-h5.js"></script>

<style type="text/css">
.grid-stack-item-removing {
Expand Down
2 changes: 1 addition & 1 deletion demo/anijs.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" href="https://anijs.github.io/lib/anicollection/anicollection.css" />
<link rel="stylesheet" href="demo.css"/>

<script src="../dist/gridstack.all.js"></script>
<script src="../dist/gridstack-h5.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/AniJS/0.9.3/anijs.js"></script>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion demo/column.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<link rel="stylesheet" href="demo.css"/>
<link rel="stylesheet" href="../dist/gridstack-extra.css"/>
<script src="../dist/gridstack.all.js"></script>
<script src="../dist/gridstack-h5.js"></script>
</head>
<body>
<div class="container-fluid">
Expand Down
86 changes: 0 additions & 86 deletions demo/experiment/test.html

This file was deleted.

37 changes: 0 additions & 37 deletions demo/experiment/test2.html

This file was deleted.

2 changes: 1 addition & 1 deletion demo/float.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>Float grid demo</title>

<link rel="stylesheet" href="demo.css"/>
<script src="../dist/gridstack.all.js"></script>
<script src="../dist/gridstack-h5.js"></script>

</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion demo/knockout.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" href="demo.css"/>

<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.5.0/knockout-debug.js"></script>
<script src="../dist/gridstack.all.js"></script>
<script src="../dist/gridstack-h5.js"></script>
</head>
<body>
<div class="container-fluid">
Expand Down
2 changes: 1 addition & 1 deletion demo/locked.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>Locked demo</title>

<link rel="stylesheet" href="demo.css"/>
<script src="../dist/gridstack.all.js"></script>
<script src="../dist/gridstack-h5.js"></script>
</style>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion demo/nested.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>Nested grids demo</title>

<link rel="stylesheet" href="demo.css"/>
<script src="../dist/gridstack.all.js"></script>
<script src="../dist/gridstack-h5.js"></script>
<style type="text/css">
.grid-stack .grid-stack {
/*margin: 0 -10px;*/
Expand Down
2 changes: 1 addition & 1 deletion demo/responsive.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<link rel="stylesheet" href="demo.css"/>
<link rel="stylesheet" href="../dist/gridstack-extra.css"/>
<script src="../dist/gridstack.all.js"></script>
<script src="../dist/gridstack-h5.js"></script>
</head>
<body>
<div>
Expand Down
2 changes: 1 addition & 1 deletion demo/right-to-left(rtl).html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</style>

<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.5.0/knockout-min.js"></script>
<script src="../dist/gridstack.all.js"></script>
<script src="../dist/gridstack-h5.js"></script>
</head>
<body>
<div class="container-fluid">
Expand Down
2 changes: 1 addition & 1 deletion demo/serialization.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>Serialization demo</title>

<link rel="stylesheet" href="demo.css"/>
<script src="../dist/gridstack.all.js"></script>
<script src="../dist/gridstack-h5.js"></script>
</head>
<body>
<div class="container-fluid">
Expand Down
2 changes: 1 addition & 1 deletion demo/static.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>Static Grid</title>

<link rel="stylesheet" href="demo.css"/>
<script src="../dist/gridstack.all.js"></script>
<script src="../dist/gridstack-h5.js"></script>

</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion demo/two-h5.html → demo/two-jq.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<link rel="stylesheet" href="demo.css"/>
<link rel="stylesheet" href="../dist/gridstack-extra.css"/>

<script src="../dist/gridstack.h5.js"></script>
<script src="../dist/gridstack-jq.js"></script>

<style type="text/css">
.grid-stack-item-removing {
Expand Down
Loading