Fixed #6100

primefaces · Jul 26, 2018 · 4ddd39b · 4ddd39b
1 parent da51d03
commit 4ddd39b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/src/app/components/dragdrop/dragdrop.ts b/src/app/components/dragdrop/dragdrop.ts
@@ -4,14 +4,13 @@ import {DomHandler} from '../dom/domhandler';
 
 @Directive({
     selector: '[pDraggable]',
-    host: {
-        '[draggable]': 'true'
-    },
     providers: [DomHandler]
 })
 export class Draggable implements AfterViewInit, OnDestroy {
 
     @Input('pDraggable') scope: string;
+
+    @Input() pDraggableDisabled: boolean;
 
     @Input() dragEffect: string;
 
@@ -34,7 +33,10 @@ export class Draggable implements AfterViewInit, OnDestroy {
     constructor(public el: ElementRef, public domHandler: DomHandler, public zone: NgZone) {}
 
     ngAfterViewInit() {
-        this.bindMouseListeners();
+        if (!this.pDraggableDisabled) {
+            this.el.nativeElement.draggable = true;
+            this.bindMouseListeners();
+        }
     }
 
     bindDragListener() {
@@ -133,6 +135,8 @@ export class Draggable implements AfterViewInit, OnDestroy {
 export class Droppable implements AfterViewInit, OnDestroy {
 
     @Input('pDroppable') scope: string|string[];
+
+    @Input() pDroppableDisabled: boolean;
 
     @Input() dropEffect: string;
 
@@ -147,7 +151,9 @@ export class Droppable implements AfterViewInit, OnDestroy {
     dragOverListener: any;
 
     ngAfterViewInit() {
-        this.bindDragOverListener();
+        if (!this.pDroppableDisabled) {
+            this.bindDragOverListener();
+        }
     }
 
     bindDragOverListener() {

diff --git a/src/app/showcase/components/dragdrop/dragdropdemo.html b/src/app/showcase/components/dragdrop/dragdropdemo.html
@@ -80,7 +80,6 @@ <h3>Drag Handle</h3>
 </code>
 </pre>
 
-
             <h3>Draggable</h3>
             <h4>Attributes</h4>
             <div class="doc-tablewrapper">
@@ -106,6 +105,12 @@ <h4>Attributes</h4>
                             <td>null</td>
                             <td>Selector to define the drag handle, by default anywhere on the target element is a drag handle to start dragging.</td>
                         </tr>
+                        <tr>
+                            <td>pDraggableDisabled</td>
+                            <td>boolean</td>
+                            <td>false</td>
+                            <td>Whether the element is draggable, useful for conditional cases.</td>
+                        </tr>
                     </tbody>
                 </table>
             </div>
@@ -165,6 +170,12 @@ <h4>Attributes</h4>
                             <td>null</td>
                             <td>Defines the cursor style on drag over, valid values are copy, relocate, link and move.</td>
                         </tr>
+                        <tr>
+                            <td>pDroppableDisabled</td>
+                            <td>boolean</td>
+                            <td>false</td>
+                            <td>Whether the element is droppable, useful for conditional cases.</td>
+                        </tr>
                     </tbody>
                 </table>
             </div>