Added one-time subscription to event-queue with "once". Need tests.

pull/14/head
Christoph Oberhofer 11 years ago
parent 005a989aa3
commit 480e962ea8

52
dist/quagga.js vendored

@ -6865,29 +6865,43 @@ define('events',[],function() {
} }
} }
return { function subscribe(event, callback, async) {
subscribe : function(event, callback, async) { var subscription;
var subscription;
if ( typeof callback === "function") { if ( typeof callback === "function") {
subscription = { subscription = {
callback : callback, callback : callback,
async : async async : async
}; };
} else { } else {
subscription = callback; subscription = callback;
if (!subscription.callback) { if (!subscription.callback) {
throw "Callback was not specified on options"; throw "Callback was not specified on options";
}
} }
}
getEvent(event).subscribers.push(subscription); getEvent(event).subscribers.push(subscription);
}
return {
subscribe : function(event, callback, async) {
return subscribe(event, callback, async);
}, },
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);

File diff suppressed because one or more lines are too long

@ -0,0 +1,3 @@
define(['events'], function(Events){
});

@ -26,29 +26,43 @@ define(function() {
} }
} }
return { function subscribe(event, callback, async) {
subscribe : function(event, callback, async) { var subscription;
var subscription;
if ( typeof callback === "function") {
if ( typeof callback === "function") { subscription = {
subscription = { callback : callback,
callback : callback, async : async
async : async };
}; } else {
} else { subscription = callback;
subscription = callback; if (!subscription.callback) {
if (!subscription.callback) { throw "Callback was not specified on options";
throw "Callback was not specified on options";
}
} }
}
getEvent(event).subscribers.push(subscription); getEvent(event).subscribers.push(subscription);
}
return {
subscribe : function(event, callback, async) {
return subscribe(event, callback, async);
}, },
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
});
} }
}; };
}(); }();

@ -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);

@ -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

Loading…
Cancel
Save