Skip to content

Commit 065d631

Browse files
adumesnyadumesny
committed
jquery-ui removal - using native only
* part of #1757 * deleted anything related to Jquery, jquery-ui for drag&drop as will support native only going forward * deleted the plugging option. * including gridstack.js will now use the native Drag&Drop out of the box (no longer need to include DD)
1 parent 7a2922c commit 065d631

File tree

92 files changed

+361
-15847
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+361
-15847
lines changed

‎.eslintignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
dist/*
22
demo/*
33
spec/*
4-
src/jq/*.js

‎Gruntfile.js

+14-17
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module.exports = function(grunt) {
22
grunt.loadNpmTasks('grunt-sass');
33
grunt.loadNpmTasks('grunt-contrib-cssmin');
44
grunt.loadNpmTasks('grunt-contrib-copy');
5-
grunt.loadNpmTasks('grunt-contrib-uglify');
5+
// grunt.loadNpmTasks('grunt-contrib-uglify');
66
grunt.loadNpmTasks('grunt-eslint');
77
grunt.loadNpmTasks('grunt-contrib-watch');
88
grunt.loadNpmTasks('grunt-protractor-runner');
@@ -45,21 +45,18 @@ module.exports = function(grunt) {
4545
}
4646
}
4747
},
48-
uglify: {
49-
options: {
50-
sourceMap: true,
51-
output: {
52-
comments: 'some'
53-
}
54-
},
55-
dist: {
56-
files: {
57-
'dist/jq/jquery.js': 'src/jq/jquery.js',
58-
'dist/jq/jquery-ui.js': 'src/jq/jquery-ui.js',
59-
'dist/jq/jquery.ui.touch-punch.js': 'src/jq/jquery.ui.touch-punch.js',
60-
}
61-
}
62-
},
48+
// uglify: {
49+
// options: {
50+
// sourceMap: true,
51+
// output: {
52+
// comments: 'some'
53+
// }
54+
// },
55+
// dist: {
56+
// files: {
57+
// }
58+
// }
59+
// },
6360
eslint: {
6461
target: ['*.js', 'src/*.js']
6562
},
@@ -107,6 +104,6 @@ module.exports = function(grunt) {
107104
});
108105

109106
grunt.registerTask('lint', ['eslint']);
110-
grunt.registerTask('default', ['sass', 'cssmin', /*'eslint',*/ 'copy', 'uglify']);
107+
grunt.registerTask('default', ['sass', 'cssmin', /*'eslint',*/ 'copy', /*'uglify'*/]);
111108
grunt.registerTask('e2e-test', ['connect', 'protractor_webdriver', 'protractor']);
112109
};

‎demo/angular-ngFor.ts

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import { Component, AfterViewInit, OnChanges, SimpleChanges, Input, ChangeDetectionStrategy } from '@angular/core';
55

66
import { GridStack, GridStackWidget } from 'gridstack';
7-
import 'gridstack/dist/h5/gridstack-dd-native';
87

