Skip to content

Commit 9aeba1d

Browse files
adumesnyadumesny
authored
Merge pull request #2012 from adumesny/master
jquery-ui removal - using native only
2 parents 581dd70 + 065d631 commit 9aeba1d

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
dist/*
22
demo/*
33
spec/*
4-
src/jq/*.js

‎Gruntfile.js

Lines changed: 14 additions & 17 deletions
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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/gridstack@6.0.0-beta/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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 0 additions & 1 deletion
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',

0 commit comments

Comments
 (0)