more jquery cleanup

adumesny · adumesny · commit 4617cec56aa9 · 2022-08-20T18:00:45.000-07:00
* removed revert: 'invalid', scroll: false support as those were never implemented in H5
* combined more classes and moved DD around
diff --git a/demo/drag-and-drop-dataTransfer-angular.ts b/demo/drag-and-drop-dataTransfer-angular.ts
@@ -32,8 +32,6 @@
          const _ddElement = DDElement.init(this.dragElement.nativeElement);
          _ddElement.setupDraggable({
              handle: '.sample-drag',
-             revert: 'invalid',
-             scroll: true,
              appendTo: 'body',
              helper: 'clone',
              start: (event: DragEvent) => {
diff --git a/demo/drag-and-drop-dataTransfer.html b/demo/drag-and-drop-dataTransfer.html
@@ -55,8 +55,6 @@ <h1>Event DataTransfer Demo</h1>
         GridStack.setupDragIn(
             '.sidebar .grid-stack-item',
             {
-                revert: 'invalid',
-                scroll: false,
                 appendTo: 'body',
                 helper: clone,
                 start: start
diff --git a/demo/static.html b/demo/static.html
@@ -38,7 +38,7 @@ <h1>Static vs can move/drag Demo</h1>
       removable: true,
       // old way, use global setupDragIn() instead
       // dragIn: '.sidebar .grid-stack-item', // add draggable to class
-      // dragInOptions: { revert: 'invalid', scroll: false, appendTo: 'body', helper: 'clone' },
+      // dragInOptions: { appendTo: 'body', helper: 'clone' },
       staticGrid: true
     });
     addEvents(grid);
@@ -52,7 +52,7 @@ <h1>Static vs can move/drag Demo</h1>
     ];
     grid.load(serializedData, true);
 
-    GridStack.setupDragIn('.sidebar .grid-stack-item', { revert: 'invalid', scroll: false, appendTo: 'body', helper: 'clone' });
+    GridStack.setupDragIn('.sidebar .grid-stack-item', { appendTo: 'body', helper: 'clone' });
 
     // grid.setStatic(false); // TEST enable after disabled
 
diff --git a/demo/two.html b/demo/two.html
@@ -57,15 +57,15 @@ <h1>Two grids demo</h1>
       disableOneColumnMode: true,
       float: true,
       // dragIn: '.sidebar .grid-stack-item', // add draggable to class
-      // dragInOptions: { revert: 'invalid', scroll: false, appendTo: 'body', helper: 'clone' }, // clone
+      // dragInOptions: { appendTo: 'body', helper: 'clone' }, // clone
       removable: '.trash', // true or drag-out delete class
       acceptWidgets: function(el) { return true; } // function example, but can also be: true | false | '.someClass' value
     };
     let grids = GridStack.initAll(options);
     grids[1].float(false);
 
     // new 4.x static method instead of setting up options on every grid (never been per grid really) but old options still works
-    GridStack.setupDragIn('.sidebar .grid-stack-item', { revert: 'invalid', scroll: false, appendTo: 'body', helper: myClone });
+    GridStack.setupDragIn('.sidebar .grid-stack-item', { appendTo: 'body', helper: myClone });
     // GridStack.setupDragIn(); // second call will now work (cache last values)
 
     let items = [
diff --git a/demo/web2.html b/demo/web2.html
@@ -62,7 +62,7 @@ <h1>Advanced Demo</h1>
       cellHeight: 70,
       acceptWidgets: true,
       dragIn: '.newWidget',  // class that can be dragged from outside
-      dragInOptions: { revert: 'invalid', scroll: false, appendTo: 'body', helper: 'clone' }, // clone or can be your function
+      dragInOptions: { appendTo: 'body', helper: 'clone' }, // clone or can be your function
       removable: '#trash', // drag-out delete class
     });
 
diff --git a/demo/website.html b/demo/website.html
@@ -374,7 +374,7 @@ <h1>Used by</h1>
       margin: 5,
       acceptWidgets: true,
       dragIn: '.newWidget',  // class that can be dragged from outside
-      dragInOptions: { revert: 'invalid', scroll: false, appendTo: 'body', helper: 'clone' },
+      dragInOptions: { appendTo: 'body', helper: 'clone' },
       removable: '#trash',
       removeTimeout: 100
     }, '#advanced-grid');
diff --git a/doc/README.md b/doc/README.md
@@ -95,10 +95,10 @@ gridstack.js API
   * example: `dragIn: '.newWidget'`.
   * **Note**: if you have multiple grids, it's best to call `GridStack.setupDragIn()` with same params as it only need to be done once.
 - `dragInOptions` - options for items that can be dragged into grids
-  * example `dragInOptions: { revert: 'invalid', scroll: false, appendTo: 'body', helper: 'clone', handle: '.grid-stack-item-content' }`
+  * example `dragInOptions: { appendTo: 'body', helper: 'clone', handle: '.grid-stack-item-content' }`
   * **Note**: if you have multiple grids, it's best to call `GridStack.setupDragIn()` with same params as it only need to be done once.
   * **Note2**: instead of 'clone' you can also pass your own function (get passed the event).
