Merge pull request mailru#248 from galanin/width-height

+ resize strategies: 'width', 'height' (v2.0.8)

Author: RubaXa

README.md

@@ -773,7 +773,7 @@ Resize image.
 
 * width — new image width
 * height — new image height
-* strategy — enum: `min`, `max`, `preview`. By default `undefined`.
+* strategy — enum: `min`, `max`, `preview`, `width`, `height`. By default `undefined`.
 
 ```js
 FileAPI.Image(imageFile)
@@ -790,6 +790,14 @@ FileAPI.Image(imageFile)
 
 })
 ;
+
+// Resize image on by fixed height.
+FileAPI.Image(imageFile)
+.resize(240, 'height')
+.get(function (err/**String*/, img/**HTMLElement*/){
+
+})
+;
 ```
 
 ---
@@ -1388,6 +1396,11 @@ Button like link.
 ## Changelog
 
 
+### 2.0.8 
+<ul>
+<li>Two new resize strategies `width` and `height`</li>
+</ul>
+
 ### 2.0.7
 <ul>
 <li>#214: iframe transport under IE8</li>

README.ru.md

@@ -752,7 +752,7 @@ FileAPI.Image(imageFile)
 
 * width — новая ширина
 * height — новая высота
-* strategy — enum: `min`, `max`, `preview`. По умолчанию `undefined`.
+* strategy — enum: `min`, `max`, `preview`, `width`, `height`. По умолчанию `undefined`.
 
 ```js
 FileAPI.Image(imageFile)
@@ -769,6 +769,14 @@ FileAPI.Image(imageFile)
 
 })
 ;
+
+// По заданной высоте.
+FileAPI.Image(imageFile)
+.resize(240, 'height')
+.get(function (err/**String*/, img/**HTMLElement*/){
+
+})
+;
 ```
 
 ---

dist/FileAPI.html5.js

@@ -1,4 +1,4 @@
-/*! FileAPI 2.0.7 - BSD | git://github.com/mailru/FileAPI.git
+/*! FileAPI 2.0.8 - 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.
  */
 
@@ -278,7 +278,7 @@
  * FileAPI (core object)
  */
 api = {
-version: '2.0.7',
+version: '2.0.8',
 
 cors: false,
 html5: true,
@@ -1864,7 +1864,7 @@
 },
 
 resize: function (w, h, strategy){
-if( /min|max/.test(h) ){
+if( /min|max|height|width/.test(h) ){
 strategy = h;
 h = w;
 }
@@ -2047,6 +2047,12 @@
 }
 }
 }
+else if( strategy == 'height' ){
+dw = dh * sf;
+}
+else if( strategy == 'width' ){
+dh = dw / sf;
+}
 else if( strategy ){
 if( !(sw > dw || sh > dh) ){
 dw = sw;

dist/FileAPI.html5.min.js

@@ -1,4 +1,4 @@
-/*! FileAPI 2.0.7 - BSD | git://github.com/mailru/FileAPI.git
+/*! FileAPI 2.0.8 - 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.
  */
 
@@ -278,7 +278,7 @@
  * FileAPI (core object)
  */
 api = {
-version: '2.0.7',
+version: '2.0.8',
 
 cors: false,
 html5: true,
@@ -1864,7 +1864,7 @@
 },
 
 resize: function (w, h, strategy){
-if( /min|max/.test(h) ){
+if( /min|max|height|width/.test(h) ){
 strategy = h;
 h = w;
 }
@@ -2047,6 +2047,12 @@
 }
 }
 }
+else if( strategy == 'height' ){
+dw = dh * sf;
+}
+else if( strategy == 'width' ){
+dh = dw / sf;
+}
 else if( strategy ){
 if( !(sw > dw || sh > dh) ){
 dw = sw;
@@ -3491,8 +3497,8 @@
 _css(dummy, {
  top: 0
 , left: 0
-, width: target.offsetWidth + 100
-, height: target.offsetHeight + 100
+, width: target.offsetWidth
+, height: target.offsetHeight
 , zIndex: 1e6+'' // set max zIndex
 , position: 'absolute'
 });

dist/FileAPI.js

@@ -73,7 +73,7 @@
 },
 
 resize: function (w, h, strategy){
-if( /min|max/.test(h) ){
+if( /min|max|height|width/.test(h) ){
 strategy = h;
 h = w;
 }
@@ -256,6 +256,12 @@
 }
 }
 }
+else if( strategy == 'height' ){
+dw = dh * sf;
+}
+else if( strategy == 'width' ){
+dh = dw / sf;
+}
 else if( strategy ){
 if( !(sw > dw || sh > dh) ){
 dw = sw;

dist/FileAPI.min.js

@@ -184,7 +184,7 @@
  * FileAPI (core object)
  */
 api = {
-version: '2.0.7',
+version: '2.0.8',
 
 cors: false,
 html5: true,

lib/FileAPI.Image.js

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

lib/FileAPI.core.js

@@ -521,6 +521,34 @@ module('FileAPI');
 }
 });
 
+// strategy: 'height'
+queue.inc();
+FileAPI.upload({
+url: 'http://rubaxa.org/FileAPI/server/ctrl.php',
+files: { image: file },
+imageTransform: { width: 100, height: 100, strategy: 'height' },
+complete: function (err, res){
+queue.next();
+var res = FileAPI.parseJSON(res.responseText);
+equal(res.images['image'].width, 141, 'height.width');
+equal(res.images['image'].height, 100, 'height.height');
+}
+});
+
+// strategy: 'width'
+queue.inc();
+FileAPI.upload({
+url: 'http://rubaxa.org/FileAPI/server/ctrl.php',
+files: { image: file },
+imageTransform: { width: 100, height: 100, strategy: 'width' },
+complete: function (err, res){
+queue.next();
+var res = FileAPI.parseJSON(res.responseText);
+equal(res.images['image'].width, 100, 'width.width');
+equal(res.images['image'].height, 70, 'width.height');
+}
+});
+
 // preview
 queue.inc();
 FileAPI.upload({