Update assets

remotes/angel/1.11.x
jmontoyaa 8 years ago
parent 57bfc7788c
commit 3d74cee8e3
  1. 8
      app/Resources/public/assets/jquery-file-upload/.bower.json
  2. 2
      app/Resources/public/assets/jquery-file-upload/bower.json
  3. 8
      app/Resources/public/assets/jquery-file-upload/js/cors/jquery.postmessage-transport.js
  4. 2
      app/Resources/public/assets/jquery-file-upload/js/cors/jquery.xdr-transport.js
  5. 2
      app/Resources/public/assets/jquery-file-upload/js/jquery.fileupload-angular.js
  6. 2
      app/Resources/public/assets/jquery-file-upload/js/jquery.fileupload-audio.js
  7. 2
      app/Resources/public/assets/jquery-file-upload/js/jquery.fileupload-image.js
  8. 2
      app/Resources/public/assets/jquery-file-upload/js/jquery.fileupload-jquery-ui.js
  9. 2
      app/Resources/public/assets/jquery-file-upload/js/jquery.fileupload-process.js
  10. 2
      app/Resources/public/assets/jquery-file-upload/js/jquery.fileupload-ui.js
  11. 2
      app/Resources/public/assets/jquery-file-upload/js/jquery.fileupload-validate.js
  12. 2
      app/Resources/public/assets/jquery-file-upload/js/jquery.fileupload-video.js
  13. 2
      app/Resources/public/assets/jquery-file-upload/js/jquery.fileupload.js
  14. 2
      app/Resources/public/assets/jquery-file-upload/js/jquery.iframe-transport.js
  15. 8
      app/Resources/public/assets/mediaelement/.bower.json
  16. 4
      app/Resources/public/assets/mediaelement/build/mediaelement-and-player.js
  17. 2
      app/Resources/public/assets/mediaelement/build/mediaelement-and-player.min.js
  18. 4
      app/Resources/public/assets/mediaelement/build/mediaelement.js
  19. 2
      app/Resources/public/assets/mediaelement/build/mediaelement.min.js
  20. 6
      app/Resources/public/assets/mediaelement/changelog.md
  21. 10
      app/Resources/public/assets/webcamjs/.bower.json
  22. 12
      app/Resources/public/assets/webcamjs/README.md
  23. 2
      app/Resources/public/assets/webcamjs/bower.json
  24. 2
      app/Resources/public/assets/webcamjs/package.json
  25. 122
      app/Resources/public/assets/webcamjs/webcam.js
  26. 4
      app/Resources/public/assets/webcamjs/webcam.min.js
  27. BIN
      app/Resources/public/assets/webcamjs/webcam.swf