-- `draggable` - allows to override draggable options. (default: `{handle: '.grid-stack-item-content', scroll: false, appendTo: 'body', containment: null}`)
+- `draggable` - allows to override draggable options. (default: `{handle: '.grid-stack-item-content', appendTo: 'body'}`)
 - `dragOut` to let user drag nested grid items out of a parent or not (default false) See [example](http://gridstackjs.com/demo/nested.html)
 - `engineClass` - the type of engine to create (so you can subclass) default to GridStackEngine
 - `float` - enable floating widgets (default: `false`) See [example](http://gridstackjs.com/demo/float.html)
@@ -319,7 +319,7 @@ grids.forEach(...)
 * call to setup dragging in from the outside (say toolbar), by specifying the class selection and options.
 Called during `GridStack.init()` as options, but can also be called directly (last param are cached) in case the toolbar is dynamically create and needs to change later.
 * @param dragIn string selector (ex: `'.sidebar .grid-stack-item'`)
-* @param dragInOptions options - see `DDDragInOpt`. (default: `{revert: 'invalid', handle: '.grid-stack-item-content', scroll: false, appendTo: 'body'}`
+* @param dragInOptions options - see `DDDragInOpt`. (default: `{handle: '.grid-stack-item-content', appendTo: 'body'}`
 but you will probably also want `helper: 'clone'` or your own callback function).
 
 
diff --git a/spec/e2e/html/1143_nested_acceptWidget_types.html b/spec/e2e/html/1143_nested_acceptWidget_types.html
@@ -50,7 +50,7 @@ <h3>show dragging into sub grid</h3>
     let gridNest = GridStack.init({
       acceptWidgets: '.newWidget',
       dragIn: '.newWidget', // class that can be dragged from outside
-      dragInOptions: { revert: 'invalid', scroll: false, appendTo: 'body', helper: 'clone' }, // clone or can be your function
+      dragInOptions: { appendTo: 'body', helper: 'clone' }, // clone or can be your function
       itemClass: 'sub',
     }, '.grid-stack.nested');
     gridNest.load([
diff --git a/spec/e2e/html/1419-maxrow1-cant-insert.html b/spec/e2e/html/1419-maxrow1-cant-insert.html
@@ -62,7 +62,7 @@
       row: 1,
       cellHeight: 120,
       dragIn: '.sidebar .grid-stack-item', // class that can be dragged from outside
-      dragInOptions: { revert: 'invalid', scroll: false, appendTo: 'body', helper: 'clone' }, // clone or can be your function
+      dragInOptions: { appendTo: 'body', helper: 'clone' }, // clone or can be your function
       acceptWidgets: true
     };
     let grid = GridStack.init(options);
diff --git a/spec/e2e/html/1571_drop_onto_full.html b/spec/e2e/html/1571_drop_onto_full.html
@@ -87,7 +87,7 @@ <h1>drop onto full</h1>
       disableOneColumnMode: true,
       float: false,
       dragIn: '.sidebar .grid-stack-item', // class that can be dragged from outside
-      dragInOptions: { revert: 'invalid', scroll: false, appendTo: 'body', helper: 'clone' }, // clone or can be your function
+      dragInOptions: { appendTo: 'body', helper: 'clone' }, // clone or can be your function
       removable: '.trash', // drag-out delete class
       acceptWidgets: function(el) { return true; } // function example, else can be simple: true | false | '.someClass' value
     };
diff --git a/spec/e2e/html/1704_scroll_bar.html b/spec/e2e/html/1704_scroll_bar.html
@@ -39,8 +39,6 @@
       dragIn: ".newWidget", // class that can be dragged from outside
       dragOut: false,
       dragInOptions: {
-        revert: "invalid",
-        scroll: false,
         appendTo: "body",
         helper: "clone"
       },
diff --git a/src/dd-draggable.ts b/src/dd-draggable.ts
@@ -13,11 +13,11 @@ import { isTouch, touchend, touchmove, touchstart, pointerdown } from './dd-touc
 // TODO: merge with DDDragOpt ?
 export interface DDDraggableOpt {
   appendTo?: string | HTMLElement;
-  containment?: string | HTMLElement; // TODO: not implemented yet
   handle?: string;
-  revert?: string | boolean | unknown; // TODO: not implemented yet
-  scroll?: boolean; // nature support by HTML5 drag drop, can't be switch to off actually
   helper?: string | HTMLElement | ((event: Event) => HTMLElement);
+  // containment?: string | HTMLElement; // TODO: not implemented yet
+  // revert?: string | boolean | unknown; // TODO: not implemented yet
+  // scroll?: boolean; // native support by HTML5 drag drop, can't be switch to off actually
   start?: (event: Event, ui: DDUIData) => void;
   stop?: (event: Event) => void;
   drag?: (event: Event, ui: DDUIData) => void;
diff --git a/src/dd-gridstack.ts b/src/dd-gridstack.ts
diff --git a/src/gridstack.ts b/src/gridstack.ts
diff --git a/src/types.ts b/src/types.ts

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,6 @@ <h1>Event DataTransfer Demo</h1>`
`55`	`55`	`GridStack.setupDragIn(`
`56`	`56`	`'.sidebar .grid-stack-item',`
`57`	`57`	`{`
`58`		`- revert: 'invalid',`
`59`		`- scroll: false,`
`60`	`58`	`appendTo: 'body',`
`61`	`59`	`helper: clone,`
`62`	`60`	`start: start`