v. 0.7-alpha, readme/reference/config/examples updates

Author: Nikos M

api-reference.md

@@ -14,15 +14,15 @@ Change the dependencies file(s) to include your own selection of filters and plu
 ###Image Class
 
 ````javascript
-new FILTER.Image(uRLOrImageOrCanvasOrVideo);
+new FILTER.Image([ImageOrCanvasOrVideoOrFilterImageInstance]);
 ````
 
 This is a placeholder for an image, along with basic methods to access the image data
 and alter them. 
 
 __Methods:__
 
-* _setImage(ImageOrCanvasOrVideoorFilterImageInstance)_  Sets/Alters the underlying image
+* _setImage(ImageOrCanvasOrVideoOrFilterImageInstance)_  Sets/Alters the underlying image
 * _select(x1, y1, x2, y2)_  set a rectangle as selected part of image (any filters will be applied only to that part)
 * _deselect()_  remove previous selection (selected part becomes whole image)
 * _store()_  store the current filtered/processed image as the original image
@@ -49,7 +49,7 @@ __Methods:__
 ###ScaledImage Class
 
 ````javascript
-new FILTER.ScaledImage(scaleX, scaleY, ImageOrCanvasOrVideoorFilterImageInstance);
+new FILTER.ScaledImage(scaleX, scaleY [, ImageOrCanvasOrVideoOrFilterImageInstance]);
 ````
 
 This is a placeholder for an image, which is automatically up/down scaled (for faster processing). It is a subclass of FILTER.Image and shares the same common methods.
@@ -63,7 +63,7 @@ __Methods:__
 ###Loader / ImageLoader Classes
 
 ````javascript
-filterImageInstance = new FILTER.ImageLoader().load(imageUrl [, onLoad, onProgres, onError]);
+filterImageInstance = new FILTER.ImageLoader().load(imageUrl [, onLoad, onProgress, onError]);
 ````
 
 Loads an image url into a FILTER.Image instance. 

build/filter.bundle.js