@ -1,6 +1,6 @@
{
"name": "blueimp-file-upload",
"version": "9.12.3",
"version": "9.12.5",
"title": "jQuery File Upload",
"description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images.",
"keywords": [
@ -61,11 +61,11 @@
"server",
"test"
],
"_release": "9.12.3",
"_release": "9.12.5",
"_resolution": {
"type": "version",
"tag": "9.12.3",
"commit": "58188eea0e49512761263531352fa07f16de0f45"
"tag": "9.12.5",
"commit": "634724af8a866d7f3fe4d56d27c4f096f9d423d6"
},
"_source": "https://github.com/blueimp/jQuery-File-Upload.git",
"_target": "*",

@ -1,6 +1,6 @@
{
"name": "blueimp-file-upload",
"version": "9.12.3",
"version": "9.12.5",
"title": "jQuery File Upload",
"description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images.",
"keywords": [

@ -11,7 +11,7 @@
/* global define, require, window, document */
(function (factory) {
;(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
@ -64,6 +64,12 @@
loc = $('<a>').prop('href', options.postMessage)[0],
target = loc.protocol + '//' + loc.host,
xhrUpload = options.xhr().upload;
// IE always includes the port for the host property of a link
// element, but not in the location.host or origin property for the
// default http port 80 and https port 443, so we strip it:
if (/^(http:\/\/.+:80)|(https:\/\/.+:443)$/.test(target)) {
target = target.replace(/:(80|443)$/, '');
}
return {
send: function (_, completeCallback) {
counter += 1;

@ -14,7 +14,7 @@
/* global define, require, window, XDomainRequest */
(function (factory) {
;(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:

@ -12,7 +12,7 @@
/* jshint nomen:false */
/* global define, angular */
(function (factory) {
;(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:

@ -12,7 +12,7 @@
/* jshint nomen:false */
/* global define, require, window, document */
(function (factory) {
;(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:

@ -12,7 +12,7 @@
/* jshint nomen:false */
/* global define, require, window, Blob */
(function (factory) {
;(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:

@ -12,7 +12,7 @@
/* jshint nomen:false */
/* global define, require, window */
(function (factory) {
;(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:

@ -12,7 +12,7 @@
/* jshint nomen:false */
/* global define, require, window */
(function (factory) {
;(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:

@ -12,7 +12,7 @@
/* jshint nomen:false */
/* global define, require, window */
(function (factory) {
;(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:

@ -11,7 +11,7 @@
/* global define, require, window */
(function (factory) {
;(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:

@ -12,7 +12,7 @@
/* jshint nomen:false */
/* global define, require, window, document */
(function (factory) {
;(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:

@ -12,7 +12,7 @@
/* jshint nomen:false */
/* global define, require, window, document, location, Blob, FormData */
(function (factory) {
;(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:

@ -11,7 +11,7 @@
/* global define, require, window, document */
(function (factory) {
;(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:

@ -23,12 +23,12 @@
"./build/mediaelement-and-player.js",
"./build/mediaelementplayer.css"
],
"version": "2.21.1",
"_release": "2.21.1",
"version": "2.21.2",
"_release": "2.21.2",
"_resolution": {
"type": "version",
"tag": "2.21.1",
"commit": "701dfeac106ae8373e4d14819f8b8bbf22c52f43"
"tag": "2.21.2",
"commit": "47e85a3cb8f7d0a61d99c8d36b151b1a16b01112"
},
"_source": "https://github.com/johndyer/mediaelement.git",
"_target": "2.*",

@ -16,7 +16,7 @@
var mejs = mejs || {};
// version number
mejs.version = '2.21.1';
mejs.version = '2.21.2';
// player number (for missing, same id attr)
@ -1448,7 +1448,7 @@ mejs.HtmlMediaElementShim = {
specialIEContainer.outerHTML =
'<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="//download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab" ' +
'id="' + pluginid + '" width="' + width + '" height="' + height + '" class="mejs-shim">' +
'<param name="movie" value="' + options.pluginPath + options.flashName + '?x=' + (new Date().getTime()) + '" />' +
'<param name="movie" value="' + options.pluginPath + options.flashName + '?' + (new Date().getTime()) + '" />' +
'<param name="flashvars" value="' + initVars.join('&amp;') + '" />' +
'<param name="quality" value="high" />' +
'<param name="bgcolor" value="#000000" />' +

File diff suppressed because one or more lines are too long

@ -16,7 +16,7 @@
var mejs = mejs || {};
// version number
mejs.version = '2.21.1';
mejs.version = '2.21.2';
// player number (for missing, same id attr)
@ -1448,7 +1448,7 @@ mejs.HtmlMediaElementShim = {
specialIEContainer.outerHTML =
'<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="//download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab" ' +
'id="' + pluginid + '" width="' + width + '" height="' + height + '" class="mejs-shim">' +
'<param name="movie" value="' + options.pluginPath + options.flashName + '?x=' + (new Date().getTime()) + '" />' +
'<param name="movie" value="' + options.pluginPath + options.flashName + '?' + (new Date().getTime()) + '" />' +
'<param name="flashvars" value="' + initVars.join('&amp;') + '" />' +
'<param name="quality" value="high" />' +
'<param name="bgcolor" value="#000000" />' +

File diff suppressed because one or more lines are too long

@ -1,5 +1,9 @@
### Version History
*2.21.2 (2016/05/08)*
* Fixed IE8 compatibility with new security update
*2.21.1 (2016/05/06)*
* Fix YouTube embed functionality from 2.21.0 plugin handling updates @johndyer
@ -8,6 +12,7 @@
*2.21.0 (2016/05/05)*
* Simplified plugin callback functions and querystring checking (security update) @johndyer
* Removed Chrome iframe fullscreen fix (https://github.com/johndyer/mediaelement/pull/1736) @13twelve
* Detect YouTube scheme (https://github.com/johndyer/mediaelement/pull/1730) @silkentrance
* Handle keydown events only for focused mediaelement (https://github.com/johndyer/mediaelement/pull/1732) @lucash
@ -18,7 +23,6 @@
* Support for VAST3 adpods (https://github.com/johndyer/mediaelement/pull/1702) @cherylquirion
* Allow progress to follow configuration (https://github.com/johndyer/mediaelement/pull/1703) @tennety
* YouTube: poster hiding and multi-pause issues (https://github.com/johndyer/mediaelement/pull/1719) @msant7
* Simplified plugin callback functions and querystring checking @johdneyr
* Fix for timerail when duration is over 1 hour #1727 @johndyer
*2.19.1 (2016/02/26)*

@ -1,6 +1,6 @@
{
"name": "webcamjs",
"version": "1.0.6",
"version": "1.0.9",
"homepage": "https://github.com/jhuckaby/webcamjs",
"authors": [
"Joseph Huckaby <jhuckaby@gmail.com>"
@ -21,13 +21,13 @@
"demos",
"flash"
],
"_release": "1.0.6",
"_release": "1.0.9",
"_resolution": {
"type": "version",
"tag": "v1.0.6",
"commit": "d111e71268e6025db0c0eb3bb44194443105dff6"
"tag": "v1.0.9",
"commit": "95609edd8390da09e3cf808ab2b48d7996a155bb"
},
"_source": "git://github.com/jhuckaby/webcamjs.git",
"_source": "https://github.com/jhuckaby/webcamjs.git",
"_target": "1.0.*",
"_originalSource": "webcamjs"
}

@ -10,7 +10,7 @@ Looking for a good alternative to WebcamJS? Please check out [JpegCamera](https
Google Chrome has made it a strict requirement that your website be secure (HTTPS) if you want to access the camera. This change is live in Chrome version 47 and up. So basically, if you want to use WebcamJS, you will need to host your website with SSL / HTTPS. The only alternative is to force Flash fallback mode on Chrome, which is probably not desirable.
See the Chromium docs for details: [https://www.chromium.org/Home/chromium-security/prefer-secure-origins-for-powerful-new-features]
See this Chromium page for details: [https://www.chromium.org/Home/chromium-security/prefer-secure-origins-for-powerful-new-features](https://www.chromium.org/Home/chromium-security/prefer-secure-origins-for-powerful-new-features)
Note that you do not need HTTPS for localhost / 127.0.0.1. Here is the list of rules for Chrome which unlock the camera:
@ -31,7 +31,7 @@ WebcamJS has been tested on the following browsers / operating systems:
| OS | Browser | Notes |
|----|---------|-------|
| Mac OS X | Chrome 30+ | Works |
| Mac OS X | Chrome 30+ | Works -- **Chrome 47+ requires HTTPS** |
| Mac OS X | Firefox 20+ | Works |
| Mac OS X | Safari 6+ | **Requires Adobe Flash Player** |
| Windows | Chrome 30+ | Works -- **Chrome 47+ requires HTTPS** |
@ -107,7 +107,8 @@ If you want to override the default settings, just call `Webcam.set()` and pass
| `force_flash` | false | Setting this to true will always run in Adobe Flash fallback mode. |
| `flip_horiz` | false | Setting this to true will flip the image horizontally (mirror mode). |
| `fps` | 30 | Set the desired fps (frames per second) capture rate. |
| `swfURL` | "./webcam.swf" | Set an alternate location for the Adobe Flash fallback SWF file
| `flashNotDetectedText` | "ERROR: No Adobe Flash Player detected. Webcam.js relies on Flash for browsers that do not support getUserMedia (like yours)." | text/html for flash player not detected.
Here is an example of overriding some parameters. Remember to call this *before* you attach the viewer.
```javascript
@ -155,7 +156,7 @@ Your function is also passed a HTML5 Canvas and a 2D Context object, so you can
```javascript
Webcam.snap( function(data_uri, canvas, context) {
// copy image to my own canvas
myContext.drawImage( context, 0, 0 );
myContext.drawImage( canvas, 0, 0 );
} );
```
@ -245,7 +246,7 @@ The idea here is to provide a photo-booth-like experience, where the user can ta
By default WebcamJS looks for the SWF file in the same directory as the JS file. If you are hosting the SWF in a different location, please set it using the `Webcam.setSWFLocation()` function. It should be on the same domain as your page. Example:
```javascript
Webcam.setSWFLocation("/path/to/the/webcam.swf");
Webcam.set("swfURL", "/path/to/the/webcam.swf");
```
Note that this is only used if the user's browser doesn't support HTML5 getUserMedia, and WebcamJS has to fallback to using an Adobe Flash movie to capture the camera.
@ -269,7 +270,6 @@ Here is a list of all the API function calls available in the WebcamJS library.
| `Webcam.set()` | Set configuration parameters. Pass a key + value, or a hash with multiple keys/values. |
| `Webcam.on()` | Register an event listener for a given event. Pass in the event name, and a callback function. |
| `Webcam.off()` | Remove an event listener for a given event. Pass in the event name, and the callback function to remove. Omit the callback reference to remove *all* listeners. |
| `Webcam.setSWFLocation()` | Set an alternate location for the Adobe Flash fallback SWF file (defaults to JS location). |
| `Webcam.attach()` | Initialize library and attach live camera to specified DOM object. |
| `Webcam.reset()` | Shut down library and reset everything. Must call `attach()` to use it again. Does not remove event listeners. |
| `Webcam.freeze()` | Freeze the current live camera frame, allowing the user to preview before saving. |

@ -1,6 +1,6 @@
{
"name": "webcamjs",
"version": "1.0.6",
"version": "1.0.9",
"homepage": "https://github.com/jhuckaby/webcamjs",
"authors": [
"Joseph Huckaby <jhuckaby@gmail.com>"

@ -1,6 +1,6 @@
{
"name": "webcamjs",
"version": "1.0.6",
"version": "1.0.9",
"description": "HTML5 Webcam Image Capture Library with Flash Fallback",
"author": "Joseph Huckaby <jhuckaby@gmail.com>",
"homepage": "https://github.com/jhuckaby/webcamjs",

@ -1,4 +1,4 @@
// WebcamJS v1.0.6
// WebcamJS v1.0.9
// Webcam library for capturing JPEG/PNG images in JavaScript
// Attempts getUserMedia, falls back to Flash
// Author: Joseph Huckaby: http://github.com/jhuckaby
@ -7,13 +7,37 @@
// Licensed under the MIT License
(function(window) {
var _userMedia;
// declare error types
// inheritance pattern here:
// https://stackoverflow.com/questions/783818/how-do-i-create-a-custom-error-in-javascript
function FlashError() {
var temp = Error.apply(this, arguments);
temp.name = this.name = "FlashError";
this.stack = temp.stack;
this.message = temp.message;
}
function WebcamError() {
var temp = Error.apply(this, arguments);
temp.name = this.name = "WebcamError";
this.stack = temp.stack;
this.message = temp.message;
}
IntermediateInheritor = function() {};
IntermediateInheritor.prototype = Error.prototype;
FlashError.prototype = new IntermediateInheritor();
WebcamError.prototype = new IntermediateInheritor();
var Webcam = {
version: '1.0.6',
version: '1.0.8',
// globals
protocol: location.protocol.match(/https/i) ? 'https' : 'http',
swfURL: '', // URI to webcam.swf movie (defaults to the js location)
loaded: false, // true when webcam movie finishes loading
live: false, // true when webcam is initialized and ready to snap
userMedia: true, // true when getUserMedia is supported natively
@ -29,7 +53,14 @@ var Webcam = {
flip_horiz: false, // flip image horiz (mirror mode)
fps: 30, // camera frames per second
upload_name: 'webcam', // name of file in upload post data
constraints: null // custom user media constraints
constraints: null, // custom user media constraints,
swfURL: '', // URI to webcam.swf movie (defaults to the js location)
flashNotDetectedText: 'ERROR: No Adobe Flash Player detected. Webcam.js relies on Flash for browsers that do not support getUserMedia (like yours).'
},
errors: {
FlashError: FlashError,
WebcamError: WebcamError
},
hooks: {}, // callback hook functions
@ -73,7 +104,7 @@ var Webcam = {
elem = document.getElementById(elem) || document.querySelector(elem);
}
if (!elem) {
return this.dispatch('error', "Could not locate DOM element to attach to.");
return this.dispatch('error', new WebcamError("Could not locate DOM element to attach to."));
}
this.container = elem;
elem.innerHTML = ''; // start with empty element
@ -87,12 +118,21 @@ var Webcam = {
if (!this.params.width) this.params.width = elem.offsetWidth;
if (!this.params.height) this.params.height = elem.offsetHeight;
// make sure we have a nonzero width and height at this point
if (!this.params.width || !this.params.height) {
return this.dispatch('error', new WebcamError("No width and/or height for webcam. Please call set() first, or attach to a visible element."));
}
// set defaults for dest_width / dest_height if not set
if (!this.params.dest_width) this.params.dest_width = this.params.width;
if (!this.params.dest_height) this.params.dest_height = this.params.height;
this.userMedia = _userMedia === undefined ? this.userMedia : _userMedia;
// if force_flash is set, disable userMedia
if (this.params.force_flash) this.userMedia = null;
if (this.params.force_flash) {
_userMedia = this.userMedia;
this.userMedia = null
}
// check for default fps
if (typeof this.params.fps !== "number") this.params.fps = 30;
@ -139,16 +179,18 @@ var Webcam = {
})
.then( function(stream) {
// got access, attach stream to video
video.onloadedmetadata = function(e) {
self.stream = stream;
self.loaded = true;
self.live = true;
self.dispatch('load');
self.dispatch('live');
self.flip();
};
video.src = window.URL.createObjectURL( stream ) || stream;
self.stream = stream;
self.loaded = true;
self.live = true;
self.dispatch('load');
self.dispatch('live');
self.flip();
})
.catch( function(err) {
return self.dispatch('error', "Could not access webcam: " + err.name + ": " + err.message, err);
return self.dispatch('error', err);
});
}
else {
@ -200,7 +242,12 @@ var Webcam = {
delete this.stream;
delete this.video;
}
if (this.userMedia !== true) {
// call for turn off camera in flash
this.getMovie()._releaseCamera();
}
if (this.container) {
this.container.innerHTML = '';
delete this.container;
@ -271,16 +318,23 @@ var Webcam = {
return true;
}
else if (name == 'error') {
if ((args[0] instanceof FlashError) || (args[0] instanceof WebcamError)) {
message = args[0].message;
} else {
message = "Could not access webcam: " + args[0].name + ": " +
args[0].message + " " + args[0].toString();
}
// default error handler if no custom one specified
alert("Webcam.js Error: " + args[0]);
alert("Webcam.js Error: " + message);
}
return false; // no hook defined
},
setSWFLocation: function(url) {
// set location of SWF movie (defaults to webcam.swf in cwd)
this.swfURL = url;
setSWFLocation: function(value) {
// for backward compatibility.
this.set('swfURL', value);
},
detectFlash: function() {
@ -315,22 +369,23 @@ var Webcam = {
getSWFHTML: function() {
// Return HTML for embedding flash based webcam capture movie
var html = '';
var html = '',
swfURL = this.params.swfURL;
// make sure we aren't running locally (flash doesn't work)
if (location.protocol.match(/file/)) {
this.dispatch('error', "Flash does not work from local disk. Please run from a web server.");
this.dispatch('error', new FlashError("Flash does not work from local disk. Please run from a web server."));
return '<h3 style="color:red">ERROR: the Webcam.js Flash fallback does not work from local disk. Please run it from a web server.</h3>';
}
// make sure we have flash
if (!this.detectFlash()) {
this.dispatch('error', "Adobe Flash Player not found. Please install from get.adobe.com/flashplayer and try again.");
return '<h3 style="color:red">ERROR: No Adobe Flash Player detected. Webcam.js relies on Flash for browsers that do not support getUserMedia (like yours).</h3>';
this.dispatch('error', new FlashError("Adobe Flash Player not found. Please install from get.adobe.com/flashplayer and try again."));
return '<h3 style="color:red">' + this.params.flashNotDetectedText + '</h3>';
}
// set default swfURL if not explicitly set
if (!this.swfURL) {
if (!swfURL) {
// find our script tag, and use that base URL
var base_url = '';
var scpts = document.getElementsByTagName('script');
@ -341,8 +396,8 @@ var Webcam = {
idx = len;
}
}
if (base_url) this.swfURL = base_url + '/webcam.swf';
else this.swfURL = 'webcam.swf';
if (base_url) swfURL = base_url + '/webcam.swf';
else swfURL = 'webcam.swf';
}
// if this is the user's first visit, set flashvar so flash privacy settings panel is shown first
@ -359,17 +414,17 @@ var Webcam = {
}
// construct object/embed tag
html += '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" type="application/x-shockwave-flash" codebase="'+this.protocol+'://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" width="'+this.params.width+'" height="'+this.params.height+'" id="webcam_movie_obj" align="middle"><param name="wmode" value="opaque" /><param name="allowScriptAccess" value="always" /><param name="allowFullScreen" value="false" /><param name="movie" value="'+this.swfURL+'" /><param name="loop" value="false" /><param name="menu" value="false" /><param name="quality" value="best" /><param name="bgcolor" value="#ffffff" /><param name="flashvars" value="'+flashvars+'"/><embed id="webcam_movie_embed" src="'+this.swfURL+'" wmode="opaque" loop="false" menu="false" quality="best" bgcolor="#ffffff" width="'+this.params.width+'" height="'+this.params.height+'" name="webcam_movie_embed" align="middle" allowScriptAccess="always" allowFullScreen="false" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" flashvars="'+flashvars+'"></embed></object>';
html += '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" type="application/x-shockwave-flash" codebase="'+this.protocol+'://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" width="'+this.params.width+'" height="'+this.params.height+'" id="webcam_movie_obj" align="middle"><param name="wmode" value="opaque" /><param name="allowScriptAccess" value="always" /><param name="allowFullScreen" value="false" /><param name="movie" value="'+swfURL+'" /><param name="loop" value="false" /><param name="menu" value="false" /><param name="quality" value="best" /><param name="bgcolor" value="#ffffff" /><param name="flashvars" value="'+flashvars+'"/><embed id="webcam_movie_embed" src="'+swfURL+'" wmode="opaque" loop="false" menu="false" quality="best" bgcolor="#ffffff" width="'+this.params.width+'" height="'+this.params.height+'" name="webcam_movie_embed" align="middle" allowScriptAccess="always" allowFullScreen="false" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" flashvars="'+flashvars+'"></embed></object>';
return html;
},
getMovie: function() {
// get reference to movie object/embed in DOM
if (!this.loaded) return this.dispatch('error', "Flash Movie is not loaded yet");
if (!this.loaded) return this.dispatch('error', new FlashError("Flash Movie is not loaded yet"));
var movie = document.getElementById('webcam_movie_obj');
if (!movie || !movie._snap) movie = document.getElementById('webcam_movie_embed');
if (!movie) this.dispatch('error', "Cannot locate Flash movie in DOM");
if (!movie) this.dispatch('error', new FlashError("Cannot locate Flash movie in DOM"));
return movie;
},
@ -504,9 +559,9 @@ var Webcam = {
var self = this;
var params = this.params;
if (!this.loaded) return this.dispatch('error', "Webcam is not loaded yet");
// if (!this.live) return this.dispatch('error', "Webcam is not live yet");
if (!user_callback) return this.dispatch('error', "Please provide a callback function or canvas to snap()");
if (!this.loaded) return this.dispatch('error', new WebcamError("Webcam is not loaded yet"));
// if (!this.live) return this.dispatch('error', new WebcamError("Webcam is not live yet"));
if (!user_callback) return this.dispatch('error', new WebcamError("Please provide a callback function or canvas to snap()"));
// if we have an active preview freeze, use that
if (this.preview_active) {
@ -611,12 +666,11 @@ var Webcam = {
// camera is live and ready to snap
this.live = true;
this.dispatch('live');
this.flip();
break;
case 'error':
// Flash error
this.dispatch('error', msg);
this.dispatch('error', new FlashError(msg));
break;
default:

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save