+ merge master

Author: RubaXa

.travis.yml

@@ -1,6 +1,5 @@
 language: node_js
 node_js:
- - 0.8
  - 0.10
 before_script:
  - npm install -g grunt-cli

Gruntfile.js

@@ -38,17 +38,28 @@ module.exports = function (grunt){
 src: 'lib/FileAPI.core.js'
 },
 
+connect: {
+server: {
+options: {
+port: 9001,
+base: '.'
+}
+}
+},
+
 qunit: {
-options: {
-files: {
- '1px.gif':['tests/files/1px.gif']
-, 'hello.txt':['tests/files/hello.txt']
-, 'image.jpg':['tests/files/image.jpg']
-, 'dino.png':['tests/files/dino.png']
-, 'multiple':['tests/files/1px.gif', 'tests/files/hello.txt', 'tests/files/image.jpg', 'tests/files/dino.png', 'tests/files/lebowski.json']
+all: {
+options: {
+files: {
+ '1px.gif':['tests/files/1px.gif']
+, 'hello.txt':['tests/files/hello.txt']
+, 'image.jpg':['tests/files/image.jpg']
+, 'dino.png':['tests/files/dino.png']
+, 'multiple':['tests/files/1px.gif', 'tests/files/hello.txt', 'tests/files/image.jpg', 'tests/files/dino.png', 'tests/files/lebowski.json']
+},
+urls: ['http://127.0.0.1:<%=connect.server.options.port%>/tests/index.html']
 }
-},
-all: ['tests/*.html']
+}
 },
 
 concat: {
@@ -62,10 +73,10 @@ module.exports = function (grunt){
 
 all: {
 src: [
- 'lib/canvas-to-blob.js' // only frist
+ 'lib/canvas-to-blob.js'
 , 'lib/FileAPI.core.js'
 , 'lib/FileAPI.Image.js'
-, 'lib/load-image-ios.js' // after FileAPI.Image
+, 'lib/load-image-ios.js'
 , 'lib/FileAPI.Form.js'
 , 'lib/FileAPI.XHR.js'
 , 'lib/FileAPI.Camera.js'
@@ -76,10 +87,10 @@ module.exports = function (grunt){
 
 html5: {
 src: [
- 'lib/canvas-to-blob.js' // only frist
+ 'lib/canvas-to-blob.js'
 , 'lib/FileAPI.core.js'
 , 'lib/FileAPI.Image.js'
-, 'lib/load-image-ios.js' // after FileAPI.Image
+, 'lib/load-image-ios.js'
 , 'lib/FileAPI.Form.js'
 , 'lib/FileAPI.XHR.js'
 , 'lib/FileAPI.Camera.js'
@@ -114,12 +125,13 @@ module.exports = function (grunt){
 grunt.loadNpmTasks('grunt-contrib-concat');
 grunt.loadNpmTasks('grunt-contrib-uglify');
 grunt.loadNpmTasks('grunt-contrib-watch');
+grunt.loadNpmTasks('grunt-contrib-connect');
 
 // Load custom QUnit task, based on grunt-contrib-qunit, but support "files" option.
 grunt.loadTasks('./tests/grunt-task/');
 
 // "npm build" runs these tasks
-grunt.registerTask('test', ['jshint', 'concat', 'qunit']);
-grunt.registerTask('build', ['version', 'concat', 'uglify', 'qunit']);
-grunt.registerTask('default', ['jshint', 'build']);
+grunt.registerTask('tests', ['jshint', 'concat', 'connect', 'qunit']);
+grunt.registerTask('build', ['version', 'concat', 'uglify']);
+grunt.registerTask('default', ['tests', 'build']);
 };

README.md

@@ -1,5 +1,5 @@
 <a name="FileAPI"></a>
-## FileAPI
+## FileAPI <img src="https://api.travis-ci.org/mailru/FileAPI.png?branch=master"/>
 A set of javascript tools for working with files.
 
 <a name="started"></a>
@@ -867,12 +867,12 @@ FileAPI.Image(imageFile)
 ---
 
 <a name="FileAPI.Image.resize"></a>
-### resize(width`:Number`, height`:Number`[, type`:String`])`:FileAPI.Image`
+### resize(width`:Number`, height`:Number`[, strategy`:String`])`:FileAPI.Image`
 Resize image.
 
 * width — new image width
 * height — new image height
-* type — enum: `min`, `max`, `preview`. By default `undefined`.
+* strategy — enum: `min`, `max`, `preview`. By default `undefined`.
 
 ```js
 FileAPI.Image(imageFile)
@@ -1284,10 +1284,16 @@ Submit Query
 <script>
 (function (ctx, jsonp){
 'use strict';
-if( ctx && ctx[jsonp] ){
-ctx[jsonp](200/*http.status*/, 'OK' /*http.statusText*/, "response body");
+var status = {{httpStatus}}, statusText = "{{httpStatusText}}", response = "{{responseBody}}";
+try {
+ctx[jsonp](status, statusText, response);
+} catch (e){
+var data = "{\"id\":\""+jsonp+"\",\"status\":"+status+",\"statusText\":\""+statusText+"\",\"response\":\""+response.replace(/\"/g, '\\\\\"')+"\"}";
+try {
+ctx.postMessage(data, document.referrer);
+} catch (e){}
 }
-})(window, '{{$request_param_callback}}');
+})(window.parent, '{{request_param_callback}}');
 </script>
 
 <!-- or -->
@@ -1496,6 +1502,28 @@ Button like link.
 
 <a name="Changelog"></a>
 ## Changelog
+<ul>
+<li>+ QUnit-tests for iframe-transport</li>
+<li>+ `postMessage` for iframe-transport</li>
+<li>+ `jsonp: "callback"` option</li>
+<li>* resize: `imageTransform.type` rename to `imageTransform.strategy` (!!!)</li>
+</ul>
+
+### 2.0.2
+<ul>
+<li>+ test: upload headers</li>
+<li>+ test: upload + camanjs</li>
+<li>+ test: upload + autoOrientation</li>
+<li>FileAPI.class.php: + HTTP header Content-Type: application/json</li>
+<li>#143: + `FileAPI.flashWebcamUrl` option</li>
+<li>* merge v1.2.7</li>
+<li>+ `FileAPI.formData: true` option</li>
+</il>
+
+### 2.0.1
+<ul>
+<li>+ support 'filter' prop in imageTransform</li>
+</il>
 
 ### 2.1.0
 <ul>

README.ru.md

@@ -866,12 +866,12 @@ FileAPI.Image(imageFile)
 ---
 
 <a name="FileAPI.Image.resize"></a>
-### resize(width`:Number`, height`:Number`[, type`:String`])`:FileAPI.Image`
+### resize(width`:Number`, height`:Number`[, strategy`:String`])`:FileAPI.Image`
 Ресайз.
 
 * width — новая ширина
 * height — новая высота
-* type — enum: `min`, `max`, `preview`. По умолчанию `undefined`.
+* strategy — enum: `min`, `max`, `preview`. По умолчанию `undefined`.
 
 ```js
 FileAPI.Image(imageFile)
@@ -1283,10 +1283,16 @@ Submit Query
 <script>
 (function (ctx, jsonp){
 'use strict';
-if( ctx && ctx[jsonp] ){
-ctx[jsonp](200/*http.status*/, 'OK' /*http.statusText*/, "response body");
+var status = {{httpStatus}}, statusText = "{{httpStatusText}}", response = "{{responseBody}}";
+try {
+ctx[jsonp](status, statusText, response);
+} catch (e){
+var data = "{\"id\":\""+jsonp+"\",\"status\":"+status+",\"statusText\":\""+statusText+"\",\"response\":\""+response.replace(/\"/g, '\\\\\"')+"\"}";
+try {
+ctx.postMessage(data, document.referrer);
+} catch (e){}
 }
-})(window, '{{$request_param_callback}}');
+})(window.parent, '{{request_param_callback}}');
 </script>
 
 <!-- or -->