UnknownObject/quaggaJS
1
0
Fork 0
mirror of https://github.com/serratus/quaggaJS.git synced 2026-08-12 21:21:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Integration-Tests

Browse Source
This commit is contained in:
Christoph Oberhofer
2016-02-25 23:10:52 +01:00
parent 3c020d04bf
commit 0ed588ecb5
7 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/quagga.js
Vendored
+5 -5
View File
File diff suppressed because one or more lines are too long
dist/quagga.min.js
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
karma-integration.conf.js
+10 -3
View File
@@ -1,4 +1,5 @@
var path = require('path');
var webpack = require('webpack');
module.exports = function(config) {
config.set({
@@ -26,12 +27,18 @@ module.exports = function(config) {
},
resolve: {
extensions: ['', '.js', '.jsx'],
root: path.resolve(__dirname),
alias: {
'input_stream$': path.resolve(__dirname, 'src/input_stream'),
'frame_grabber$': path.resolve(__dirname, 'src/frame_grabber')
}
'input_stream$': 'src/input/input_stream',
'frame_grabber$': 'src/input/frame_grabber'
}
},
plugins: [
new webpack.DefinePlugin({
ENV: require(path.join(__dirname, './env/production'))
})
]
},
plugins: [
'karma-chrome-launcher',
'karma-mocha',
karma.conf.js
+3 -2
View File
@@ -33,9 +33,10 @@ module.exports = function(config) {
},
resolve: {
extensions: ['', '.js', '.jsx'],
root: path.resolve(__dirname),
alias: {
'input_stream$': path.resolve(__dirname, 'src/input_stream'),
'frame_grabber$': path.resolve(__dirname, 'src/frame_grabber')
'input_stream$': 'src/input/input_stream',
'frame_grabber$': 'src/input/frame_grabber'
}
},
},
lib/quagga.js
+3 -3
View File
File diff suppressed because one or more lines are too long
src/config/config.dev.js
+2 -2
View File
@@ -34,8 +34,8 @@ module.exports = {
halfSample: true,
patchSize: "medium", // x-small, small, medium, large, x-large
debug: {
showCanvas: true,
showPatches: true,
showCanvas: false,
showPatches: false,
showFoundPatches: false,
showSkeleton: false,
showLabels: false,
src/decoder/barcode_decoder.js
+2 -2
View File
@@ -42,7 +42,7 @@ export default {
initConfig();
function initCanvas() {
if (typeof document !== 'undefined') {
if (ENV.development && typeof document !== 'undefined') {
var $debug = document.querySelector("#debug.detection");
_canvas.dom.frequency = document.querySelector("canvas.frequency");
if (!_canvas.dom.frequency) {
@@ -91,7 +91,7 @@ export default {
}
function initConfig() {
if (typeof document !== 'undefined') {
if (ENV.development && typeof document !== 'undefined') {
var i,
vis = [{
node: _canvas.dom.frequency,