Переглянути джерело

_noEventDrop/_noEventResize

Adam Shaw 7 роки тому
батько
коміт
1f4933335a

+ 4 - 6
tests/automated/event-drag/EventDragUtils.js

@@ -21,14 +21,12 @@ export function drag(rect0, rect1, debug) {
     debug: debug
   })
 
-  currentCalendar.on('eventDragStop', function() {
-    setTimeout(function() {
-      deferred.resolve(false) // won't do anything if already resolved by eventMutation
-    }, 0) // will happen after eventMutation
+  currentCalendar.on('eventMutation', function(arg) {
+    deferred.resolve(arg)
   })
 
-  currentCalendar.on('eventMutation', function(arg) { // always called after eventDragStop, if success
-    deferred.resolve(arg) // will happen first
+  currentCalendar.on('_noEventDrop', function() {
+    deferred.resolve(false)
   })
 
   return deferred.promise()

+ 4 - 6
tests/automated/event-resize/EventResizeUtils.js

@@ -27,14 +27,12 @@ export function resize(rect0, rect1, debug) {
     debug: debug
   })
 
-  currentCalendar.on('eventResizeStop', function() {
-    setTimeout(function() {
-      deferred.resolve(false) // won't do anything if already eventResize
-    }, 0) // will happen after eventResize's timeout
+  currentCalendar.on('eventMutation', function(arg) {
+    deferred.resolve(arg)
   })
 
-  currentCalendar.on('eventMutation', function(arg) { // always called after eventDragStop, if success
-    deferred.resolve(arg) // will happen first
+  currentCalendar.on('_noEventResize', function() {
+    deferred.resolve(false)
   })
 
   return deferred.promise()