Skip to content

Commit 5a3e79a

Browse files
committed
Version 1.0.25
Fixes pull request #225: #225
1 parent 918c86e commit 5a3e79a

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webcamjs",
3-
"version": "1.0.24",
3+
"version": "1.0.25",
44
"homepage": "https://github.com/jhuckaby/webcamjs",
55
"authors": [
66
"Joseph Huckaby <[email protected]>"

build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# Build Script for WebcamJS
44
# Install uglifyjs first: sudo npm install uglify-js -g
55

6-
uglifyjs webcam.js -o webcam.min.js --mangle --reserved "Webcam" --preamble "// WebcamJS v1.0.24 - http://github.com/jhuckaby/webcamjs - MIT Licensed"
6+
uglifyjs webcam.js -o webcam.min.js --mangle --reserved "Webcam" --preamble "// WebcamJS v1.0.25 - http://github.com/jhuckaby/webcamjs - MIT Licensed"

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webcamjs",
3-
"version": "1.0.24",
3+
"version": "1.0.25",
44
"description": "HTML5 Webcam Image Capture Library with Flash Fallback",
55
"author": "Joseph Huckaby <[email protected]>",
66
"homepage": "https://github.com/jhuckaby/webcamjs",

webcam.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// WebcamJS v1.0.24
1+
// WebcamJS v1.0.25
22
// Webcam library for capturing JPEG/PNG images in JavaScript
33
// Attempts getUserMedia, falls back to Flash
44
// Author: Joseph Huckaby: http://github.com/jhuckaby
@@ -27,14 +27,14 @@ function WebcamError() {
2727
this.message = temp.message;
2828
}
2929

30-
IntermediateInheritor = function() {};
30+
var IntermediateInheritor = function() {};
3131
IntermediateInheritor.prototype = Error.prototype;
3232

3333
FlashError.prototype = new IntermediateInheritor();
3434
WebcamError.prototype = new IntermediateInheritor();
3535

3636
var Webcam = {
37-
version: '1.0.24',
37+
version: '1.0.25',
3838

3939
// globals
4040
protocol: location.protocol.match(/https/i) ? 'https' : 'http',
@@ -569,6 +569,7 @@ var Webcam = {
569569
return true;
570570
}
571571
else if (name == 'error') {
572+
var message;
572573
if ((args[0] instanceof FlashError) || (args[0] instanceof WebcamError)) {
573574
message = args[0].message;
574575
} else {

webcam.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)