diff --git a/.eslintignore b/.eslintignore index 6281f0315..47a4ceef6 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,4 +1,3 @@ dist/* demo/* spec/* -src/jq/*.js diff --git a/Gruntfile.js b/Gruntfile.js index 6de367625..dd85dca31 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -2,7 +2,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-sass'); grunt.loadNpmTasks('grunt-contrib-cssmin'); grunt.loadNpmTasks('grunt-contrib-copy'); - grunt.loadNpmTasks('grunt-contrib-uglify'); + // grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-eslint'); grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-protractor-runner'); @@ -45,21 +45,18 @@ module.exports = function(grunt) { } } }, - uglify: { - options: { - sourceMap: true, - output: { - comments: 'some' - } - }, - dist: { - files: { - 'dist/jq/jquery.js': 'src/jq/jquery.js', - 'dist/jq/jquery-ui.js': 'src/jq/jquery-ui.js', - 'dist/jq/jquery.ui.touch-punch.js': 'src/jq/jquery.ui.touch-punch.js', - } - } - }, + // uglify: { + // options: { + // sourceMap: true, + // output: { + // comments: 'some' + // } + // }, + // dist: { + // files: { + // } + // } + // }, eslint: { target: ['*.js', 'src/*.js'] }, @@ -107,6 +104,6 @@ module.exports = function(grunt) { }); grunt.registerTask('lint', ['eslint']); - grunt.registerTask('default', ['sass', 'cssmin', /*'eslint',*/ 'copy', 'uglify']); + grunt.registerTask('default', ['sass', 'cssmin', /*'eslint',*/ 'copy', /*'uglify'*/]); grunt.registerTask('e2e-test', ['connect', 'protractor_webdriver', 'protractor']); }; diff --git a/demo/angular-ngFor.ts b/demo/angular-ngFor.ts index 734a20095..b1b9957cc 100644 --- a/demo/angular-ngFor.ts +++ b/demo/angular-ngFor.ts @@ -4,7 +4,6 @@ import { Component, AfterViewInit, OnChanges, SimpleChanges, Input, ChangeDetectionStrategy } from '@angular/core'; import { GridStack, GridStackWidget } from 'gridstack'; - import 'gridstack/dist/h5/gridstack-dd-native'; @Component({ selector: 'app-angular-ng-for-test', diff --git a/demo/angular.ts b/demo/angular.ts index 45b5e2b77..cddd164cd 100644 --- a/demo/angular.ts +++ b/demo/angular.ts @@ -4,7 +4,6 @@ import { Component, OnInit } from '@angular/core'; import { GridStack, GridStackWidget } from 'gridstack'; - import 'gridstack/dist/h5/gridstack-dd-native'; @Component({ selector: 'app-angular-test', diff --git a/demo/anijs.html b/demo/anijs.html index 6455c3e4d..2ffaeed00 100644 --- a/demo/anijs.html +++ b/demo/anijs.html @@ -9,7 +9,7 @@ - + diff --git a/demo/canvasJS.html b/demo/canvasJS.html index d667f8d4d..1d1ca65f9 100644 --- a/demo/canvasJS.html +++ b/demo/canvasJS.html @@ -4,7 +4,7 @@ CanvasJS grid demo - + diff --git a/demo/mobile.html b/demo/mobile.html index 62e3ec3d8..1058dcc90 100644 --- a/demo/mobile.html +++ b/demo/mobile.html @@ -8,7 +8,7 @@ - + diff --git a/demo/nested-jq.html b/demo/nested-jq.html index 69934b953..dd7449b3e 100644 --- a/demo/nested-jq.html +++ b/demo/nested-jq.html @@ -4,10 +4,10 @@ - Nested JQuery grids demo (ES6) + Nested JQuery grids demo (old v5.1.1) which never worked fully - + diff --git a/demo/right-to-left(rtl).html b/demo/right-to-left(rtl).html index 7e390000e..1e8197c25 100644 --- a/demo/right-to-left(rtl).html +++ b/demo/right-to-left(rtl).html @@ -14,7 +14,7 @@ - +
diff --git a/demo/serialization.html b/demo/serialization.html index 0f146db35..d420addbd 100644 --- a/demo/serialization.html +++ b/demo/serialization.html @@ -7,7 +7,7 @@ Serialization demo - +
diff --git a/demo/static.html b/demo/static.html index 681260673..fec433f26 100644 --- a/demo/static.html +++ b/demo/static.html @@ -7,7 +7,7 @@ Static Grid - + diff --git a/demo/two-jq.html b/demo/two-jq.html index 752cdc6ef..04b8c03d3 100644 --- a/demo/two-jq.html +++ b/demo/two-jq.html @@ -10,11 +10,11 @@ - +
-

Two grids demo (Jquery version)

+

Two grids demo (old v5.1.1 Jquery version)

diff --git a/demo/two.html b/demo/two.html index 68785c16c..d45e7338e 100644 --- a/demo/two.html +++ b/demo/two.html @@ -10,7 +10,7 @@ - +
diff --git a/demo/two_vertical.html b/demo/two_vertical.html index 532fe9b42..73951a996 100644 --- a/demo/two_vertical.html +++ b/demo/two_vertical.html @@ -7,7 +7,7 @@ Two vertical grids demo - +
diff --git a/demo/vue2js.html b/demo/vue2js.html index 41b2899d6..98abb3b3f 100644 --- a/demo/vue2js.html +++ b/demo/vue2js.html @@ -5,7 +5,7 @@ Gridstack.js Vue integration example - +
diff --git a/demo/vue3js.html b/demo/vue3js.html index 9483c4d80..6c83f250b 100644 --- a/demo/vue3js.html +++ b/demo/vue3js.html @@ -5,7 +5,7 @@ Gridstack.js Vue integration example - +
diff --git a/demo/web-comp.html b/demo/web-comp.html index 328c45108..60a673443 100644 --- a/demo/web-comp.html +++ b/demo/web-comp.html @@ -4,7 +4,7 @@ - +

LitElement Web Component

diff --git a/demo/web1.html b/demo/web1.html index 389776e85..ebe51a185 100644 --- a/demo/web1.html +++ b/demo/web1.html @@ -15,7 +15,7 @@ - + diff --git a/demo/web2.html b/demo/web2.html index 71b2a9ac6..2c065cf68 100644 --- a/demo/web2.html +++ b/demo/web2.html @@ -15,7 +15,7 @@ - +