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

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

54
dist/quagga.js vendored

@ -6864,30 +6864,44 @@ define('events',[],function() {
subscription.callback.call(null, data);
}
}
function subscribe(event, callback, async) {
var subscription;
return {
subscribe : function(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";
}
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);
getEvent(event).subscribers.push(subscription);
}
return {
subscribe : function(event, callback, async) {
return subscribe(event, callback, async);
},
publish : function(eventName, data) {
var subscribers = getEvent(eventName).subscribers, i;
for ( i = 0; i < subscribers.length; i++) {
publishSubscription(subscribers[i], data);
}
var event = getEvent(eventName),
subscribers = event.subscribers;
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
};
config.readyFunc = function() {
Events.subscribe("detected", function(result) {
Events.once("detected", function(result) {
_stopped = true;
resultCallback.call(null, result);
}, true);

File diff suppressed because one or more lines are too long

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

@ -25,30 +25,44 @@ define(function() {
subscription.callback.call(null, data);
}
}
function subscribe(event, callback, async) {
var subscription;
return {
subscribe : function(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";
}
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);
getEvent(event).subscribers.push(subscription);
}
return {
subscribe : function(event, callback, async) {
return subscribe(event, callback, async);
},
publish : function(eventName, data) {
var subscribers = getEvent(eventName).subscribers, i;
for ( i = 0; i < subscribers.length; i++) {
publishSubscription(subscribers[i], data);
}
var event = getEvent(eventName),
subscribers = event.subscribers;
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
};
config.readyFunc = function() {
Events.subscribe("detected", function(result) {
Events.once("detected", function(result) {
_stopped = true;
resultCallback.call(null, result);
}, true);

@ -20,7 +20,8 @@ require.config({
'typedefs': 'src/typedefs',
'glMatrixAddon': 'src/glMatrixAddon',
'cluster': 'src/cluster',
'camera_access': 'src/camera_access'
'camera_access': 'src/camera_access',
'events': 'src/events'
},
deps: allTestFiles,
callback: window.__karma__.start

Loading…
Cancel
Save