Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #14 from mattoshry/allow_send_to_raise

Allow send impl to add an event to the internal event queue
  • Loading branch information...
commit b445cddce952408b6c3ee58b420d4b4f0206155a 2 parents 46a77d0 + 751f2b7
@jbeard4 authored
Showing with 3 additions and 3 deletions.
  1. +2 −2 lib/core/scxml/SCXML.js
  2. +1 −1  lib/core/util/code-gen.js
View
4 lib/core/scxml/SCXML.js
@@ -447,7 +447,7 @@ SCXMLInterpreter.prototype = {
var eventNames = eventSet.iter().map(function(event){return event.name;});
- var usePrefixMatchingAlgorithm = eventNames.filter(function(name){return name.search(".");}).length;
+ var usePrefixMatchingAlgorithm = eventNames.filter(function(name){return name.search(".") != -1;}).length;
var transitionSelector = usePrefixMatchingAlgorithm ? scxmlPrefixTransitionSelector : this.opts.transitionSelector;
var enabledTransitions = new this.opts.TransitionSet();
@@ -615,7 +615,7 @@ SimpleInterpreter.prototype.gen = function(evtObjOrName,optionalData) {
};
/** @private */
-SimpleInterpreter.prototype._send = function(event, options) {
+SimpleInterpreter.prototype._send = function(event, options, fnRaise) {
var callback, timeoutId,
_this = this;
if (pm.platform.setTimeout) {
View
2  lib/core/util/code-gen.js
@@ -137,7 +137,7 @@ var actionTags = {
"$send(" + event + ", {\n" +
"delay: " + (pm.platform.dom.hasAttribute(action,"delayexpr") ? pm.platform.dom.getAttribute(action,"delayexpr") : getDelayInMs(pm.platform.dom.getAttribute(action,"delay"))) + ",\n" +
"sendId: " + (pm.platform.dom.hasAttribute(action,"idlocation") ? pm.platform.dom.getAttribute(action,"idlocation") : JSON.stringify(pm.platform.dom.getAttribute(action,"id"))) + "\n" +
- "});" +
+ "}, $raise);" +
"}";
return send;
Please sign in to comment.
Something went wrong with that request. Please try again.