Skip to content

Commit 1736e45

Browse files
RubaXaRubaXa
committed
v2.0.17: Debug Mode vs. IE
1 parent e24dc9e commit 1736e45

File tree

7 files changed

+41
-18
lines changed

7 files changed

+41
-18
lines changed

‎README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,13 @@ Button like link.
13951395
<a name="Changelog"></a>
13961396
## Changelog
13971397
1398+
### 2.0.16-2.0.17
1399+
<ul>
1400+
<li>#353: debug mode vs. IE</li>
1401+
<li>#352: correct filename via flash-uploading</li>
1402+
</ul>
1403+
1404+
13981405
### 2.0.12-2.0.15 (!)
13991406
<ul>
14001407
<li>#346, #342, #344: fixes for XSS into Flash-transport</li>

‎dist/FileAPI.html5.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! FileAPI 2.0.16 - BSD | git://github.com/mailru/FileAPI.git
1+
/*! FileAPI 2.0.17 - BSD | git://github.com/mailru/FileAPI.git
22
* 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.
33
*/
44

@@ -139,6 +139,8 @@
139139
_rdata = /^data:[^,]+,/,
140140

141141
_toString = {}.toString,
142+
_supportConsoleLog,
143+
_supportConsoleLogApply,
142144

143145

144146
Math = window.Math,
@@ -283,7 +285,7 @@
283285
* FileAPI (core object)
284286
*/
285287
api = {
286-
version: '2.0.16',
288+
version: '2.0.17',
287289

288290
cors: false,
289291
html5: true,
@@ -343,8 +345,8 @@
343345
},
344346

345347
log: function (){
346-
if( api.debug && window.console && console.log ){
347-
if( console.log.apply ){
348+
if( api.debug && _supportConsoleLog ){
349+
if( _supportConsoleLogApply ){
348350
console.log.apply(console, arguments);
349351
}
350352
else {
@@ -1887,7 +1889,13 @@
18871889
});
18881890

18891891

1890-
// @configuration
1892+
// Configuration
1893+
try {
1894+
_supportConsoleLog = !!console.log;
1895+
_supportConsoleLogApply = !!console.log.apply;
1896+
}
1897+
catch (err) {}
1898+
18911899
if( !api.flashUrl ){ api.flashUrl = api.staticPath + 'FileAPI.flash.swf'; }
18921900
if( !api.flashImageUrl ){ api.flashImageUrl = api.staticPath + 'FileAPI.flash.image.swf'; }
18931901
if( !api.flashWebcamUrl ){ api.flashWebcamUrl = api.staticPath + 'FileAPI.flash.camera.swf'; }

‎dist/FileAPI.html5.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/FileAPI.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! FileAPI 2.0.16 - BSD | git://github.com/mailru/FileAPI.git
1+
/*! FileAPI 2.0.17 - BSD | git://github.com/mailru/FileAPI.git
22
* 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.
33
*/
44

@@ -139,6 +139,8 @@
139139
_rdata = /^data:[^,]+,/,
140140

141141
_toString = {}.toString,
142+
_supportConsoleLog,
143+
_supportConsoleLogApply,
142144

143145

144146
Math = window.Math,
@@ -283,7 +285,7 @@
283285
* FileAPI (core object)
284286
*/
285287
api = {
286-
version: '2.0.16',
288+
version: '2.0.17',
287289

288290
cors: false,
289291
html5: true,
@@ -343,8 +345,8 @@
343345
},
344346

345347
log: function (){
346-
if( api.debug && window.console && console.log ){
347-
if( console.log.apply ){
348+
if( api.debug && _supportConsoleLog ){
349+
if( _supportConsoleLogApply ){
348350
console.log.apply(console, arguments);
349351
}
350352
else {
@@ -1887,7 +1889,13 @@
18871889
});
18881890

18891891

1890-
// @configuration
1892+
// Configuration
1893+
try {
1894+
_supportConsoleLog = !!console.log;
1895+
_supportConsoleLogApply = !!console.log.apply;
1896+
}
1897+
catch (err) {}
1898+
18911899
if( !api.flashUrl ){ api.flashUrl = api.staticPath + 'FileAPI.flash.swf'; }
18921900
if( !api.flashImageUrl ){ api.flashImageUrl = api.staticPath + 'FileAPI.flash.image.swf'; }
18931901
if( !api.flashWebcamUrl ){ api.flashWebcamUrl = api.staticPath + 'FileAPI.flash.camera.swf'; }

‎dist/FileAPI.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/FileAPI.core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
* FileAPI (core object)
192192
*/
193193
api = {
194-
version: '2.0.16',
194+
version: '2.0.17',
195195

196196
cors: false,
197197
html5: true,

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "fileapi",
33
"exportName": "FileAPI",
4-
"version": "2.0.16",
4+
"version": "2.0.17",
55
"devDependencies": {
66
"connect-busboy": "~0.0.2",
77
"eventemitter2": "~0.4.13",

0 commit comments

Comments
 (0)