98
@Component({
109
selector: 'app-angular-ng-for-test',

‎demo/angular.ts

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import { Component, OnInit } from '@angular/core';
55

66
import { GridStack, GridStackWidget } from 'gridstack';
7-
import 'gridstack/dist/h5/gridstack-dd-native';
87

98
@Component({
109
selector: 'app-angular-test',

‎demo/anijs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="stylesheet" href="https://anijs.github.io/lib/anicollection/anicollection.css" />
1010
<link rel="stylesheet" href="demo.css"/>
1111

12-
<script src="../dist/gridstack-h5.js"></script>
12+
<script src="../dist/gridstack-all.js"></script>
1313
<script src="https://cdnjs.cloudflare.com/ajax/libs/AniJS/0.9.3/anijs.js"></script>
1414
</head>
1515
<body>

‎demo/canvasJS.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>CanvasJS grid demo</title>
55

66
<link rel="stylesheet" href="demo.css"/>
7-
<script src="../dist/gridstack-jq.js"></script>
7+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/gridstack-jq.js"></script>
88
<script src="https://canvasjs.com/assets/script/canvasjs.min.js"></script>
99

1010
<style type="text/css">

‎demo/cell-height.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>cell height demo</title>
88

99
<link rel="stylesheet" href="demo.css"/>
10-
<script src="../dist/gridstack-h5.js"></script>
10+
<script src="../dist/gridstack-all.js"></script>
1111
<style type="text/css">
1212
.container {
1313
background-color: lightblue;

‎demo/column.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<link rel="stylesheet" href="demo.css"/>
1010
<link rel="stylesheet" href="../dist/gridstack-extra.css"/>
11-
<script src="../dist/gridstack-h5.js"></script>
11+
<script src="../dist/gridstack-all.js"></script>
1212
</head>
1313
<body>
1414
<div class="container-fluid">

‎demo/custom-engine.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>Custom Engine</title>
88

99
<link rel="stylesheet" href="demo.css"/>
10-
<!-- <script src="../dist/gridstack-h5.js"></script> -->
10+
<!-- <script src="../dist/gridstack-all.js"></script> -->
1111
<script src="events.js"></script>
1212
</head>
1313
<body>
@@ -24,7 +24,7 @@ <h1>Custom Engine</h1>
2424

2525
<script type="module" > // so we can use import
2626
// get CORS error in Chrome...need to have http://localhost/ URL - see https://stackoverflow.com/questions/50197495/javascript-modules-and-cors
27-
import { GridStack, GridStackEngine } from '../dist/gridstack-h5.js';
27+
import { GridStack, GridStackEngine } from '../dist/gridstack-all.js';
2828

2929
/**
3030
* Custom engine class that only allows vertical movement and resizing

‎demo/drag-and-drop-dataTransfer-angular.ts

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
55
import { GridStack, GridStackWidget, GridStackNode } from 'gridstack';
66
import { DDElement } from "gridstack/dist/h5/dd-element";
7-
import 'gridstack/dist/h5/gridstack-dd-native';
87

98
@Component({
109
selector: 'grid-stack-test',

‎demo/drag-and-drop-dataTransfer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="stylesheet" href="demo.css" />
1212
<link rel="stylesheet" href="../dist/gridstack-extra.css" />
1313

14-
<script src="../dist/gridstack-h5.js"></script>
14+
<script src="../dist/gridstack-all.js"></script>
1515
</head>
1616

1717
<body>

‎demo/float.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>Float grid demo</title>
88

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

1212
</head>
1313
<body>

‎demo/index.html

+6
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,11 @@ <h1>Demos</h1>
3131
<li><a href="web1.html">Website demo 1</a></li>
3232
<li><a href="web2.html">Website demo 2</a></li>
3333
</ul>
34+
<h1>Old v5.1.1 Jquery Demos</h1>
35+
Note: those are no longer supported, and use a old version of the lib.
36+
<ul>
37+
<li><a href="two-jq.html">Two grids</a></li>
38+
<li><a href="nested-jq.html">Nested grids</a></li>
39+
</ul>
3440
</body>
3541
</html>

‎demo/knockout.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<link rel="stylesheet" href="demo.css"/>
1010

1111
<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.5.0/knockout-debug.js"></script>
12-
<script src="../dist/gridstack-h5.js"></script>
12+
<script src="../dist/gridstack-all.js"></script>
1313
</head>
1414
<body>
1515
<div class="container-fluid">

‎demo/locked.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>Locked demo</title>
88

99
<link rel="stylesheet" href="demo.css"/>
10-
<script src="../dist/gridstack-h5.js"></script>
10+
<script src="../dist/gridstack-all.js"></script>
1111
</style>
1212
</head>
1313
<body>

‎demo/mobile.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<link rel="stylesheet" href="demo.css"/>
1010
<link rel="stylesheet" href="../dist/gridstack-extra.css"/>
11-
<script src="../dist/gridstack-h5.js"></script>
11+
<script src="../dist/gridstack-all.js"></script>
1212

1313
</head>
1414
<body>

‎demo/nested-jq.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
<title>Nested JQuery grids demo (ES6)</title>
7+
<title>Nested JQuery grids demo (old v5.1.1) which never worked fully</title>
88
<link rel="stylesheet" href="demo.css"/>
99
<link rel="stylesheet" href="../dist/gridstack-extra.min.css"/>
10-
<script src="../dist/gridstack-jq.js"></script>
10+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/gridstack-jq.js"></script>
1111
<style type="text/css">
1212
/* make nested grids have slightly darker bg */
1313
.grid-stack.grid-stack-nested {

‎demo/nested.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>Nested grids demo (ES6)</title>
88
<link rel="stylesheet" href="demo.css"/>
99
<link rel="stylesheet" href="../dist/gridstack-extra.min.css"/>
10-
<script src="../dist/gridstack-h5.js"></script>
10+
<script src="../dist/gridstack-all.js"></script>
1111
<style type="text/css">
1212
/* make nested grids have slightly darker bg */
1313
.grid-stack.grid-stack-nested {

‎demo/nested_advanced.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>Nested grids demo (ES6)</title>
88
<link rel="stylesheet" href="demo.css"/>
99
<link rel="stylesheet" href="../dist/gridstack-extra.min.css"/>
10-
<script src="../dist/gridstack-h5.js"></script>
10+
<script src="../dist/gridstack-all.js"></script>
1111
<style type="text/css">
1212
.grid-stack.grid-stack-nested {
1313
background: rgba(255, 255, 255, 0.3);

‎demo/react-hooks.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<title>Gridstack.js React integration example</title>
88
<link rel="stylesheet" href="demo.css" />
9-
<script src="../dist/gridstack-h5.js"></script>
9+
<script src="../dist/gridstack-all.js"></script>
1010

1111
<!-- Scripts to use react inside html -->
1212
<script src="https://unpkg.com/react@16/umd/react.production.min.js"></script>

‎demo/react.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
66
<title>Gridstack.js React integration example</title>
77
<link rel="stylesheet" href="demo.css" />
8-
<script src="../dist/gridstack-h5.js"></script>
8+
<script src="../dist/gridstack-all.js"></script>
99

1010
<!-- Scripts to use react inside html -->
1111
<script src="https://unpkg.com/react@16/umd/react.production.min.js"></script>

‎demo/responsive.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<link rel="stylesheet" href="demo.css"/>
77
<link rel="stylesheet" href="../dist/gridstack-extra.css"/>
8-
<script src="../dist/gridstack-h5.js"></script>
8+
<script src="../dist/gridstack-all.js"></script>
99
<style type="text/css">
1010
body { margin: 8px 0; } /* make grid take entire vw so we have correct square cells */
1111
</style>

‎demo/right-to-left(rtl).html

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</style>
1515

1616
<script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.5.0/knockout-min.js"></script>
17-
<script src="../dist/gridstack-h5.js"></script>
17+
<script src="../dist/gridstack-all.js"></script>
1818
</head>
1919
<body>
2020
<div class="container-fluid">

‎demo/serialization.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>Serialization demo</title>
88

99
<link rel="stylesheet" href="demo.css"/>
10-
<script src="../dist/gridstack-h5.js"></script>
10+
<script src="../dist/gridstack-all.js"></script>
1111
</head>
1212
<body>
1313
<div class="container-fluid">

‎demo/static.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>Static Grid</title>
88

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

1212
</head>
1313
<body>

‎demo/two-jq.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<link rel="stylesheet" href="demo.css"/>
1111
<link rel="stylesheet" href="../dist/gridstack-extra.css"/>
1212

13-
<script src="../dist/gridstack-jq.js"></script>
13+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/gridstack-jq.js"></script>
1414
</head>
1515
<body>
1616
<div class="container-fluid">
17-
<h1>Two grids demo (Jquery version)</h1>
17+
<h1>Two grids demo (old v5.1.1 Jquery version)</h1>
1818

1919
<div class="row">
2020
<div class="col-md-3">

‎demo/two.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<link rel="stylesheet" href="demo.css"/>
1111
<link rel="stylesheet" href="../dist/gridstack-extra.css"/>
1212

13-
<script src="../dist/gridstack-h5.js"></script>
13+
<script src="../dist/gridstack-all.js"></script>
1414
</head>
1515
<body>
1616
<div class="container-fluid">

‎demo/two_vertical.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>Two vertical grids demo</title>
88
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
99
<link rel="stylesheet" href="demo.css"/>
10-
<script src="../dist/gridstack-h5.js"></script>
10+
<script src="../dist/gridstack-all.js"></script>
1111
</head>
1212
<body>
1313
<div class="container-fluid">

‎demo/vue2js.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
66
<title>Gridstack.js Vue integration example</title>
77
<link rel="stylesheet" href="demo.css"/>
8-
<script src="../dist/gridstack-h5.js"></script>
8+
<script src="../dist/gridstack-all.js"></script>
99
</head>
1010
<body>
1111
<main id="app">

‎demo/vue3js.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
66
<title>Gridstack.js Vue integration example</title>
77
<link rel="stylesheet" href="demo.css"/>
8-
<script src="../dist/gridstack-h5.js"></script>
8+
<script src="../dist/gridstack-all.js"></script>
99
</head>
1010
<body>
1111
<main id="app">

‎demo/web-comp.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!-- Polyfills only needed for Firefox and Edge. -->
55
<script src="https://unpkg.com/@webcomponents/webcomponentsjs@latest/webcomponents-loader.js"></script>
66
<link rel="stylesheet" href="demo.css"/>
7-
<script src="../dist/gridstack-h5.js"></script>
7+
<script src="../dist/gridstack-all.js"></script>
88
</head>
99
<body>
1010
<h1>LitElement Web Component</h1>

‎demo/web1.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<!-- support for IE -->
1717
<script src="../dist/es5/gridstack-poly.js"></script>
18-
<script src="../dist/es5/gridstack-jq.js"></script>
18+
<script src="../dist/es5/gridstack.js"></script>
1919
</head>
2020

2121
<body>

‎demo/web2.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<!-- support for IE -->
1717
<script src="../dist/es5/gridstack-poly.js"></script>
18-
<script src="../dist/es5/gridstack-jq.js"></script>
18+
<script src="../dist/es5/gridstack.js"></script>
1919

2020
<style type="text/css">
2121
.grid-stack-item-removing {

‎demo/website.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<!-- ES5 support for IE -->
1313
<script src="../dist/es5/gridstack-poly.js"></script>
14-
<script src="../dist/es5/gridstack-jq.js"></script>
14+
<script src="../dist/es5/gridstack.js"></script>
1515

1616
<script src="https://getbootstrap.com/docs/4.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-xrRywqdh3PHs8keKZN+8zzc5TX0GRTLCcmivcbNJWm2rs5C8PRhcEn3czEjhAO9o" crossorigin="anonymous"></script>
1717
<script src="https://cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/highlight.min.js"></script>
@@ -197,7 +197,7 @@ <h3>Code</h3>
197197
<pre>
198198
<code class="html">npm install gridstack</code>
199199
<p class="text-white">then in html:</p>
200-
<code class="html">&lt;script src="../dist/gridstack-h5.js"&gt;&lt;/script&gt;
200+
<code class="html">&lt;script src="../dist/gridstack-all.js"&gt;&lt;/script&gt;
201201
&lt;link href="../dist/gridstack.min.css" rel="stylesheet"/&gt;
202202
&lt;style type="text/css"&gt;
203203
.grid-stack { background: #FAFAD2; }

‎doc/CHANGES.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Change log
55
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
66
**Table of Contents** *generated with [DocToc](http://doctoc.herokuapp.com/)*
77

8-
- [TBD](#tbd)
8+
- [6.0.0-beta (TBD)](#600-beta-tbd)
99
- [5.1.1 (2022-06-16)](#511-2022-06-16)
1010
- [5.1.0 (2022-05-21)](#510-2022-05-21)
1111
- [5.0.0 (2022-01-10)](#500-2022-01-10)
@@ -69,8 +69,9 @@ Change log
6969

7070
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
7171

72-
## TBD
73-
* converted previous HTML5 `draggable=true` based code to simple mouse move/enter/leave events for dragging in preparation of mobile support.
72+
## 6.0.0-beta (TBD)
73+
* converted previous HTML5 `draggable=true` based code to simple Mouse Events and Touch mobile support for drag&Drop.
74+
* removed all jquery-ui related code, and D7D plugging as we only support native events now
7475
* changed `commit()` to be `batchUpdate(false)` to make it easier to turn batch on/off. updated doc. old API remains for now
7576

7677
## 5.1.1 (2022-06-16)

0 commit comments

Comments
 (0)