@@ -1637,106 +1637,6 @@ var FILTER = exports['FILTER'] = {
 
 }(FILTER);/**
 *
-* Filter Loader Class(es)
-* @package FILTER.js
-*
-**/
-!function(FILTER, undef){
-    "use strict";
-
-    var FilterImage = FILTER.Image, Class = FILTER.Class, ON = 'addEventListener';
-
-    var Loader = FILTER.Loader = Class({
-        name: "Loader",
-        
-        constructor: function Loader() {
-            if ( !(this instanceof Loader) )
-                return new Loader();
-        },
-        
-        // override in sub-classes
-        load: function( url, onLoad, onProgress, onError ){
-            return null;
-        },
-
-        _crossOrigin: null,
-        _responseType: null,
-        
-        responseType: function ( value ) {
-            if ( arguments.length )
-            {
-                this._responseType = value;
-                return this;
-            }
-            return this._responseType;
-        },
-
-        crossOrigin: function ( value ) {
-            if ( arguments.length )
-            {
-                this._crossOrigin = value;
-                return this;
-            }
-            return this._crossOrigin;
-        }
-    });
-
-    var XHRLoader = FILTER.XHRLoader = Class(Loader, {
-        name: "XHRLoader",
-        
-        constructor: function XHRLoader() {
-            if ( !(this instanceof XHRLoader) )
-                return new XHRLoader();
-        },
-        
-        load: function ( url, onLoad, onProgress, onError ) {
-            var scope = this, request = new XMLHttpRequest( );
-            request.open( 'GET', url, true );
-            request[ON]('load', function ( event ) {
-                if ( onLoad ) onLoad( this.response );
-            }, false);
-            if ( 'function' === typeof onProgress ) request[ON]('progress', onProgress, false);
-            if ( 'function' === typeof onError ) request[ON]('error', onError, false);
-            if ( scope._crossOrigin ) request.crossOrigin = scope._crossOrigin;
-            if ( scope._responseType ) request.responseType = scope._responseType;
-            request.send( null );
-            return scope;
-        }
-    });
-
-    FILTER.BinaryLoader = Class(Loader, {
-        name: "BinaryLoader",
-        
-        constructor: function BinaryLoader() {
-            if ( !(this instanceof BinaryLoader) )
-                return new BinaryLoader();
-        },
-        
-        _parser: null,
-        
-        load: function( url, onLoad, onProgress, onError ){
-            var scope = this, loader, 
-                image = new FilterImage( )
-            ;
-            
-            if ( 'function' === typeof scope._parser )
-            {
-                loader = new XHRLoader( )
-                    .responseType( scope._responseType || 'arraybuffer' )
-                    .load( url, function( buffer ) {
-                        var imData = scope._parser( buffer );
-                        if ( !imData ) return;
-                        image.setImage(imData);
-                        if ( 'function' === typeof onLoad ) onLoad(image, imData);
-                    }, onProgress, onError )
-                ;
-            }
-            return image;
-        }
-
-    });    
-}(FILTER);/**
-*
 * Image Canvas Class
 * @package FILTER.js
 *
@@ -2579,6 +2479,106 @@ var FILTER = exports['FILTER'] = {
 
 }(FILTER);/**
 *
+* Filter Loader Class(es)
+* @package FILTER.js
+*
+**/
+!function(FILTER, undef){
+    "use strict";
+
+    var FilterImage = FILTER.Image, Class = FILTER.Class, ON = 'addEventListener';
+
+    var Loader = FILTER.Loader = Class({
+        name: "Loader",
+        
+        constructor: function Loader() {
+            if ( !(this instanceof Loader) )
+                return new Loader();
+        },
+        
+        // override in sub-classes
+        load: function( url, onLoad, onProgress, onError ){
+            return null;
+        },
+
+        _crossOrigin: null,
+        _responseType: null,
+        
+        responseType: function ( value ) {
+            if ( arguments.length )
+            {
+                this._responseType = value;
+                return this;
+            }
+            return this._responseType;
+        },
+
+        crossOrigin: function ( value ) {
+            if ( arguments.length )
+            {
+                this._crossOrigin = value;
+                return this;
+            }
+            return this._crossOrigin;
+        }
+    });
+
+    var XHRLoader = FILTER.XHRLoader = Class(Loader, {
+        name: "XHRLoader",
+        
+        constructor: function XHRLoader() {
+            if ( !(this instanceof XHRLoader) )
+                return new XHRLoader();
+        },
+        
+        load: function ( url, onLoad, onProgress, onError ) {
+            var scope = this, request = new XMLHttpRequest( );
+            request.open( 'GET', url, true );
+            request[ON]('load', function ( event ) {
+                if ( onLoad ) onLoad( this.response );
+            }, false);
+            if ( 'function' === typeof onProgress ) request[ON]('progress', onProgress, false);
+            if ( 'function' === typeof onError ) request[ON]('error', onError, false);
+            if ( scope._crossOrigin ) request.crossOrigin = scope._crossOrigin;
+            if ( scope._responseType ) request.responseType = scope._responseType;
+            request.send( null );
+            return scope;
+        }
+    });
+
+    FILTER.BinaryLoader = Class(Loader, {
+        name: "BinaryLoader",
+        
+        constructor: function BinaryLoader() {
+            if ( !(this instanceof BinaryLoader) )
+                return new BinaryLoader();
+        },
+        
+        _parser: null,
+        
+        load: function( url, onLoad, onProgress, onError ){
+            var scope = this, loader, 
+                image = new FilterImage( )
+            ;
+            
+            if ( 'function' === typeof scope._parser )
+            {
+                loader = new XHRLoader( )
+                    .responseType( scope._responseType || 'arraybuffer' )
+                    .load( url, function( buffer ) {
+                        var imData = scope._parser( buffer );
+                        if ( !imData ) return;
+                        image.setImage(imData);
+                        if ( 'function' === typeof onLoad ) onLoad(image, imData);
+                    }, onProgress, onError )
+                ;
+            }
+            return image;
+        }
+
+    });    
+}(FILTER);/**
+*
 * Filter (HTML)ImageLoader Class
 * @package FILTER.js
 *

build/filter.js

@@ -22,10 +22,10 @@ tasks =[{}]
             ./src/FILTER.js
             ./src/core/Filter.js
             ./src/core/Color.js
-            ./src/core/Loader.js
             ./src/core/Image.js
+            ./src/core/Loader.js
 
-            # image Loaders
+            # image loaders for various image formats
             ./src/loaders/ImageLoader.js
 
             # generic Filters
@@ -46,9 +46,9 @@ tasks =[{}]
             # webgl generic Filters (TODO)
             #./src/filters/WebGLFilter.js
             #./src/filters/webgl/ColorMatrixFilter.js
+            #./src/filters/webgl/ConvolutionMatrixFilter.js
             #./src/filters/webgl/DisplacementMapFilter.js
             #./src/filters/webgl/GeometricMapFilter.js
-            #./src/filters/webgl/ConvolutionMatrixFilter.js
 
             !tpl:umd-footer.tpl.js  # include a umd-footer template