Merge branch 'hotfixes'

Author: RubaXa

dist/FileAPI.flash.swf

@@ -1,4 +1,4 @@
-/*! FileAPI 2.0.15 - BSD | git://github.com/mailru/FileAPI.git
+/*! FileAPI 2.0.16 - 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.
  */
 
@@ -283,7 +283,7 @@
  * FileAPI (core object)
  */
 api = {
-version: '2.0.15',
+version: '2.0.16',
 
 cors: false,
 html5: true,
@@ -1366,7 +1366,13 @@
 queue.inc();
 
 file.toData(function (err, image){
-// @todo: error
+// @todo: требует рефакторинга и обработки ошибки
+if (file.file) {
+image.type = file.file.type;
+image.quality = file.matrix.quality;
+filename = file.file && file.file.name;
+}
+
 filename = filename || (new Date).getTime()+'.png';
 
 _addFile(image);

dist/FileAPI.html5.js

@@ -1,4 +1,4 @@
-/*! FileAPI 2.0.15 - BSD | git://github.com/mailru/FileAPI.git
+/*! FileAPI 2.0.16 - 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.
  */
 
@@ -283,7 +283,7 @@
  * FileAPI (core object)
  */
 api = {
-version: '2.0.15',
+version: '2.0.16',
 
 cors: false,
 html5: true,
@@ -1366,7 +1366,13 @@
 queue.inc();
 
 file.toData(function (err, image){
-// @todo: error
+// @todo: требует рефакторинга и обработки ошибки
+if (file.file) {
+image.type = file.file.type;
+image.quality = file.matrix.quality;
+filename = file.file && file.file.name;
+}
+
 filename = filename || (new Date).getTime()+'.png';
 
 _addFile(image);

dist/FileAPI.html5.min.js

@@ -75,7 +75,7 @@ package ru.mail.data.vo
 if ( fileNameParts.length < 2 )
 return fileName;
 
-return fileNameParts[0] + 'png';
+return fileNameParts[0] + '.png';
 }
 }
 
@@ -84,4 +84,4 @@ package ru.mail.data.vo
 super();
 }
 }
-}
+}

dist/FileAPI.js

@@ -45,6 +45,8 @@
 _rdata = /^data:[^,]+,/,
 
 _toString = {}.toString,
+_supportConsoleLog,
+_supportConsoleLogApply,
 
 
 Math = window.Math,
@@ -189,7 +191,7 @@
  * FileAPI (core object)
  */
 api = {
-version: '2.0.15',
+version: '2.0.16',
 
 cors: false,
 html5: true,
@@ -249,8 +251,8 @@
 },
 
 log: function (){
-if( api.debug && window.console && console.log ){
-if( console.log.apply ){
+if( api.debug && _supportConsoleLog ){
+if( _supportConsoleLogApply ){
 console.log.apply(console, arguments);
 }
 else {
@@ -1272,7 +1274,13 @@
 queue.inc();
 
 file.toData(function (err, image){
-// @todo: error
+// @todo: требует рефакторинга и обработки ошибки
+if (file.file) {
+image.type = file.file.type;
+image.quality = file.matrix.quality;
+filename = file.file && file.file.name;
+}
+
 filename = filename || (new Date).getTime()+'.png';
 
 _addFile(image);
@@ -1787,7 +1795,13 @@
 });
 
 
-// @configuration
+// Configuration
+try {
+_supportConsoleLog = !!console.log;
+_supportConsoleLogApply = !!console.log.apply;
+}
+catch (err) {}
+
 if( !api.flashUrl ){ api.flashUrl = api.staticPath + 'FileAPI.flash.swf'; }
 if( !api.flashImageUrl ){ api.flashImageUrl = api.staticPath + 'FileAPI.flash.image.swf'; }
 if( !api.flashWebcamUrl ){ api.flashWebcamUrl = api.staticPath + 'FileAPI.flash.camera.swf'; }

dist/FileAPI.min.js

@@ -1,7 +1,7 @@
 {
  "name": "fileapi",
  "exportName": "FileAPI",
- "version": "2.0.15",
+ "version": "2.0.16",
  "devDependencies": {
  "connect-busboy": "~0.0.2",
  "eventemitter2": "~0.4.13",