mirror of
https://github.com/serratus/quaggaJS.git
synced 2026-08-13 05:31:37 +08:00
Added one-time subscription to event-queue with "once". Need tests.
This commit is contained in:
Vendored
+34
-20
@@ -6864,30 +6864,44 @@ define('events',[],function() {
|
|||||||
subscription.callback.call(null, data);
|
subscription.callback.call(null, data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function subscribe(event, callback, async) {
|
||||||
|
var subscription;
|
||||||
|
|
||||||
|
if ( typeof callback === "function") {
|
||||||
|
subscription = {
|
||||||
|
callback : callback,
|
||||||
|
async : async
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
subscription = callback;
|
||||||
|
if (!subscription.callback) {
|
||||||
|
throw "Callback was not specified on options";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getEvent(event).subscribers.push(subscription);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
subscribe : function(event, callback, async) {
|
subscribe : function(event, callback, async) {
|
||||||
var subscription;
|
return subscribe(event, callback, async);
|
||||||
|
|
||||||
if ( typeof callback === "function") {
|
|
||||||
subscription = {
|
|
||||||
callback : callback,
|
|
||||||
async : async
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
subscription = callback;
|
|
||||||
if (!subscription.callback) {
|
|
||||||
throw "Callback was not specified on options";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
getEvent(event).subscribers.push(subscription);
|
|
||||||
},
|
},
|
||||||
publish : function(eventName, data) {
|
publish : function(eventName, data) {
|
||||||
var subscribers = getEvent(eventName).subscribers, i;
|
var event = getEvent(eventName),
|
||||||
for ( i = 0; i < subscribers.length; i++) {
|
subscribers = event.subscribers;
|
||||||
publishSubscription(subscribers[i], data);
|
|
||||||
}
|
event.subscribers = subscribers.filter(function(subscriber) {
|
||||||
|
publishSubscription(subscriber, data);
|
||||||
|
return !subscriber.once;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
once: function(event, callback, async) {
|
||||||
|
subscribe(event, {
|
||||||
|
callback: callback,
|
||||||
|
async: async,
|
||||||
|
once: true
|
||||||
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}();
|
}();
|
||||||
@@ -7212,7 +7226,7 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
|
|||||||
size: 800
|
size: 800
|
||||||
};
|
};
|
||||||
config.readyFunc = function() {
|
config.readyFunc = function() {
|
||||||
Events.subscribe("detected", function(result) {
|
Events.once("detected", function(result) {
|
||||||
_stopped = true;
|
_stopped = true;
|
||||||
resultCallback.call(null, result);
|
resultCallback.call(null, result);
|
||||||
}, true);
|
}, true);
|
||||||
|
|||||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
@@ -0,0 +1,3 @@
|
|||||||
|
define(['events'], function(Events){
|
||||||
|
|
||||||
|
});
|
||||||
+33
-19
@@ -25,30 +25,44 @@ define(function() {
|
|||||||
subscription.callback.call(null, data);
|
subscription.callback.call(null, data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function subscribe(event, callback, async) {
|
||||||
|
var subscription;
|
||||||
|
|
||||||
|
if ( typeof callback === "function") {
|
||||||
|
subscription = {
|
||||||
|
callback : callback,
|
||||||
|
async : async
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
subscription = callback;
|
||||||
|
if (!subscription.callback) {
|
||||||
|
throw "Callback was not specified on options";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getEvent(event).subscribers.push(subscription);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
subscribe : function(event, callback, async) {
|
subscribe : function(event, callback, async) {
|
||||||
var subscription;
|
return subscribe(event, callback, async);
|
||||||
|
|
||||||
if ( typeof callback === "function") {
|
|
||||||
subscription = {
|
|
||||||
callback : callback,
|
|
||||||
async : async
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
subscription = callback;
|
|
||||||
if (!subscription.callback) {
|
|
||||||
throw "Callback was not specified on options";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
getEvent(event).subscribers.push(subscription);
|
|
||||||
},
|
},
|
||||||
publish : function(eventName, data) {
|
publish : function(eventName, data) {
|
||||||
var subscribers = getEvent(eventName).subscribers, i;
|
var event = getEvent(eventName),
|
||||||
for ( i = 0; i < subscribers.length; i++) {
|
subscribers = event.subscribers;
|
||||||
publishSubscription(subscribers[i], data);
|
|
||||||
}
|
event.subscribers = subscribers.filter(function(subscriber) {
|
||||||
|
publishSubscription(subscriber, data);
|
||||||
|
return !subscriber.once;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
once: function(event, callback, async) {
|
||||||
|
subscribe(event, {
|
||||||
|
callback: callback,
|
||||||
|
async: async,
|
||||||
|
once: true
|
||||||
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}();
|
}();
|
||||||
|
|||||||
+1
-1
@@ -213,7 +213,7 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
|
|||||||
size: 800
|
size: 800
|
||||||
};
|
};
|
||||||
config.readyFunc = function() {
|
config.readyFunc = function() {
|
||||||
Events.subscribe("detected", function(result) {
|
Events.once("detected", function(result) {
|
||||||
_stopped = true;
|
_stopped = true;
|
||||||
resultCallback.call(null, result);
|
resultCallback.call(null, result);
|
||||||
}, true);
|
}, true);
|
||||||
|
|||||||
+2
-1
@@ -20,7 +20,8 @@ require.config({
|
|||||||
'typedefs': 'src/typedefs',
|
'typedefs': 'src/typedefs',
|
||||||
'glMatrixAddon': 'src/glMatrixAddon',
|
'glMatrixAddon': 'src/glMatrixAddon',
|
||||||
'cluster': 'src/cluster',
|
'cluster': 'src/cluster',
|
||||||
'camera_access': 'src/camera_access'
|
'camera_access': 'src/camera_access',
|
||||||
|
'events': 'src/events'
|
||||||
},
|
},
|
||||||
deps: allTestFiles,
|
deps: allTestFiles,
|
||||||
callback: window.__karma__.start
|
callback: window.__karma__.start
|
||||||
|
|||||||
Reference in New Issue
Block a user