Matthias Mullie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/206825

Change subject: Remove ability to abort with _abort
......................................................................

Remove ability to abort with _abort

There is no code in Flow that sets any _abort, so this seems
rather useless at this point.

Change-Id: I6e9c9bccf898ae3491e5142be326f1dbd1dacc59
---
M modules/engine/components/common/flow-component-events.js
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/25/206825/1

diff --git a/modules/engine/components/common/flow-component-events.js 
b/modules/engine/components/common/flow-component-events.js
index d1a4cdb..8a20709 100644
--- a/modules/engine/components/common/flow-component-events.js
+++ b/modules/engine/components/common/flow-component-events.js
@@ -105,7 +105,7 @@
 
        /**
         * Same as OO.EventEmitter.emit, except that it returns an array of 
results.
-        * If something returns false (or an object with _abort:true), we stop 
processing the rest of the callbacks, if any.
+        * If something returns false, we stop processing the rest of the 
callbacks, if any.
         * @param {String} event Name of the event to trigger
         * @param {...*} [args] Arguments to pass to event callback
         * @returns {Array}
@@ -137,7 +137,7 @@
                                // Add this result to our list of return vals
                                returns.push( retVal );
 
-                               if ( retVal === false || ( retVal && 
retVal._abort === true ) ) {
+                               if ( retVal === false ) {
                                        // Returned false; stop running 
callbacks
                                        break;
                                }
@@ -319,13 +319,13 @@
                                preHandlerReturn = callbackFn.apply( self, args 
);
                                preHandlerReturns.push( preHandlerReturn );
 
-                               if ( preHandlerReturn === false || ( 
preHandlerReturn && preHandlerReturn._abort === true ) ) {
+                               if ( preHandlerReturn === false ) {
                                        // Callback returned false; break out 
of this loop
                                        return false;
                                }
                        } );
 
-                       if ( preHandlerReturn === false || ( preHandlerReturn 
&& preHandlerReturn._abort === true ) ) {
+                       if ( preHandlerReturn === false ) {
                                // Last callback returned false
                                flowComponent.debug( false, 'apiPreHandler 
returned false', handlerName, args );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/206825
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e9c9bccf898ae3491e5142be326f1dbd1dacc59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to