2
0
Эх сурвалжийг харах

calendar more responsible

Adam Shaw 7 жил өмнө
parent
commit
5141f7b59d

+ 8 - 15
plugins/jquery-ui-draggable/main.ts

@@ -8,14 +8,11 @@ Calendar.on('initialRender', function(calendar) {
   const handleDragStart = function(ev, ui) {
 
     const handleDragMove = (ev, ui) => {
-      if (calendar.view) {
-        calendar.view.handleExternalDragMove(ev)
-      }
+      calendar.handleExternalDragMove(ev)
     }
+
     const handleDragStop = (ev, ui) => {
-      if (calendar.view) {
-        calendar.view.handleExternalDragStop(ev)
-      }
+      calendar.handleExternalDragStop(ev)
       $document
         .off('drag', handleDragMove)
         .off('dragstop', handleDragStop)
@@ -25,15 +22,11 @@ Calendar.on('initialRender', function(calendar) {
       .on('drag', handleDragMove)
       .on('dragstop', handleDragStop)
 
-    if (calendar.view) {
-      const el = ((ui && ui.item) ? ui.item[0] : null) || ev.target
-      calendar.view.handlExternalDragStart(
-        ev.originalEvent,
-        el,
-        ev.name === 'dragstart' // don't watch mouse/touch movements if doing jqui drag (not sort)
-      )
-    }
-
+    calendar.handlExternalDragStart(
+      ev.originalEvent,
+      ((ui && ui.item) ? ui.item[0] : null) || ev.target,
+      ev.name === 'dragstart' // don't watch mouse/touch movements if doing jqui drag (not sort)
+    )
   }
 
   $document.on('dragstart sortstart', handleDragStart)

+ 25 - 0
src/Calendar.ts

@@ -836,6 +836,31 @@ export default class Calendar {
   }
 
 
+  // External Dragging
+  // -----------------------------------------------------------------------------------------------------------------
+
+
+  handlExternalDragStart(ev, el, skipBinding) {
+    if (this.view) {
+      this.view.handlExternalDragStart(ev, el, skipBinding)
+    }
+  }
+
+
+  handleExternalDragMove(ev) {
+    if (this.view) {
+      this.view.handleExternalDragMove(ev)
+    }
+  }
+
+
+  handleExternalDragStop(ev) {
+    if (this.view) {
+      this.view.handleExternalDragStop(ev)
+    }
+  }
+
+
   // Date Utils
   // -----------------------------------------------------------------------------------------------------------------