#289: * WebCam & html5 == false

Author: RubaXa

Gruntfile.js

@@ -187,6 +187,7 @@ module.exports = function (grunt) {
 }
 });
 
+grunt.registerTask('dev', ['concat', 'watch']);
 grunt.registerTask('tests', ['jshint', 'concat', 'connect:server','prepare-test-files', 'qunit']);
 grunt.registerTask('build', ['version', 'concat', 'uglify']);
 grunt.registerTask('build-all', ['build', 'mxmlc']);

README.md

@@ -1395,6 +1395,11 @@ Button like link.
 <a name="Changelog"></a>
 ## Changelog
 
+### 2.0.10
+<ul>
+<li>#289: * WebCam & html5 == false</li>
+</ul>
+
 
 ### 2.0.9
 <ul>

dist/FileAPI.html5.js

@@ -1,4 +1,4 @@
-/*! FileAPI 2.0.9 - BSD | git://github.com/mailru/FileAPI.git
+/*! FileAPI 2.0.10 - BSD | git://github.com/mailru/FileAPI.git
  * FileAPI — a set of javascript tools for working with files. Multiupload, drag'n'drop and chunked file upload. Images: crop, resize and auto orientation by EXIF.
  */
 
@@ -280,7 +280,7 @@
  * FileAPI (core object)
  */
 api = {
-version: '2.0.9',
+version: '2.0.10',
 
 cors: false,
 html5: true,
@@ -3333,10 +3333,8 @@
  var _each = api.each,
  _cameraQueue = [];
 
-
- if (api.support.flash && (api.media && !api.support.media)) {
+ if (api.support.flash && (api.media && (!api.support.media || !api.html5))) {
  (function () {
-
  function _wrap(fn) {
  var id = fn.wid = api.uid();
  api.Flash._fn[id] = fn;

dist/FileAPI.html5.min.js

@@ -1,4 +1,4 @@
-/*! FileAPI 2.0.9 - BSD | git://github.com/mailru/FileAPI.git
+/*! FileAPI 2.0.10 - BSD | git://github.com/mailru/FileAPI.git
  * FileAPI — a set of javascript tools for working with files. Multiupload, drag'n'drop and chunked file upload. Images: crop, resize and auto orientation by EXIF.
  */
 
@@ -280,7 +280,7 @@
  * FileAPI (core object)
  */
 api = {
-version: '2.0.9',
+version: '2.0.10',
 
 cors: false,
 html5: true,
@@ -4125,10 +4125,8 @@
  var _each = api.each,
  _cameraQueue = [];
 
-
- if (api.support.flash && (api.media && !api.support.media)) {
+ if (api.support.flash && (api.media && (!api.support.media || !api.html5))) {
  (function () {
-
  function _wrap(fn) {
  var id = fn.wid = api.uid();
  api.Flash._fn[id] = fn;

dist/FileAPI.js

@@ -11,10 +11,8 @@
  var _each = api.each,
  _cameraQueue = [];
 
-
- if (api.support.flash && (api.media && !api.support.media)) {
+ if (api.support.flash && (api.media && (!api.support.media || !api.html5))) {
  (function () {
-
  function _wrap(fn) {
  var id = fn.wid = api.uid();
  api.Flash._fn[id] = fn;

dist/FileAPI.min.js

@@ -186,7 +186,7 @@
  * FileAPI (core object)
  */
 api = {
-version: '2.0.9',
+version: '2.0.10',
 
 cors: false,
 html5: true,

lib/FileAPI.Flash.Camera.js

@@ -1,7 +1,7 @@
 {
  "name": "fileapi",
  "exportName": "FileAPI",
- "version": "2.0.9",
+ "version": "2.0.10",
  "devDependencies": {
  "grunt": "~0.4.5",
  "grunt-version": "~0.3.0",