webshims-rails 1.14.1 → 1.14.3

data/vendor/assets/javascripts/webshims/shims/combos/25.js

@@ -1330,12 +1330,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					}
 
 					return inputValueDesc.prop._supget.call(this);
-				},
-				set: function(val){
-					if(val === '' && this.type == 'file' && $(this).hasClass('ws-filereader')){
-						webshim.data(this, 'fileList', []);
-					}
-					inputValueDesc.prop._supset.call(this);
 				}
 			}
 		}
@@ -1533,10 +1527,10 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	}
 
 	if(!featureOptions.swfpath){
-		featureOptions.swfpath = shimMoxiePath+'flash/Moxie.cdn.swf';
+		featureOptions.swfpath = shimMoxiePath+'flash/Moxie.min.swf';
 	}
 	if(!featureOptions.xappath){
-		featureOptions.xappath = shimMoxiePath+'silverlight/Moxie.cdn.xap';
+		featureOptions.xappath = shimMoxiePath+'silverlight/Moxie.min.xap';
 	}
 
 	if($.support.cors !== false || !window.XDomainRequest){
@@ -1586,6 +1580,13 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		}
 	});
 
+	webshim.onNodeNamesPropertyModify('input', 'value', function(value, boolVal, type){
+		if(value === '' && this.type == 'file' && $(this).hasClass('ws-filereader')){
+			webshim.data(this, 'fileList', []);
+		}
+	});
+
+
 	window.FileReader = notReadyYet;
 	window.FormData = notReadyYet;
 	webshim.ready('moxie', function(){
@@ -1620,7 +1621,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					if(inputName && !$(appendData[i]).is(':disabled')){
 						files = $.prop(appendData[i], 'files') || [];
 						if(files.length){
-							if(files.length > 1){
+							if(files.length > 1 || (moxieData.hasBlob && moxieData.hasBlob())){
 								webshim.error('FormData shim can only handle one file per ajax. Use multiple ajax request. One per file.');
 							}
 							for(fileI = 0, fileLen = files.length; fileI < fileLen; fileI++){
@@ -1845,8 +1846,8 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				data.seeking = false;
 			}, 300);
 		},
-		onConnectionFailed: function(){
-			webshims.error('media error');
+		onConnectionFailed: function(jaris, data){
+			mediaelement.setError(data._elem, 'flash connection error');
 		},
 		onNotBuffering: function(jaris, data){
 			setReadyState(3, data);
@@ -2762,6 +2763,13 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	
 	if(hasFlash && $.cleanData){
 		var oldClean = $.cleanData;
+		var objElem = document.createElement('object');
+		var noRemove = {
+			SetVariable: 1,
+			GetVariable: 1,
+			SetReturnValue: 1,
+			GetReturnValue: 1
+		};
 		var flashNames = {
 			object: 1,
 			OBJECT: 1
@@ -2769,6 +2777,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		
 		$.cleanData = function(elems){
 			var i, len, prop;
+			var ret = oldClean.apply(this, arguments);
 			if(elems && (len = elems.length) && loadedSwf){
 				
 				for(i = 0; i < len; i++){
@@ -2778,7 +2787,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 							elems[i].api_pause();
 							if(elems[i].readyState == 4){
 								for (prop in elems[i]) {
-									if (typeof elems[i][prop] == "function") {
+									if (!noRemove[prop] && !objElem[prop] && typeof elems[i][prop] == "function") {
 										elems[i][prop] = null;
 									}
 								}
@@ -2788,7 +2797,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				}
 				
 			}
-			return oldClean.apply(this, arguments);
+			return ret;
 		};
 	}
 
@@ -2860,62 +2869,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	} else if(!('media' in document.createElement('source'))){
 		webshims.reflectProperties('source', ['media']);
 	}
-	if(options.experimentallyMimetypeCheck){
-		(function(){
-			var ADDBACK = $.fn.addBack ? 'addBack' : 'andSelf';
-			var getMimeType = function(){
-				var done;
-				var unknown = 'media/unknown please provide mime type';
-				var media = $(this);
-				var xhrs = [];
-				media
-					.not('.ws-after-check')
-					.find('source')
-					[ADDBACK]()
-					.filter('[data-wsrecheckmimetype]:not([type])')
-					.each(function(){
-						var source = $(this).removeAttr('data-wsrecheckmimetype');
-						var error = function(){
-							source.attr('data-type', unknown);
-						};
-						try {
-							xhrs.push(
-								$.ajax({
-									type: 'head',
-									url: $.attr(this, 'src'),
-									success: function(content, status, xhr){
-										var mime = xhr.getResponseHeader('Content-Type');
-										if(mime){
-											done = true;
-										}
-										source.attr('data-type', mime || unknown);
-									},
-									error: error
-								})
-							)
-							;
-						} catch(er){
-							error();
-						}
-					})
-				;
-				if(xhrs.length){
-					media.addClass('ws-after-check');
-					$.when.apply($, xhrs).always(function(){
-						media.mediaLoad();
-						setTimeout(function(){
-							media.removeClass('ws-after-check');
-						}, 9);
-					});
-				}
-			};
-			$('audio.media-error, video.media-error').each(getMimeType);
-			$(document).on('mediaerror', function(e){
-				getMimeType.call(e.target);
-			});
-		})();
-	}
-
 
 	if(hasNative && hasFlash && !options.preferFlash){
 		var switchErrors = {
@@ -2924,35 +2877,38 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		};
 		var switchOptions = function(e){
 			var media, error, parent;
-			if(!options.preferFlash &&
+			if(
 				($(e.target).is('audio, video') || ((parent = e.target.parentNode) && $('source', parent).last()[0] == e.target)) &&
-				(media = $(e.target).closest('audio, video')) && (error = media.prop('error')) && switchErrors[error.code]
+				(media = $(e.target).closest('audio, video')) && !media.is('.nonnative-api-active')
 				){
-
-				if(!options.preferFlash){
+				error = media.prop('error');
+				setTimeout(function(){
 					if(!media.is('.nonnative-api-active')){
-						options.preferFlash = true;
-						document.removeEventListener('error', switchOptions, true);
-						$('audio, video').each(function(){
-							webshims.mediaelement.selectSource(this);
-						});
-						webshims.error("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.src+" Mediaerror: "+ media.prop('error')+ 'first error: '+ error);
+						if(error && switchErrors[error.code]){
+							options.preferFlash = true;
+							document.removeEventListener('error', switchOptions, true);
+							$('audio, video').each(function(){
+								webshims.mediaelement.selectSource(this);
+							});
+							webshims.error("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.currentSrc+" Mediaerror: "+ media.prop('error')+ ' error.code: '+ error.code);
+						}
+						webshims.warn('There was a mediaelement error. Run the following line in your console to get more info: webshim.mediaelement.loadDebugger();')
 					}
-				} else{
-					document.removeEventListener('error', switchOptions, true);
-				}
+				});
+
+
 			}
 		};
+
+		document.addEventListener('error', switchOptions, true);
 		setTimeout(function(){
-			document.addEventListener('error', switchOptions, true);
 			$('audio, video').each(function(){
 				var error = $.prop(this, 'error');
 				if(error && switchErrors[error]){
 					switchOptions({target: this});
-					return false;
 				}
 			});
-		}, 9);
+		});
 	}
 
 });

data/vendor/assets/javascripts/webshims/shims/combos/26.js

@@ -3159,6 +3159,15 @@ define('moxie/file/File', [
 			@default UID
 			*/
 			name: name || Basic.guid('file_'),
+
+			/**
+			Relative path to the file inside a directory
+
+			@property relativePath
+			@type {String}
+			@default ''
+			*/
+			relativePath: '',
 			
 			/**
 			Date of last modification
@@ -3513,7 +3522,6 @@ define('moxie/file/FileInput', [
 	return FileInput;
 });
 
-
 // Included from: src/javascript/runtime/RuntimeTarget.js
 
 /**
@@ -5123,10 +5131,10 @@ define("moxie/xhr/XMLHttpRequest", [
 	return XMLHttpRequest;
 });
 
-// Included from: src/javascript/runtime/Transporter.js
+// Included from: src/javascript/runtime/flash/Runtime.js
 
 /**
- * Transporter.js
+ * Runtime.js
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -5135,136 +5143,226 @@ define("moxie/xhr/XMLHttpRequest", [
  * Contributing: http://www.plupload.com/contributing
  */
 
-define("moxie/runtime/Transporter", [
-	"moxie/core/utils/Basic",
-	"moxie/core/utils/Encode",
-	"moxie/runtime/RuntimeClient",
-	"moxie/core/EventTarget"
-], function(Basic, Encode, RuntimeClient, EventTarget) {
-	function Transporter() {
-		var mod, _runtime, _data, _size, _pos, _chunk_size;
-
-		RuntimeClient.call(this);
+/*global ActiveXObject:true */
 
-		Basic.extend(this, {
-			uid: Basic.guid('uid_'),
+/**
+Defines constructor for Flash runtime.
 
-			state: Transporter.IDLE,
+@class moxie/runtime/flash/Runtime
+@private
+*/
+define("moxie/runtime/flash/Runtime", [
+	"moxie/core/utils/Basic",
+	"moxie/core/utils/Env",
+	"moxie/core/utils/Dom",
+	"moxie/core/Exceptions",
+	"moxie/runtime/Runtime"
+], function(Basic, Env, Dom, x, Runtime) {
+	
+	var type = 'flash', extensions = {};
 
-			result: null,
+	/**
+	Get the version of the Flash Player
 
-			transport: function(data, type, options) {
-				var self = this;
+	@method getShimVersion
+	@private
+	@return {Number} Flash Player version
+	*/
+	function getShimVersion() {
+		var version;
 
-				options = Basic.extend({
-					chunk_size: 204798
-				}, options);
+		try {
+			version = navigator.plugins['Shockwave Flash'];
+			version = version.description;
+		} catch (e1) {
+			try {
+				version = new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version');
+			} catch (e2) {
+				version = '0.0';
+			}
+		}
+		version = version.match(/\d+/g);
+		return parseFloat(version[0] + '.' + version[1]);
+	}
 
-				// should divide by three, base64 requires this
-				if ((mod = options.chunk_size % 3)) {
-					options.chunk_size += 3 - mod;
-				}
+	/**
+	Constructor for the Flash Runtime
 
-				_chunk_size = options.chunk_size;
+	@class FlashRuntime
+	@extends Runtime
+	*/
+	function FlashRuntime(options) {
+		var I = this, initTimer;
 
-				_reset.call(this);
-				_data = data;
-				_size = data.length;
+		options = Basic.extend({ swf_url: Env.swf_url }, options);
 
-				if (Basic.typeOf(options) === 'string' || options.ruid) {
-					_run.call(self, type, this.connectRuntime(options));
-				} else {
-					// we require this to run only once
-					var cb = function(e, runtime) {
-						self.unbind("RuntimeInit", cb);
-						_run.call(self, type, runtime);
-					};
-					this.bind("RuntimeInit", cb);
-					this.connectRuntime(options);
-				}
+		Runtime.call(this, options, type, {
+			access_binary: function(value) {
+				return value && I.mode === 'browser';
+			},
+			access_image_binary: function(value) {
+				return value && I.mode === 'browser';
+			},
+			display_media: Runtime.capTrue,
+			do_cors: Runtime.capTrue,
+			drag_and_drop: false,
+			report_upload_progress: function() {
+				return I.mode === 'client';
+			},
+			resize_image: Runtime.capTrue,
+			return_response_headers: false,
+			return_response_type: function(responseType) {
+				if (responseType === 'json' && !!window.JSON) {
+					return true;
+				} 
+				return !Basic.arrayDiff(responseType, ['', 'text', 'document']) || I.mode === 'browser';
+			},
+			return_status_code: function(code) {
+				return I.mode === 'browser' || !Basic.arrayDiff(code, [200, 404]);
+			},
+			select_file: Runtime.capTrue,
+			select_multiple: Runtime.capTrue,
+			send_binary_string: function(value) {
+				return value && I.mode === 'browser';
+			},
+			send_browser_cookies: function(value) {
+				return value && I.mode === 'browser';
+			},
+			send_custom_headers: function(value) {
+				return value && I.mode === 'browser';
+			},
+			send_multipart: Runtime.capTrue,
+			slice_blob: function(value) {
+				return value && I.mode === 'browser';
+			},
+			stream_upload: function(value) {
+				return value && I.mode === 'browser';
+			},
+			summon_file_dialog: false,
+			upload_filesize: function(size) {
+				return Basic.parseSizeStr(size) <= 2097152 || I.mode === 'client';
+			},
+			use_http_method: function(methods) {
+				return !Basic.arrayDiff(methods, ['GET', 'POST']);
+			}
+		}, { 
+			// capabilities that require specific mode
+			access_binary: function(value) {
+				return value ? 'browser' : 'client';
+			},
+			access_image_binary: function(value) {
+				return value ? 'browser' : 'client';
+			},
+			report_upload_progress: function(value) {
+				return value ? 'browser' : 'client';
+			},
+			return_response_type: function(responseType) {
+				return Basic.arrayDiff(responseType, ['', 'text', 'json', 'document']) ? 'browser' : ['client', 'browser'];
+			},
+			return_status_code: function(code) {
+				return Basic.arrayDiff(code, [200, 404]) ? 'browser' : ['client', 'browser'];
+			},
+			send_binary_string: function(value) {
+				return value ? 'browser' : 'client';
+			},
+			send_browser_cookies: function(value) {
+				return value ? 'browser' : 'client';
+			},
+			send_custom_headers: function(value) {
+				return value ? 'browser' : 'client';
+			},
+			stream_upload: function(value) {
+				return value ? 'client' : 'browser';
 			},
+			upload_filesize: function(size) {
+				return Basic.parseSizeStr(size) >= 2097152 ? 'client' : 'browser';
+			}
+		}, 'client');
 
-			abort: function() {
-				var self = this;
 
-				self.state = Transporter.IDLE;
-				if (_runtime) {
-					_runtime.exec.call(self, 'Transporter', 'clear');
-					self.trigger("TransportingAborted");
-				}
+		// minimal requirement for Flash Player version
+		if (getShimVersion() < 10) {
+			this.mode = false; // with falsy mode, runtime won't operable, no matter what the mode was before
+		}
 
-				_reset.call(self);
-			},
 
+		Basic.extend(this, {
 
-			destroy: function() {
-				this.unbindAll();
-				_runtime = null;
-				this.disconnectRuntime();
-				_reset.call(this);
-			}
-		});
+			getShim: function() {
+				return Dom.get(this.uid);
+			},
 
-		function _reset() {
-			_size = _pos = 0;
-			_data = this.result = null;
-		}
+			shimExec: function(component, action) {
+				var args = [].slice.call(arguments, 2);
+				return I.getShim().exec(this.uid, component, action, args);
+			},
 
-		function _run(type, runtime) {
-			var self = this;
+			init: function() {
+				var html, el, container;
 
-			_runtime = runtime;
+				container = this.getShimContainer();
 
-			//self.unbind("RuntimeInit");
+				// if not the minimal height, shims are not initialized in older browsers (e.g FF3.6, IE6,7,8, Safari 4.0,5.0, etc)
+				Basic.extend(container.style, {
+					position: 'absolute',
+					top: '-8px',
+					left: '-8px',
+					width: '9px',
+					height: '9px',
+					overflow: 'hidden'
+				});
 
-			self.bind("TransportingProgress", function(e) {
-				_pos = e.loaded;
+				// insert flash object
+				html = '<object id="' + this.uid + '" type="application/x-shockwave-flash" data="' +  options.swf_url + '" ';
 
-				if (_pos < _size && Basic.inArray(self.state, [Transporter.IDLE, Transporter.DONE]) === -1) {
-					_transport.call(self);
+				if (Env.browser === 'IE') {
+					html += 'classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" ';
 				}
-			}, 999);
 
-			self.bind("TransportingComplete", function() {
-				_pos = _size;
-				self.state = Transporter.DONE;
-				_data = null; // clean a bit
-				self.result = _runtime.exec.call(self, 'Transporter', 'getAsBlob', type || '');
-			}, 999);
+				html += 'width="100%" height="100%" style="outline:0">'  +
+					'<param name="movie" value="' + options.swf_url + '" />' +
+					'<param name="flashvars" value="uid=' + escape(this.uid) + '&target=' + Env.global_event_dispatcher + '" />' +
+					'<param name="wmode" value="transparent" />' +
+					'<param name="allowscriptaccess" value="always" />' +
+				'</object>';
 
-			self.state = Transporter.BUSY;
-			self.trigger("TransportingStarted");
-			_transport.call(self);
-		}
+				if (Env.browser === 'IE') {
+					el = document.createElement('div');
+					container.appendChild(el);
+					el.outerHTML = html;
+					el = container = null; // just in case
+				} else {
+					container.innerHTML = html;
+				}
 
-		function _transport() {
-			var self = this,
-				chunk,
-				bytesLeft = _size - _pos;
+				// Init is dispatched by the shim
+				initTimer = setTimeout(function() {
+					if (I && !I.initialized) { // runtime might be already destroyed by this moment
+						I.trigger("Error", new x.RuntimeError(x.RuntimeError.NOT_INIT_ERR));
+					}
+				}, 5000);
+			},
 
-			if (_chunk_size > bytesLeft) {
-				_chunk_size = bytesLeft;
-			}
+			destroy: (function(destroy) { // extend default destroy method
+				return function() {
+					destroy.call(I);
+					clearTimeout(initTimer); // initialization check might be still onwait
+					options = initTimer = destroy = I = null;
+				};
+			}(this.destroy))
 
-			chunk = Encode.btoa(_data.substr(_pos, _chunk_size));
-			_runtime.exec.call(self, 'Transporter', 'receive', chunk, _size);
-		}
+		}, extensions);
 	}
 
-	Transporter.IDLE = 0;
-	Transporter.BUSY = 1;
-	Transporter.DONE = 2;
-
-	Transporter.prototype = EventTarget.instance;
+	Runtime.addConstructor(type, FlashRuntime);
 
-	return Transporter;
+	return extensions;
 });
 
-
-// Included from: src/javascript/runtime/html5/Runtime.js
+// Included from: src/javascript/runtime/flash/file/Blob.js
 
 /**
- * Runtime.js
+ * Blob.js
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -5273,118 +5371,47 @@ define("moxie/runtime/Transporter", [
  * Contributing: http://www.plupload.com/contributing
  */
 
-/*global File:true */
-
 /**
-Defines constructor for HTML5 runtime.
-
-@class moxie/runtime/html5/Runtime
+@class moxie/runtime/flash/file/Blob
 @private
 */
-define("moxie/runtime/html5/Runtime", [
-	"moxie/core/utils/Basic",
-	"moxie/core/Exceptions",
-	"moxie/runtime/Runtime",
-	"moxie/core/utils/Env"
-], function(Basic, x, Runtime, Env) {
-	
-	var type = "html5", extensions = {};
-	
-	function Html5Runtime(options) {
-		var I = this
-		, Test = Runtime.capTest
-		, True = Runtime.capTrue
-		;
-
-		var caps = Basic.extend({
-				access_binary: Test(window.FileReader || window.File && window.File.getAsDataURL),
-				access_image_binary: function() {
-					return I.can('access_binary') && !!extensions.Image;
-				},
-				display_media: Test(Env.can('create_canvas') || Env.can('use_data_uri_over32kb')),
-				do_cors: Test(window.XMLHttpRequest && 'withCredentials' in new XMLHttpRequest()),
-				drag_and_drop: Test(function() {
-					// this comes directly from Modernizr: http://www.modernizr.com/
-					var div = document.createElement('div');
-					// IE has support for drag and drop since version 5, but doesn't support dropping files from desktop
-					return (('draggable' in div) || ('ondragstart' in div && 'ondrop' in div)) && (Env.browser !== 'IE' || Env.version > 9);
-				}()),
-				filter_by_extension: Test(function() { // if you know how to feature-detect this, please suggest
-					return (Env.browser === 'Chrome' && Env.version >= 28) || (Env.browser === 'IE' && Env.version >= 10);
-				}()),
-				return_response_headers: True,
-				return_response_type: function(responseType) {
-					if (responseType === 'json' && !!window.JSON) { // we can fake this one even if it's not supported
-						return true;
-					} 
-					return Env.can('return_response_type', responseType);
-				},
-				return_status_code: True,
-				report_upload_progress: Test(window.XMLHttpRequest && new XMLHttpRequest().upload),
-				resize_image: function() {
-					return I.can('access_binary') && Env.can('create_canvas');
-				},
-				select_file: function() {
-					return Env.can('use_fileinput') && window.File;
-				},
-				select_folder: function() {
-					return I.can('select_file') && Env.browser === 'Chrome' && Env.version >= 21;
-				},
-				select_multiple: function() {
-					// it is buggy on Safari Windows and iOS
-					return I.can('select_file') && 
-						!(Env.browser === 'Safari' && Env.os === 'Windows') && 
-						!(Env.os === 'iOS' && Env.verComp(Env.osVersion, "7.0.4", '<'));
-				},
-				send_binary_string: Test(window.XMLHttpRequest && (new XMLHttpRequest().sendAsBinary || (window.Uint8Array && window.ArrayBuffer))),
-				send_custom_headers: Test(window.XMLHttpRequest),
-				send_multipart: function() {
-					return !!(window.XMLHttpRequest && new XMLHttpRequest().upload && window.FormData) || I.can('send_binary_string');
-				},
-				slice_blob: Test(window.File && (File.prototype.mozSlice || File.prototype.webkitSlice || File.prototype.slice)),
-				stream_upload: function(){
-					return I.can('slice_blob') && I.can('send_multipart');
-				},
-				summon_file_dialog: Test(function() { // yeah... some dirty sniffing here...
-					return (Env.browser === 'Firefox' && Env.version >= 4) ||
-						(Env.browser === 'Opera' && Env.version >= 12) ||
-						(Env.browser === 'IE' && Env.version >= 10) ||
-						!!~Basic.inArray(Env.browser, ['Chrome', 'Safari']);
-				}()),
-				upload_filesize: True
-			}, 
-			arguments[2]
-		);
-
-		Runtime.call(this, options, (arguments[1] || type), caps);
-
+define("moxie/runtime/flash/file/Blob", [
+	"moxie/runtime/flash/Runtime",
+	"moxie/file/Blob"
+], function(extensions, Blob) {
 
-		Basic.extend(this, {
+	var FlashBlob = {
+		slice: function(blob, start, end, type) {
+			var self = this.getRuntime();
 
-			init : function() {
-				this.trigger("Init");
-			},
+			if (start < 0) {
+				start = Math.max(blob.size + start, 0);
+			} else if (start > 0) {
+				start = Math.min(start, blob.size);
+			}
 
-			destroy: (function(destroy) { // extend default destroy method
-				return function() {
-					destroy.call(I);
-					destroy = I = null;
-				};
-			}(this.destroy))
-		});
+			if (end < 0) {
+				end = Math.max(blob.size + end, 0);
+			} else if (end > 0) {
+				end = Math.min(end, blob.size);
+			}
 
-		Basic.extend(this.getShim(), extensions);
-	}
+			blob = self.shimExec.call(this, 'Blob', 'slice', start, end, type || '');
 
-	Runtime.addConstructor(type, Html5Runtime);
+			if (blob) {
+				blob = new Blob(self.uid, blob);
+			}
+			return blob;
+		}
+	};
 
-	return extensions;
+	return (extensions.Blob = FlashBlob);
 });
 
-// Included from: src/javascript/runtime/html5/file/Blob.js
+// Included from: src/javascript/runtime/flash/file/FileInput.js
 
 /**
- * Blob.js
+ * FileInput.js
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -5394,46 +5421,31 @@ define("moxie/runtime/html5/Runtime", [
  */
 
 /**
-@class moxie/runtime/html5/file/Blob
+@class moxie/runtime/flash/file/FileInput
 @private
 */
-define("moxie/runtime/html5/file/Blob", [
-	"moxie/runtime/html5/Runtime",
-	"moxie/file/Blob"
-], function(extensions, Blob) {
-
-	function HTML5Blob() {
-		function w3cBlobSlice(blob, start, end) {
-			var blobSlice;
-
-			if (window.File.prototype.slice) {
-				try {
-					blob.slice();	// depricated version will throw WRONG_ARGUMENTS_ERR exception
-					return blob.slice(start, end);
-				} catch (e) {
-					// depricated slice method
-					return blob.slice(start, end - start);
-				}
-			// slice method got prefixed: https://bugzilla.mozilla.org/show_bug.cgi?id=649672
-			} else if ((blobSlice = window.File.prototype.webkitSlice || window.File.prototype.mozSlice)) {
-				return blobSlice.call(blob, start, end);
-			} else {
-				return null; // or throw some exception
-			}
+define("moxie/runtime/flash/file/FileInput", [
+	"moxie/runtime/flash/Runtime"
+], function(extensions) {
+	
+	var FileInput = {		
+		init: function(options) {
+			this.getRuntime().shimExec.call(this, 'FileInput', 'init', {
+				name: options.name,
+				accept: options.accept,
+				multiple: options.multiple
+			});
+			this.trigger('ready');
 		}
+	};
 
-		this.slice = function() {
-			return new Blob(this.getRuntime().uid, w3cBlobSlice.apply(this, arguments));
-		};
-	}
-
-	return (extensions.Blob = HTML5Blob);
+	return (extensions.FileInput = FileInput);
 });
 
-// Included from: src/javascript/core/utils/Events.js
+// Included from: src/javascript/runtime/flash/file/FileReader.js
 
 /**
- * Events.js
+ * FileReader.js
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -5442,171 +5454,117 @@ define("moxie/runtime/html5/file/Blob", [
  * Contributing: http://www.plupload.com/contributing
  */
 
-define('moxie/core/utils/Events', [
-	'moxie/core/utils/Basic'
-], function(Basic) {
-	var eventhash = {}, uid = 'moxie_' + Basic.guid();
-	
-	// IE W3C like event funcs
-	function preventDefault() {
-		this.returnValue = false;
-	}
+/**
+@class moxie/runtime/flash/file/FileReader
+@private
+*/
+define("moxie/runtime/flash/file/FileReader", [
+	"moxie/runtime/flash/Runtime",
+	"moxie/core/utils/Encode"
+], function(extensions, Encode) {
 
-	function stopPropagation() {
-		this.cancelBubble = true;
+	var _result = '';
+
+	function _formatData(data, op) {
+		switch (op) {
+			case 'readAsText':
+				return Encode.atob(data, 'utf8');
+			case 'readAsBinaryString':
+				return Encode.atob(data);
+			case 'readAsDataURL':
+				return data;
+		}
+		return null;
 	}
 
-	/**
-	Adds an event handler to the specified object and store reference to the handler
-	in objects internal Plupload registry (@see removeEvent).
-	
-	@method addEvent
-	@for Utils
-	@static
-	@param {Object} obj DOM element like object to add handler to.
-	@param {String} name Name to add event listener to.
-	@param {Function} callback Function to call when event occurs.
-	@param {String} [key] that might be used to add specifity to the event record.
-	*/
-	var addEvent = function(obj, name, callback, key) {
-		var func, events;
-					
-		name = name.toLowerCase();
+	var FileReader = {
+		read: function(op, blob) {
+			var target = this, self = target.getRuntime();
 
-		// Add event listener
-		if (obj.addEventListener) {
-			func = callback;
-			
-			obj.addEventListener(name, func, false);
-		} else if (obj.attachEvent) {
-			func = function() {
-				var evt = window.event;
+			// special prefix for DataURL read mode
+			if (op === 'readAsDataURL') {
+				_result = 'data:' + (blob.type || '') + ';base64,';
+			}
 
-				if (!evt.target) {
-					evt.target = evt.srcElement;
-				}
+			target.bind('Progress', function(e, data) {
+				if (data) {
+					_result += _formatData(data, op);
+				}
+			});
 
-				evt.preventDefault = preventDefault;
-				evt.stopPropagation = stopPropagation;
+			return self.shimExec.call(this, 'FileReader', 'readAsBase64', blob.uid);
+		},
 
-				callback(evt);
-			};
+		getResult: function() {
+			return _result;
+		},
 
-			obj.attachEvent('on' + name, func);
-		}
-		
-		// Log event handler to objects internal mOxie registry
-		if (!obj[uid]) {
-			obj[uid] = Basic.guid();
-		}
-		
-		if (!eventhash.hasOwnProperty(obj[uid])) {
-			eventhash[obj[uid]] = {};
-		}
-		
-		events = eventhash[obj[uid]];
-		
-		if (!events.hasOwnProperty(name)) {
-			events[name] = [];
+		destroy: function() {
+			_result = null;
 		}
-				
-		events[name].push({
-			func: func,
-			orig: callback, // store original callback for IE
-			key: key
-		});
 	};
+
+	return (extensions.FileReader = FileReader);
+});
+
+// Included from: src/javascript/runtime/flash/file/FileReaderSync.js
+
+/**
+ * FileReaderSync.js
+ *
+ * Copyright 2013, Moxiecode Systems AB
+ * Released under GPL License.
+ *
+ * License: http://www.plupload.com/license
+ * Contributing: http://www.plupload.com/contributing
+ */
+
+/**
+@class moxie/runtime/flash/file/FileReaderSync
+@private
+*/
+define("moxie/runtime/flash/file/FileReaderSync", [
+	"moxie/runtime/flash/Runtime",
+	"moxie/core/utils/Encode"
+], function(extensions, Encode) {
 	
-	
-	/**
-	Remove event handler from the specified object. If third argument (callback)
-	is not specified remove all events with the specified name.
-	
-	@method removeEvent
-	@static
-	@param {Object} obj DOM element to remove event listener(s) from.
-	@param {String} name Name of event listener to remove.
-	@param {Function|String} [callback] might be a callback or unique key to match.
-	*/
-	var removeEvent = function(obj, name, callback) {
-		var type, undef;
-		
-		name = name.toLowerCase();
-		
-		if (obj[uid] && eventhash[obj[uid]] && eventhash[obj[uid]][name]) {
-			type = eventhash[obj[uid]][name];
-		} else {
-			return;
+	function _formatData(data, op) {
+		switch (op) {
+			case 'readAsText':
+				return Encode.atob(data, 'utf8');
+			case 'readAsBinaryString':
+				return Encode.atob(data);
+			case 'readAsDataURL':
+				return data;
 		}
-			
-		for (var i = type.length - 1; i >= 0; i--) {
-			// undefined or not, key should match
-			if (type[i].orig === callback || type[i].key === callback) {
-				if (obj.removeEventListener) {
-					obj.removeEventListener(name, type[i].func, false);
-				} else if (obj.detachEvent) {
-					obj.detachEvent('on'+name, type[i].func);
-				}
-				
-				type[i].orig = null;
-				type[i].func = null;
-				type.splice(i, 1);
-				
-				// If callback was passed we are done here, otherwise proceed
-				if (callback !== undef) {
-					break;
-				}
+		return null;
+	}
+
+	var FileReaderSync = {
+		read: function(op, blob) {
+			var result, self = this.getRuntime();
+
+			result = self.shimExec.call(this, 'FileReaderSync', 'readAsBase64', blob.uid);
+			if (!result) {
+				return null; // or throw ex
 			}
-		}
-		
-		// If event array got empty, remove it
-		if (!type.length) {
-			delete eventhash[obj[uid]][name];
-		}
-		
-		// If mOxie registry has become empty, remove it
-		if (Basic.isEmptyObj(eventhash[obj[uid]])) {
-			delete eventhash[obj[uid]];
-			
-			// IE doesn't let you remove DOM object property with - delete
-			try {
-				delete obj[uid];
-			} catch(e) {
-				obj[uid] = undef;
+
+			// special prefix for DataURL read mode
+			if (op === 'readAsDataURL') {
+				result = 'data:' + (blob.type || '') + ';base64,' + result;
 			}
+
+			return _formatData(result, op, blob.type);
 		}
 	};
-	
-	
-	/**
-	Remove all kind of events from the specified object
-	
-	@method removeAllEvents
-	@static
-	@param {Object} obj DOM element to remove event listeners from.
-	@param {String} [key] unique key to match, when removing events.
-	*/
-	var removeAllEvents = function(obj, key) {		
-		if (!obj || !obj[uid]) {
-			return;
-		}
-		
-		Basic.each(eventhash[obj[uid]], function(events, name) {
-			removeEvent(obj, name, key);
-		});
-	};
 
-	return {
-		addEvent: addEvent,
-		removeEvent: removeEvent,
-		removeAllEvents: removeAllEvents
-	};
+	return (extensions.FileReaderSync = FileReaderSync);
 });
 
-// Included from: src/javascript/runtime/html5/file/FileInput.js
+// Included from: src/javascript/runtime/Transporter.js
 
 /**
- * FileInput.js
+ * Transporter.js
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -5615,170 +5573,135 @@ define('moxie/core/utils/Events', [
  * Contributing: http://www.plupload.com/contributing
  */
 
-/**
-@class moxie/runtime/html5/file/FileInput
-@private
-*/
-define("moxie/runtime/html5/file/FileInput", [
-	"moxie/runtime/html5/Runtime",
+define("moxie/runtime/Transporter", [
 	"moxie/core/utils/Basic",
-	"moxie/core/utils/Dom",
-	"moxie/core/utils/Events",
-	"moxie/core/utils/Mime",
-	"moxie/core/utils/Env"
-], function(extensions, Basic, Dom, Events, Mime, Env) {
-	
-	function FileInput() {
-		var _files = [], _options;
-
-		Basic.extend(this, {
-			init: function(options) {
-				var comp = this, I = comp.getRuntime(), input, shimContainer, mimes, browseButton, zIndex, top;
+	"moxie/core/utils/Encode",
+	"moxie/runtime/RuntimeClient",
+	"moxie/core/EventTarget"
+], function(Basic, Encode, RuntimeClient, EventTarget) {
+	function Transporter() {
+		var mod, _runtime, _data, _size, _pos, _chunk_size;
 
-				_options = options;
-				_files = [];
+		RuntimeClient.call(this);
 
-				// figure out accept string
-				mimes = _options.accept.mimes || Mime.extList2mimes(_options.accept, I.can('filter_by_extension'));
+		Basic.extend(this, {
+			uid: Basic.guid('uid_'),
 
-				shimContainer = I.getShimContainer();
+			state: Transporter.IDLE,
 
-				shimContainer.innerHTML = '<input id="' + I.uid +'" type="file" style="font-size:999px;opacity:0;"' +
-					(_options.multiple && I.can('select_multiple') ? 'multiple' : '') + 
-					(_options.directory && I.can('select_folder') ? 'webkitdirectory directory' : '') + // Chrome 11+
-					(mimes ? ' accept="' + mimes.join(',') + '"' : '') + ' />';
+			result: null,
 
-				input = Dom.get(I.uid);
+			transport: function(data, type, options) {
+				var self = this;
 
-				// prepare file input to be placed underneath the browse_button element
-				Basic.extend(input.style, {
-					position: 'absolute',
-					top: 0,
-					left: 0,
-					width: '100%',
-					height: '100%'
-				});
+				options = Basic.extend({
+					chunk_size: 204798
+				}, options);
 
+				// should divide by three, base64 requires this
+				if ((mod = options.chunk_size % 3)) {
+					options.chunk_size += 3 - mod;
+				}
 
-				browseButton = Dom.get(_options.browse_button);
+				_chunk_size = options.chunk_size;
 
-				// Route click event to the input[type=file] element for browsers that support such behavior
-				if (I.can('summon_file_dialog')) {
-					if (Dom.getStyle(browseButton, 'position') === 'static') {
-						browseButton.style.position = 'relative';
-					}
+				_reset.call(this);
+				_data = data;
+				_size = data.length;
 
-					zIndex = parseInt(Dom.getStyle(browseButton, 'z-index'), 10) || 1;
+				if (Basic.typeOf(options) === 'string' || options.ruid) {
+					_run.call(self, type, this.connectRuntime(options));
+				} else {
+					// we require this to run only once
+					var cb = function(e, runtime) {
+						self.unbind("RuntimeInit", cb);
+						_run.call(self, type, runtime);
+					};
+					this.bind("RuntimeInit", cb);
+					this.connectRuntime(options);
+				}
+			},
 
-					browseButton.style.zIndex = zIndex;
-					shimContainer.style.zIndex = zIndex - 1;
+			abort: function() {
+				var self = this;
 
-					Events.addEvent(browseButton, 'click', function(e) {
-						var input = Dom.get(I.uid);
-						if (input && !input.disabled) { // for some reason FF (up to 8.0.1 so far) lets to click disabled input[type=file]
-							input.click();
-						}
-						e.preventDefault();
-					}, comp.uid);
+				self.state = Transporter.IDLE;
+				if (_runtime) {
+					_runtime.exec.call(self, 'Transporter', 'clear');
+					self.trigger("TransportingAborted");
 				}
 
-				/* Since we have to place input[type=file] on top of the browse_button for some browsers,
-				browse_button loses interactivity, so we restore it here */
-				top = I.can('summon_file_dialog') ? browseButton : shimContainer;
+				_reset.call(self);
+			},
 
-				Events.addEvent(top, 'mouseover', function() {
-					comp.trigger('mouseenter');
-				}, comp.uid);
 
-				Events.addEvent(top, 'mouseout', function() {
-					comp.trigger('mouseleave');
-				}, comp.uid);
+			destroy: function() {
+				this.unbindAll();
+				_runtime = null;
+				this.disconnectRuntime();
+				_reset.call(this);
+			}
+		});
 
-				Events.addEvent(top, 'mousedown', function() {
-					comp.trigger('mousedown');
-				}, comp.uid);
+		function _reset() {
+			_size = _pos = 0;
+			_data = this.result = null;
+		}
 
-				Events.addEvent(Dom.get(_options.container), 'mouseup', function() {
-					comp.trigger('mouseup');
-				}, comp.uid);
+		function _run(type, runtime) {
+			var self = this;
 
+			_runtime = runtime;
 
-				input.onchange = function onChange() { // there should be only one handler for this
-					_files = [];
+			//self.unbind("RuntimeInit");
 
-					if (_options.directory) {
-						// folders are represented by dots, filter them out (Chrome 11+)
-						Basic.each(this.files, function(file) {
-							if (file.name !== ".") { // if it doesn't looks like a folder
-								_files.push(file);
-							}
-						});
-					} else {
-						_files = [].slice.call(this.files);
-					}
-
-					// clearing the value enables the user to select the same file again if they want to
-					if (Env.browser !== 'IE' && Env.browser !== 'IEMobile') {
-						this.value = '';
-					} else {
-						// in IE input[type="file"] is read-only so the only way to reset it is to re-insert it
-						var clone = this.cloneNode(true);
-						this.parentNode.replaceChild(clone, this);
-						clone.onchange = onChange;
-					}
-					comp.trigger('change');
-				};
+			self.bind("TransportingProgress", function(e) {
+				_pos = e.loaded;
 
-				// ready event is perfectly asynchronous
-				comp.trigger({
-					type: 'ready',
-					async: true
-				});
+				if (_pos < _size && Basic.inArray(self.state, [Transporter.IDLE, Transporter.DONE]) === -1) {
+					_transport.call(self);
+				}
+			}, 999);
 
-				shimContainer = null;
-			},
+			self.bind("TransportingComplete", function() {
+				_pos = _size;
+				self.state = Transporter.DONE;
+				_data = null; // clean a bit
+				self.result = _runtime.exec.call(self, 'Transporter', 'getAsBlob', type || '');
+			}, 999);
 
-			getFiles: function() {
-				return _files;
-			},
+			self.state = Transporter.BUSY;
+			self.trigger("TransportingStarted");
+			_transport.call(self);
+		}
 
-			disable: function(state) {
-				var I = this.getRuntime(), input;
+		function _transport() {
+			var self = this,
+				chunk,
+				bytesLeft = _size - _pos;
 
-				if ((input = Dom.get(I.uid))) {
-					input.disabled = !!state;
-				}
-			},
+			if (_chunk_size > bytesLeft) {
+				_chunk_size = bytesLeft;
+			}
 
-			destroy: function() {
-				var I = this.getRuntime()
-				, shim = I.getShim()
-				, shimContainer = I.getShimContainer()
-				;
-				
-				Events.removeAllEvents(shimContainer, this.uid);
-				Events.removeAllEvents(_options && Dom.get(_options.container), this.uid);
-				Events.removeAllEvents(_options && Dom.get(_options.browse_button), this.uid);
-				
-				if (shimContainer) {
-					shimContainer.innerHTML = '';
-				}
+			chunk = Encode.btoa(_data.substr(_pos, _chunk_size));
+			_runtime.exec.call(self, 'Transporter', 'receive', chunk, _size);
+		}
+	}
 
-				shim.removeInstance(this.uid);
+	Transporter.IDLE = 0;
+	Transporter.BUSY = 1;
+	Transporter.DONE = 2;
 
-				_files = _options = shimContainer = shim = null;
-			}
-		});
-	}
+	Transporter.prototype = EventTarget.instance;
 
-	return (extensions.FileInput = FileInput);
+	return Transporter;
 });
 
-
-// Included from: src/javascript/runtime/html5/file/FileReader.js
+// Included from: src/javascript/runtime/flash/xhr/XMLHttpRequest.js
 
 /**
- * FileReader.js
+ * XMLHttpRequest.js
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -5788,77 +5711,146 @@ define("moxie/runtime/html5/file/FileInput", [
  */
 
 /**
-@class moxie/runtime/html5/file/FileReader
+@class moxie/runtime/flash/xhr/XMLHttpRequest
 @private
 */
-define("moxie/runtime/html5/file/FileReader", [
-	"moxie/runtime/html5/Runtime",
-	"moxie/core/utils/Encode",
-	"moxie/core/utils/Basic"
-], function(extensions, Encode, Basic) {
+define("moxie/runtime/flash/xhr/XMLHttpRequest", [
+	"moxie/runtime/flash/Runtime",
+	"moxie/core/utils/Basic",
+	"moxie/file/Blob",
+	"moxie/file/File",
+	"moxie/file/FileReaderSync",
+	"moxie/xhr/FormData",
+	"moxie/runtime/Transporter"
+], function(extensions, Basic, Blob, File, FileReaderSync, FormData, Transporter) {
 	
-	function FileReader() {
-		var _fr, _convertToBinary = false;
+	var XMLHttpRequest = {
 
-		Basic.extend(this, {
+		send: function(meta, data) {
+			var target = this, self = target.getRuntime();
 
-			read: function(op, blob) {
-				var target = this;
+			function send() {
+				meta.transport = self.mode;
+				self.shimExec.call(target, 'XMLHttpRequest', 'send', meta, data);
+			}
 
-				_fr = new window.FileReader();
 
-				_fr.addEventListener('progress', function(e) {
-					target.trigger(e);
+			function appendBlob(name, blob) {
+				self.shimExec.call(target, 'XMLHttpRequest', 'appendBlob', name, blob.uid);
+				data = null;
+				send();
+			}
+
+
+			function attachBlob(blob, cb) {
+				var tr = new Transporter();
+
+				tr.bind("TransportingComplete", function() {
+					cb(this.result);
 				});
 
-				_fr.addEventListener('load', function(e) {
-					target.trigger(e);
+				tr.transport(blob.getSource(), blob.type, {
+					ruid: self.uid
 				});
+			}
 
-				_fr.addEventListener('error', function(e) {
-					target.trigger(e, _fr.error);
+			// copy over the headers if any
+			if (!Basic.isEmptyObj(meta.headers)) {
+				Basic.each(meta.headers, function(value, header) {
+					self.shimExec.call(target, 'XMLHttpRequest', 'setRequestHeader', header, value.toString()); // Silverlight doesn't accept integers into the arguments of type object
 				});
+			}
 
-				_fr.addEventListener('loadend', function() {
-					_fr = null;
+			// transfer over multipart params and blob itself
+			if (data instanceof FormData) {
+				var blobField;
+				data.each(function(value, name) {
+					if (value instanceof Blob) {
+						blobField = name;
+					} else {
+						self.shimExec.call(target, 'XMLHttpRequest', 'append', name, value);
+					}
 				});
 
-				if (Basic.typeOf(_fr[op]) === 'function') {
-					_convertToBinary = false;
-					_fr[op](blob.getSource());
-				} else if (op === 'readAsBinaryString') { // readAsBinaryString is depricated in general and never existed in IE10+
-					_convertToBinary = true;
-					_fr.readAsDataURL(blob.getSource());
+				if (!data.hasBlob()) {
+					data = null;
+					send();
+				} else {
+					var blob = data.getBlob();
+					if (blob.isDetached()) {
+						attachBlob(blob, function(attachedBlob) {
+							blob.destroy();
+							appendBlob(blobField, attachedBlob);		
+						});
+					} else {
+						appendBlob(blobField, blob);
+					}
 				}
-			},
+			} else if (data instanceof Blob) {
+				if (data.isDetached()) {
+					attachBlob(data, function(attachedBlob) {
+						data.destroy();
+						data = attachedBlob.uid;
+						send();
+					});
+				} else {
+					data = data.uid;
+					send();
+				}
+			} else {
+				send();
+			}
+		},
 
-			getResult: function() {
-				return _fr && _fr.result ? (_convertToBinary ? _toBinary(_fr.result) : _fr.result) : null;
-			},
+		getResponse: function(responseType) {
+			var frs, blob, self = this.getRuntime();
 
-			abort: function() {
-				if (_fr) {
-					_fr.abort();
+			blob = self.shimExec.call(this, 'XMLHttpRequest', 'getResponseAsBlob');
+
+			if (blob) {
+				blob = new File(self.uid, blob);
+
+				if ('blob' === responseType) {
+					return blob;
 				}
-			},
 
-			destroy: function() {
-				_fr = null;
+				try { 
+					frs = new FileReaderSync();
+
+					if (!!~Basic.inArray(responseType, ["", "text"])) {
+						return frs.readAsText(blob);
+					} else if ('json' === responseType && !!window.JSON) {
+						return JSON.parse(frs.readAsText(blob));
+					}
+				} finally {
+					blob.destroy();
+				}
 			}
-		});
+			return null;
+		},
 
-		function _toBinary(str) {
-			return Encode.atob(str.substring(str.indexOf('base64,') + 7));
+		abort: function(upload_complete_flag) {
+			var self = this.getRuntime();
+
+			self.shimExec.call(this, 'XMLHttpRequest', 'abort');
+
+			this.dispatchEvent('readystatechange');
+			// this.dispatchEvent('progress');
+			this.dispatchEvent('abort');
+
+			//if (!upload_complete_flag) {
+				// this.dispatchEvent('uploadprogress');
+			//}
 		}
-	}
+	};
 
-	return (extensions.FileReader = FileReader);
+	return (extensions.XMLHttpRequest = XMLHttpRequest);
 });
 
-// Included from: src/javascript/runtime/html5/xhr/XMLHttpRequest.js
+// Included from: src/javascript/runtime/html4/Runtime.js
 
 /**
- * XMLHttpRequest.js
+ * Runtime.js
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -5867,373 +5859,100 @@ define("moxie/runtime/html5/file/FileReader", [
  * Contributing: http://www.plupload.com/contributing
  */
 
-/*global ActiveXObject:true */
+/*global File:true */
 
 /**
-@class moxie/runtime/html5/xhr/XMLHttpRequest
+Defines constructor for HTML4 runtime.
+
+@class moxie/runtime/html4/Runtime
 @private
 */
-define("moxie/runtime/html5/xhr/XMLHttpRequest", [
-	"moxie/runtime/html5/Runtime",
+define("moxie/runtime/html4/Runtime", [
 	"moxie/core/utils/Basic",
-	"moxie/core/utils/Mime",
-	"moxie/core/utils/Url",
-	"moxie/file/File",
-	"moxie/file/Blob",
-	"moxie/xhr/FormData",
 	"moxie/core/Exceptions",
+	"moxie/runtime/Runtime",
 	"moxie/core/utils/Env"
-], function(extensions, Basic, Mime, Url, File, Blob, FormData, x, Env) {
+], function(Basic, x, Runtime, Env) {
 	
-	function XMLHttpRequest() {
-		var self = this
-		, _xhr
-		, _filename
-		;
+	var type = 'html4', extensions = {};
 
-		Basic.extend(this, {
-			send: function(meta, data) {
-				var target = this
-				, isGecko2_5_6 = (Env.browser === 'Mozilla' && Env.version >= 4 && Env.version < 7)
-				, isAndroidBrowser = Env.browser === 'Android Browser'
-				, mustSendAsBinary = false
-				;
+	function Html4Runtime(options) {
+		var I = this
+		, Test = Runtime.capTest
+		, True = Runtime.capTrue
+		;
 
-				// extract file name
-				_filename = meta.url.replace(/^.+?\/([\w\-\.]+)$/, '$1').toLowerCase();
-
-				_xhr = _getNativeXHR();
-				_xhr.open(meta.method, meta.url, meta.async, meta.user, meta.password);
-
-
-				// prepare data to be sent
-				if (data instanceof Blob) {
-					if (data.isDetached()) {
-						mustSendAsBinary = true;
-					}
-					data = data.getSource();
-				} else if (data instanceof FormData) {
-
-					if (data.hasBlob()) {
-						if (data.getBlob().isDetached()) {
-							data = _prepareMultipart.call(target, data); // _xhr must be instantiated and be in OPENED state
-							mustSendAsBinary = true;
-						} else if ((isGecko2_5_6 || isAndroidBrowser) && Basic.typeOf(data.getBlob().getSource()) === 'blob' && window.FileReader) {
-							// Gecko 2/5/6 can't send blob in FormData: https://bugzilla.mozilla.org/show_bug.cgi?id=649150
-							// Android browsers (default one and Dolphin) seem to have the same issue, see: #613
-							_preloadAndSend.call(target, meta, data);
-							return; // _preloadAndSend will reinvoke send() with transmutated FormData =%D
-						}	
-					}
-
-					// transfer fields to real FormData
-					if (data instanceof FormData) { // if still a FormData, e.g. not mangled by _prepareMultipart()
-						var fd = new window.FormData();
-						data.each(function(value, name) {
-							if (value instanceof Blob) {
-								fd.append(name, value.getSource());
-							} else {
-								fd.append(name, value);
-							}
-						});
-						data = fd;
-					}
-				}
-
-
-				// if XHR L2
-				if (_xhr.upload) {
-					if (meta.withCredentials) {
-						_xhr.withCredentials = true;
-					}
-
-					_xhr.addEventListener('load', function(e) {
-						target.trigger(e);
-					});
-
-					_xhr.addEventListener('error', function(e) {
-						target.trigger(e);
-					});
-
-					// additionally listen to progress events
-					_xhr.addEventListener('progress', function(e) {
-						target.trigger(e);
-					});
-
-					_xhr.upload.addEventListener('progress', function(e) {
-						target.trigger({
-							type: 'UploadProgress',
-							loaded: e.loaded,
-							total: e.total
-						});
-					});
-				// ... otherwise simulate XHR L2
-				} else {
-					_xhr.onreadystatechange = function onReadyStateChange() {
-						
-						// fake Level 2 events
-						switch (_xhr.readyState) {
-							
-							case 1: // XMLHttpRequest.OPENED
-								// readystatechanged is fired twice for OPENED state (in IE and Mozilla) - neu
-								break;
-							
-							// looks like HEADERS_RECEIVED (state 2) is not reported in Opera (or it's old versions) - neu
-							case 2: // XMLHttpRequest.HEADERS_RECEIVED
-								break;
-								
-							case 3: // XMLHttpRequest.LOADING 
-								// try to fire progress event for not XHR L2
-								var total, loaded;
-								
-								try {
-									if (Url.hasSameOrigin(meta.url)) { // Content-Length not accessible for cross-domain on some browsers
-										total = _xhr.getResponseHeader('Content-Length') || 0; // old Safari throws an exception here
-									}
-
-									if (_xhr.responseText) { // responseText was introduced in IE7
-										loaded = _xhr.responseText.length;
-									}
-								} catch(ex) {
-									total = loaded = 0;
-								}
-
-								target.trigger({
-									type: 'progress',
-									lengthComputable: !!total,
-									total: parseInt(total, 10),
-									loaded: loaded
-								});
-								break;
-								
-							case 4: // XMLHttpRequest.DONE
-								// release readystatechange handler (mostly for IE)
-								_xhr.onreadystatechange = function() {};
-
-								// usually status 0 is returned when server is unreachable, but FF also fails to status 0 for 408 timeout
-								if (_xhr.status === 0) {
-									target.trigger('error');
-								} else {
-									target.trigger('load');
-								}							
-								break;
-						}
-					};
-				}
-				
-
-				// set request headers
-				if (!Basic.isEmptyObj(meta.headers)) {
-					Basic.each(meta.headers, function(value, header) {
-						_xhr.setRequestHeader(header, value);
-					});
-				}
-
-				// request response type
-				if ("" !== meta.responseType && 'responseType' in _xhr) {
-					if ('json' === meta.responseType && !Env.can('return_response_type', 'json')) { // we can fake this one
-						_xhr.responseType = 'text';
-					} else {
-						_xhr.responseType = meta.responseType;
-					}
-				}
-
-				// send ...
-				if (!mustSendAsBinary) {
-					_xhr.send(data);
-				} else {
-					if (_xhr.sendAsBinary) { // Gecko
-						_xhr.sendAsBinary(data);
-					} else { // other browsers having support for typed arrays
-						(function() {
-							// mimic Gecko's sendAsBinary
-							var ui8a = new Uint8Array(data.length);
-							for (var i = 0; i < data.length; i++) {
-								ui8a[i] = (data.charCodeAt(i) & 0xff);
-							}
-							_xhr.send(ui8a.buffer);
-						}());
-					}
-				}
-
-				target.trigger('loadstart');
+		Runtime.call(this, options, type, {
+			access_binary: Test(window.FileReader || window.File && File.getAsDataURL),
+			access_image_binary: false,
+			display_media: Test(extensions.Image && (Env.can('create_canvas') || Env.can('use_data_uri_over32kb'))),
+			do_cors: false,
+			drag_and_drop: false,
+			filter_by_extension: Test(function() { // if you know how to feature-detect this, please suggest
+				return (Env.browser === 'Chrome' && Env.version >= 28) || (Env.browser === 'IE' && Env.version >= 10);
+			}()),
+			resize_image: function() {
+				return extensions.Image && I.can('access_binary') && Env.can('create_canvas');
 			},
-
-			getStatus: function() {
-				// according to W3C spec it should return 0 for readyState < 3, but instead it throws an exception
-				try {
-					if (_xhr) {
-						return _xhr.status;
-					}
-				} catch(ex) {}
-				return 0;
+			report_upload_progress: false,
+			return_response_headers: false,
+			return_response_type: function(responseType) {
+				if (responseType === 'json' && !!window.JSON) {
+					return true;
+				} 
+				return !!~Basic.inArray(responseType, ['text', 'document', '']);
 			},
-
-			getResponse: function(responseType) {
-				var I = this.getRuntime();
-
-				try {
-					switch (responseType) {
-						case 'blob':
-							var file = new File(I.uid, _xhr.response);
-							
-							// try to extract file name from content-disposition if possible (might be - not, if CORS for example)	
-							var disposition = _xhr.getResponseHeader('Content-Disposition');
-							if (disposition) {
-								// extract filename from response header if available
-								var match = disposition.match(/filename=([\'\"'])([^\1]+)\1/);
-								if (match) {
-									_filename = match[2];
-								}
-							}
-							file.name = _filename;
-
-							// pre-webkit Opera doesn't set type property on the blob response
-							if (!file.type) {
-								file.type = Mime.getFileMime(_filename);
-							}
-							return file;
-
-						case 'json':
-							if (!Env.can('return_response_type', 'json')) {
-								return _xhr.status === 200 && !!window.JSON ? JSON.parse(_xhr.responseText) : null;
-							}
-							return _xhr.response;
-
-						case 'document':
-							return _getDocument(_xhr);
-
-						default:
-							return _xhr.responseText !== '' ? _xhr.responseText : null; // against the specs, but for consistency across the runtimes
-					}
-				} catch(ex) {
-					return null;
-				}				
+			return_status_code: function(code) {
+				return !Basic.arrayDiff(code, [200, 404]);
 			},
-
-			getAllResponseHeaders: function() {
-				try {
-					return _xhr.getAllResponseHeaders();
-				} catch(ex) {}
-				return '';
+			select_file: function() {
+				return Env.can('use_fileinput');
 			},
-
-			abort: function() {
-				if (_xhr) {
-					_xhr.abort();
-				}
+			select_multiple: false,
+			send_binary_string: false,
+			send_custom_headers: false,
+			send_multipart: true,
+			slice_blob: false,
+			stream_upload: function() {
+				return I.can('select_file');
 			},
-
-			destroy: function() {
-				self = _filename = null;
+			summon_file_dialog: Test(function() { // yeah... some dirty sniffing here...
+				return (Env.browser === 'Firefox' && Env.version >= 4) ||
+					(Env.browser === 'Opera' && Env.version >= 12) ||
+					!!~Basic.inArray(Env.browser, ['Chrome', 'Safari']);
+			}()),
+			upload_filesize: True,
+			use_http_method: function(methods) {
+				return !Basic.arrayDiff(methods, ['GET', 'POST']);
 			}
 		});
 
 
-		// here we go... ugly fix for ugly bug
-		function _preloadAndSend(meta, data) {
-			var target = this, blob, fr;
-				
-			// get original blob
-			blob = data.getBlob().getSource();
-			
-			// preload blob in memory to be sent as binary string
-			fr = new window.FileReader();
-			fr.onload = function() {
-				// overwrite original blob
-				data.append(data.getBlobName(), new Blob(null, {
-					type: blob.type,
-					data: fr.result
-				}));
-				// invoke send operation again
-				self.send.call(target, meta, data);
-			};
-			fr.readAsBinaryString(blob);
-		}
-
-		
-		function _getNativeXHR() {
-			if (window.XMLHttpRequest && !(Env.browser === 'IE' && Env.version < 8)) { // IE7 has native XHR but it's buggy
-				return new window.XMLHttpRequest();
-			} else {
-				return (function() {
-					var progIDs = ['Msxml2.XMLHTTP.6.0', 'Microsoft.XMLHTTP']; // if 6.0 available, use it, otherwise failback to default 3.0
-					for (var i = 0; i < progIDs.length; i++) {
-						try {
-							return new ActiveXObject(progIDs[i]);
-						} catch (ex) {}
-					}
-				})();
-			}
-		}
-		
-		// @credits Sergey Ilinsky	(http://www.ilinsky.com/)
-		function _getDocument(xhr) {
-			var rXML = xhr.responseXML;
-			var rText = xhr.responseText;
-			
-			// Try parsing responseText (@see: http://www.ilinsky.com/articles/XMLHttpRequest/#bugs-ie-responseXML-content-type)
-			if (Env.browser === 'IE' && rText && rXML && !rXML.documentElement && /[^\/]+\/[^\+]+\+xml/.test(xhr.getResponseHeader("Content-Type"))) {
-				rXML = new window.ActiveXObject("Microsoft.XMLDOM");
-				rXML.async = false;
-				rXML.validateOnParse = false;
-				rXML.loadXML(rText);
-			}
-	
-			// Check if there is no error in document
-			if (rXML) {
-				if ((Env.browser === 'IE' && rXML.parseError !== 0) || !rXML.documentElement || rXML.documentElement.tagName === "parsererror") {
-					return null;
-				}
-			}
-			return rXML;
-		}
-
-
-		function _prepareMultipart(fd) {
-			var boundary = '----moxieboundary' + new Date().getTime()
-			, dashdash = '--'
-			, crlf = '\r\n'
-			, multipart = ''
-			, I = this.getRuntime()
-			;
-
-			if (!I.can('send_binary_string')) {
-				throw new x.RuntimeError(x.RuntimeError.NOT_SUPPORTED_ERR);
-			}
-
-			_xhr.setRequestHeader('Content-Type', 'multipart/form-data; boundary=' + boundary);
-
-			// append multipart parameters
-			fd.each(function(value, name) {
-				// Firefox 3.6 failed to convert multibyte characters to UTF-8 in sendAsBinary(), 
-				// so we try it here ourselves with: unescape(encodeURIComponent(value))
-				if (value instanceof Blob) {
-					// Build RFC2388 blob
-					multipart += dashdash + boundary + crlf +
-						'Content-Disposition: form-data; name="' + name + '"; filename="' + unescape(encodeURIComponent(value.name || 'blob')) + '"' + crlf +
-						'Content-Type: ' + (value.type || 'application/octet-stream') + crlf + crlf +
-						value.getSource() + crlf;
-				} else {
-					multipart += dashdash + boundary + crlf +
-						'Content-Disposition: form-data; name="' + name + '"' + crlf + crlf +
-						unescape(encodeURIComponent(value)) + crlf;
-				}
-			});
+		Basic.extend(this, {
+			init : function() {
+				this.trigger("Init");
+			},
 
-			multipart += dashdash + boundary + dashdash + crlf;
+			destroy: (function(destroy) { // extend default destroy method
+				return function() {
+					destroy.call(I);
+					destroy = I = null;
+				};
+			}(this.destroy))
+		});
 
-			return multipart;
-		}
+		Basic.extend(this.getShim(), extensions);
 	}
 
-	return (extensions.XMLHttpRequest = XMLHttpRequest);
+	Runtime.addConstructor(type, Html4Runtime);
+
+	return extensions;
 });
 
-// Included from: src/javascript/runtime/html5/utils/BinaryReader.js
+// Included from: src/javascript/core/utils/Events.js
 
 /**
- * BinaryReader.js
+ * Events.js
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -6242,723 +5961,171 @@ define("moxie/runtime/html5/xhr/XMLHttpRequest", [
  * Contributing: http://www.plupload.com/contributing
  */
 
-/**
-@class moxie/runtime/html5/utils/BinaryReader
-@private
-*/
-define("moxie/runtime/html5/utils/BinaryReader", [], function() {
-	return function() {
-		var II = false, bin;
-
-		// Private functions
-		function read(idx, size) {
-			var mv = II ? 0 : -8 * (size - 1), sum = 0, i;
-
-			for (i = 0; i < size; i++) {
-				sum |= (bin.charCodeAt(idx + i) << Math.abs(mv + i*8));
-			}
-
-			return sum;
-		}
-
-		function putstr(segment, idx, length) {
-			length = arguments.length === 3 ? length : bin.length - idx - 1;
-			bin = bin.substr(0, idx) + segment + bin.substr(length + idx);
-		}
-
-		function write(idx, num, size) {
-			var str = '', mv = II ? 0 : -8 * (size - 1), i;
-
-			for (i = 0; i < size; i++) {
-				str += String.fromCharCode((num >> Math.abs(mv + i*8)) & 255);
-			}
-
-			putstr(str, idx, size);
-		}
-
-		// Public functions
-		return {
-			II: function(order) {
-				if (order === undefined) {
-					return II;
-				} else {
-					II = order;
-				}
-			},
-
-			init: function(binData) {
-				II = false;
-				bin = binData;
-			},
+define('moxie/core/utils/Events', [
+	'moxie/core/utils/Basic'
+], function(Basic) {
+	var eventhash = {}, uid = 'moxie_' + Basic.guid();
+	
+	// IE W3C like event funcs
+	function preventDefault() {
+		this.returnValue = false;
+	}
 
-			SEGMENT: function(idx, length, segment) {
-				switch (arguments.length) {
-					case 1:
-						return bin.substr(idx, bin.length - idx - 1);
-					case 2:
-						return bin.substr(idx, length);
-					case 3:
-						putstr(segment, idx, length);
-						break;
-					default: return bin;
-				}
-			},
+	function stopPropagation() {
+		this.cancelBubble = true;
+	}
 
-			BYTE: function(idx) {
-				return read(idx, 1);
-			},
+	/**
+	Adds an event handler to the specified object and store reference to the handler
+	in objects internal Plupload registry (@see removeEvent).
+	
+	@method addEvent
+	@for Utils
+	@static
+	@param {Object} obj DOM element like object to add handler to.
+	@param {String} name Name to add event listener to.
+	@param {Function} callback Function to call when event occurs.
+	@param {String} [key] that might be used to add specifity to the event record.
+	*/
+	var addEvent = function(obj, name, callback, key) {
+		var func, events;
+					
+		name = name.toLowerCase();
 
-			SHORT: function(idx) {
-				return read(idx, 2);
-			},
+		// Add event listener
+		if (obj.addEventListener) {
+			func = callback;
+			
+			obj.addEventListener(name, func, false);
+		} else if (obj.attachEvent) {
+			func = function() {
+				var evt = window.event;
 
-			LONG: function(idx, num) {
-				if (num === undefined) {
-					return read(idx, 4);
-				} else {
-					write(idx, num, 4);
+				if (!evt.target) {
+					evt.target = evt.srcElement;
 				}
-			},
-
-			SLONG: function(idx) { // 2's complement notation
-				var num = read(idx, 4);
-
-				return (num > 2147483647 ? num - 4294967296 : num);
-			},
-
-			STRING: function(idx, size) {
-				var str = '';
 
-				for (size += idx; idx < size; idx++) {
-					str += String.fromCharCode(read(idx, 1));
-				}
+				evt.preventDefault = preventDefault;
+				evt.stopPropagation = stopPropagation;
 
-				return str;
-			}
-		};
-	};
-});
+				callback(evt);
+			};
 
-// Included from: src/javascript/runtime/flash/Runtime.js
-
-/**
- * Runtime.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
-
-/*global ActiveXObject:true */
-
-/**
-Defines constructor for Flash runtime.
-
-@class moxie/runtime/flash/Runtime
-@private
-*/
-define("moxie/runtime/flash/Runtime", [
-	"moxie/core/utils/Basic",
-	"moxie/core/utils/Env",
-	"moxie/core/utils/Dom",
-	"moxie/core/Exceptions",
-	"moxie/runtime/Runtime"
-], function(Basic, Env, Dom, x, Runtime) {
-	
-	var type = 'flash', extensions = {};
-
-	/**
-	Get the version of the Flash Player
-
-	@method getShimVersion
-	@private
-	@return {Number} Flash Player version
-	*/
-	function getShimVersion() {
-		var version;
-
-		try {
-			version = navigator.plugins['Shockwave Flash'];
-			version = version.description;
-		} catch (e1) {
-			try {
-				version = new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version');
-			} catch (e2) {
-				version = '0.0';
-			}
-		}
-		version = version.match(/\d+/g);
-		return parseFloat(version[0] + '.' + version[1]);
-	}
-
-	/**
-	Constructor for the Flash Runtime
-
-	@class FlashRuntime
-	@extends Runtime
-	*/
-	function FlashRuntime(options) {
-		var I = this, initTimer;
-
-		options = Basic.extend({ swf_url: Env.swf_url }, options);
-
-		Runtime.call(this, options, type, {
-			access_binary: function(value) {
-				return value && I.mode === 'browser';
-			},
-			access_image_binary: function(value) {
-				return value && I.mode === 'browser';
-			},
-			display_media: Runtime.capTrue,
-			do_cors: Runtime.capTrue,
-			drag_and_drop: false,
-			report_upload_progress: function() {
-				return I.mode === 'client';
-			},
-			resize_image: Runtime.capTrue,
-			return_response_headers: false,
-			return_response_type: function(responseType) {
-				if (responseType === 'json' && !!window.JSON) {
-					return true;
-				} 
-				return !Basic.arrayDiff(responseType, ['', 'text', 'document']) || I.mode === 'browser';
-			},
-			return_status_code: function(code) {
-				return I.mode === 'browser' || !Basic.arrayDiff(code, [200, 404]);
-			},
-			select_file: Runtime.capTrue,
-			select_multiple: Runtime.capTrue,
-			send_binary_string: function(value) {
-				return value && I.mode === 'browser';
-			},
-			send_browser_cookies: function(value) {
-				return value && I.mode === 'browser';
-			},
-			send_custom_headers: function(value) {
-				return value && I.mode === 'browser';
-			},
-			send_multipart: Runtime.capTrue,
-			slice_blob: function(value) {
-				return value && I.mode === 'browser';
-			},
-			stream_upload: function(value) {
-				return value && I.mode === 'browser';
-			},
-			summon_file_dialog: false,
-			upload_filesize: function(size) {
-				return Basic.parseSizeStr(size) <= 2097152 || I.mode === 'client';
-			},
-			use_http_method: function(methods) {
-				return !Basic.arrayDiff(methods, ['GET', 'POST']);
-			}
-		}, { 
-			// capabilities that require specific mode
-			access_binary: function(value) {
-				return value ? 'browser' : 'client';
-			},
-			access_image_binary: function(value) {
-				return value ? 'browser' : 'client';
-			},
-			report_upload_progress: function(value) {
-				return value ? 'browser' : 'client';
-			},
-			return_response_type: function(responseType) {
-				return Basic.arrayDiff(responseType, ['', 'text', 'json', 'document']) ? 'browser' : ['client', 'browser'];
-			},
-			return_status_code: function(code) {
-				return Basic.arrayDiff(code, [200, 404]) ? 'browser' : ['client', 'browser'];
-			},
-			send_binary_string: function(value) {
-				return value ? 'browser' : 'client';
-			},
-			send_browser_cookies: function(value) {
-				return value ? 'browser' : 'client';
-			},
-			send_custom_headers: function(value) {
-				return value ? 'browser' : 'client';
-			},
-			stream_upload: function(value) {
-				return value ? 'client' : 'browser';
-			},
-			upload_filesize: function(size) {
-				return Basic.parseSizeStr(size) >= 2097152 ? 'client' : 'browser';
-			}
-		}, 'client');
-
-
-		// minimal requirement for Flash Player version
-		if (getShimVersion() < 10) {
-			this.mode = false; // with falsy mode, runtime won't operable, no matter what the mode was before
-		}
-
-
-		Basic.extend(this, {
-
-			getShim: function() {
-				return Dom.get(this.uid);
-			},
-
-			shimExec: function(component, action) {
-				var args = [].slice.call(arguments, 2);
-				return I.getShim().exec(this.uid, component, action, args);
-			},
-
-			init: function() {
-				var html, el, container;
-
-				container = this.getShimContainer();
-
-				// if not the minimal height, shims are not initialized in older browsers (e.g FF3.6, IE6,7,8, Safari 4.0,5.0, etc)
-				Basic.extend(container.style, {
-					position: 'absolute',
-					top: '-8px',
-					left: '-8px',
-					width: '9px',
-					height: '9px',
-					overflow: 'hidden'
-				});
-
-				// insert flash object
-				html = '<object id="' + this.uid + '" type="application/x-shockwave-flash" data="' +  options.swf_url + '" ';
-
-				if (Env.browser === 'IE') {
-					html += 'classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" ';
-				}
-
-				html += 'width="100%" height="100%" style="outline:0">'  +
-					'<param name="movie" value="' + options.swf_url + '" />' +
-					'<param name="flashvars" value="uid=' + escape(this.uid) + '&target=' + Env.global_event_dispatcher + '" />' +
-					'<param name="wmode" value="transparent" />' +
-					'<param name="allowscriptaccess" value="always" />' +
-				'</object>';
-
-				if (Env.browser === 'IE') {
-					el = document.createElement('div');
-					container.appendChild(el);
-					el.outerHTML = html;
-					el = container = null; // just in case
-				} else {
-					container.innerHTML = html;
-				}
-
-				// Init is dispatched by the shim
-				initTimer = setTimeout(function() {
-					if (I && !I.initialized) { // runtime might be already destroyed by this moment
-						I.trigger("Error", new x.RuntimeError(x.RuntimeError.NOT_INIT_ERR));
-					}
-				}, 5000);
-			},
-
-			destroy: (function(destroy) { // extend default destroy method
-				return function() {
-					destroy.call(I);
-					clearTimeout(initTimer); // initialization check might be still onwait
-					options = initTimer = destroy = I = null;
-				};
-			}(this.destroy))
-
-		}, extensions);
-	}
-
-	Runtime.addConstructor(type, FlashRuntime);
-
-	return extensions;
-});
-
-// Included from: src/javascript/runtime/flash/file/Blob.js
-
-/**
- * Blob.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
-
-/**
-@class moxie/runtime/flash/file/Blob
-@private
-*/
-define("moxie/runtime/flash/file/Blob", [
-	"moxie/runtime/flash/Runtime",
-	"moxie/file/Blob"
-], function(extensions, Blob) {
-
-	var FlashBlob = {
-		slice: function(blob, start, end, type) {
-			var self = this.getRuntime();
-
-			if (start < 0) {
-				start = Math.max(blob.size + start, 0);
-			} else if (start > 0) {
-				start = Math.min(start, blob.size);
-			}
-
-			if (end < 0) {
-				end = Math.max(blob.size + end, 0);
-			} else if (end > 0) {
-				end = Math.min(end, blob.size);
-			}
-
-			blob = self.shimExec.call(this, 'Blob', 'slice', start, end, type || '');
-
-			if (blob) {
-				blob = new Blob(self.uid, blob);
-			}
-			return blob;
-		}
-	};
-
-	return (extensions.Blob = FlashBlob);
-});
-
-// Included from: src/javascript/runtime/flash/file/FileInput.js
-
-/**
- * FileInput.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
-
-/**
-@class moxie/runtime/flash/file/FileInput
-@private
-*/
-define("moxie/runtime/flash/file/FileInput", [
-	"moxie/runtime/flash/Runtime"
-], function(extensions) {
-	
-	var FileInput = {		
-		init: function(options) {
-			this.getRuntime().shimExec.call(this, 'FileInput', 'init', {
-				name: options.name,
-				accept: options.accept,
-				multiple: options.multiple
-			});
-			this.trigger('ready');
-		}
-	};
-
-	return (extensions.FileInput = FileInput);
-});
-
-// Included from: src/javascript/runtime/flash/file/FileReader.js
-
-/**
- * FileReader.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
-
-/**
-@class moxie/runtime/flash/file/FileReader
-@private
-*/
-define("moxie/runtime/flash/file/FileReader", [
-	"moxie/runtime/flash/Runtime",
-	"moxie/core/utils/Encode"
-], function(extensions, Encode) {
-
-	var _result = '';
-
-	function _formatData(data, op) {
-		switch (op) {
-			case 'readAsText':
-				return Encode.atob(data, 'utf8');
-			case 'readAsBinaryString':
-				return Encode.atob(data);
-			case 'readAsDataURL':
-				return data;
-		}
-		return null;
-	}
-
-	var FileReader = {
-		read: function(op, blob) {
-			var target = this, self = target.getRuntime();
-
-			// special prefix for DataURL read mode
-			if (op === 'readAsDataURL') {
-				_result = 'data:' + (blob.type || '') + ';base64,';
-			}
-
-			target.bind('Progress', function(e, data) {
-				if (data) {
-					_result += _formatData(data, op);
-				}
-			});
-
-			return self.shimExec.call(this, 'FileReader', 'readAsBase64', blob.uid);
-		},
-
-		getResult: function() {
-			return _result;
-		},
-
-		destroy: function() {
-			_result = null;
-		}
-	};
-
-	return (extensions.FileReader = FileReader);
-});
-
-// Included from: src/javascript/runtime/flash/file/FileReaderSync.js
-
-/**
- * FileReaderSync.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
-
-/**
-@class moxie/runtime/flash/file/FileReaderSync
-@private
-*/
-define("moxie/runtime/flash/file/FileReaderSync", [
-	"moxie/runtime/flash/Runtime",
-	"moxie/core/utils/Encode"
-], function(extensions, Encode) {
-	
-	function _formatData(data, op) {
-		switch (op) {
-			case 'readAsText':
-				return Encode.atob(data, 'utf8');
-			case 'readAsBinaryString':
-				return Encode.atob(data);
-			case 'readAsDataURL':
-				return data;
+			obj.attachEvent('on' + name, func);
 		}
-		return null;
-	}
-
-	var FileReaderSync = {
-		read: function(op, blob) {
-			var result, self = this.getRuntime();
-
-			result = self.shimExec.call(this, 'FileReaderSync', 'readAsBase64', blob.uid);
-			if (!result) {
-				return null; // or throw ex
-			}
-
-			// special prefix for DataURL read mode
-			if (op === 'readAsDataURL') {
-				result = 'data:' + (blob.type || '') + ';base64,' + result;
-			}
-
-			return _formatData(result, op, blob.type);
+		
+		// Log event handler to objects internal mOxie registry
+		if (!obj[uid]) {
+			obj[uid] = Basic.guid();
+		}
+		
+		if (!eventhash.hasOwnProperty(obj[uid])) {
+			eventhash[obj[uid]] = {};
+		}
+		
+		events = eventhash[obj[uid]];
+		
+		if (!events.hasOwnProperty(name)) {
+			events[name] = [];
 		}
+				
+		events[name].push({
+			func: func,
+			orig: callback, // store original callback for IE
+			key: key
+		});
 	};
-
-	return (extensions.FileReaderSync = FileReaderSync);
-});
-
-// Included from: src/javascript/runtime/flash/xhr/XMLHttpRequest.js
-
-/**
- * XMLHttpRequest.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
-
-/**
-@class moxie/runtime/flash/xhr/XMLHttpRequest
-@private
-*/
-define("moxie/runtime/flash/xhr/XMLHttpRequest", [
-	"moxie/runtime/flash/Runtime",
-	"moxie/core/utils/Basic",
-	"moxie/file/Blob",
-	"moxie/file/File",
-	"moxie/file/FileReaderSync",
-	"moxie/xhr/FormData",
-	"moxie/runtime/Transporter"
-], function(extensions, Basic, Blob, File, FileReaderSync, FormData, Transporter) {
 	
-	var XMLHttpRequest = {
-
-		send: function(meta, data) {
-			var target = this, self = target.getRuntime();
-
-			function send() {
-				meta.transport = self.mode;
-				self.shimExec.call(target, 'XMLHttpRequest', 'send', meta, data);
-			}
-
-
-			function appendBlob(name, blob) {
-				self.shimExec.call(target, 'XMLHttpRequest', 'appendBlob', name, blob.uid);
-				data = null;
-				send();
-			}
-
-
-			function attachBlob(blob, cb) {
-				var tr = new Transporter();
-
-				tr.bind("TransportingComplete", function() {
-					cb(this.result);
-				});
-
-				tr.transport(blob.getSource(), blob.type, {
-					ruid: self.uid
-				});
-			}
-
-			// copy over the headers if any
-			if (!Basic.isEmptyObj(meta.headers)) {
-				Basic.each(meta.headers, function(value, header) {
-					self.shimExec.call(target, 'XMLHttpRequest', 'setRequestHeader', header, value.toString()); // Silverlight doesn't accept integers into the arguments of type object
-				});
-			}
-
-			// transfer over multipart params and blob itself
-			if (data instanceof FormData) {
-				var blobField;
-				data.each(function(value, name) {
-					if (value instanceof Blob) {
-						blobField = name;
-					} else {
-						self.shimExec.call(target, 'XMLHttpRequest', 'append', name, value);
-					}
-				});
-
-				if (!data.hasBlob()) {
-					data = null;
-					send();
-				} else {
-					var blob = data.getBlob();
-					if (blob.isDetached()) {
-						attachBlob(blob, function(attachedBlob) {
-							blob.destroy();
-							appendBlob(blobField, attachedBlob);		
-						});
-					} else {
-						appendBlob(blobField, blob);
-					}
+	
+	/**
+	Remove event handler from the specified object. If third argument (callback)
+	is not specified remove all events with the specified name.
+	
+	@method removeEvent
+	@static
+	@param {Object} obj DOM element to remove event listener(s) from.
+	@param {String} name Name of event listener to remove.
+	@param {Function|String} [callback] might be a callback or unique key to match.
+	*/
+	var removeEvent = function(obj, name, callback) {
+		var type, undef;
+		
+		name = name.toLowerCase();
+		
+		if (obj[uid] && eventhash[obj[uid]] && eventhash[obj[uid]][name]) {
+			type = eventhash[obj[uid]][name];
+		} else {
+			return;
+		}
+			
+		for (var i = type.length - 1; i >= 0; i--) {
+			// undefined or not, key should match
+			if (type[i].orig === callback || type[i].key === callback) {
+				if (obj.removeEventListener) {
+					obj.removeEventListener(name, type[i].func, false);
+				} else if (obj.detachEvent) {
+					obj.detachEvent('on'+name, type[i].func);
 				}
-			} else if (data instanceof Blob) {
-				if (data.isDetached()) {
-					attachBlob(data, function(attachedBlob) {
-						data.destroy();
-						data = attachedBlob.uid;
-						send();
-					});
-				} else {
-					data = data.uid;
-					send();
+				
+				type[i].orig = null;
+				type[i].func = null;
+				type.splice(i, 1);
+				
+				// If callback was passed we are done here, otherwise proceed
+				if (callback !== undef) {
+					break;
 				}
-			} else {
-				send();
 			}
-		},
-
-		getResponse: function(responseType) {
-			var frs, blob, self = this.getRuntime();
-
-			blob = self.shimExec.call(this, 'XMLHttpRequest', 'getResponseAsBlob');
-
-			if (blob) {
-				blob = new File(self.uid, blob);
-
-				if ('blob' === responseType) {
-					return blob;
-				}
-
-				try { 
-					frs = new FileReaderSync();
-
-					if (!!~Basic.inArray(responseType, ["", "text"])) {
-						return frs.readAsText(blob);
-					} else if ('json' === responseType && !!window.JSON) {
-						return JSON.parse(frs.readAsText(blob));
-					}
-				} finally {
-					blob.destroy();
-				}
+		}
+		
+		// If event array got empty, remove it
+		if (!type.length) {
+			delete eventhash[obj[uid]][name];
+		}
+		
+		// If mOxie registry has become empty, remove it
+		if (Basic.isEmptyObj(eventhash[obj[uid]])) {
+			delete eventhash[obj[uid]];
+			
+			// IE doesn't let you remove DOM object property with - delete
+			try {
+				delete obj[uid];
+			} catch(e) {
+				obj[uid] = undef;
 			}
-			return null;
-		},
-
-		abort: function(upload_complete_flag) {
-			var self = this.getRuntime();
-
-			self.shimExec.call(this, 'XMLHttpRequest', 'abort');
-
-			this.dispatchEvent('readystatechange');
-			// this.dispatchEvent('progress');
-			this.dispatchEvent('abort');
-
-			//if (!upload_complete_flag) {
-				// this.dispatchEvent('uploadprogress');
-			//}
 		}
 	};
-
-	return (extensions.XMLHttpRequest = XMLHttpRequest);
-});
-
-// Included from: src/javascript/runtime/flash/runtime/Transporter.js
-
-/**
- * Transporter.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
-
-/**
-@class moxie/runtime/flash/runtime/Transporter
-@private
-*/
-define("moxie/runtime/flash/runtime/Transporter", [
-	"moxie/runtime/flash/Runtime",
-	"moxie/file/Blob"
-], function(extensions, Blob) {
-
-	var Transporter = {
-		getAsBlob: function(type) {
-			var self = this.getRuntime()
-			, blob = self.shimExec.call(this, 'Transporter', 'getAsBlob', type)
-			;
-			if (blob) {
-				return new Blob(self.uid, blob);
-			}
-			return null;
+	
+	
+	/**
+	Remove all kind of events from the specified object
+	
+	@method removeAllEvents
+	@static
+	@param {Object} obj DOM element to remove event listeners from.
+	@param {String} [key] unique key to match, when removing events.
+	*/
+	var removeAllEvents = function(obj, key) {		
+		if (!obj || !obj[uid]) {
+			return;
 		}
+		
+		Basic.each(eventhash[obj[uid]], function(events, name) {
+			removeEvent(obj, name, key);
+		});
 	};
 
-	return (extensions.Transporter = Transporter);
+	return {
+		addEvent: addEvent,
+		removeEvent: removeEvent,
+		removeAllEvents: removeAllEvents
+	};
 });
 
-
-// Included from: src/javascript/runtime/silverlight/Runtime.js
+// Included from: src/javascript/runtime/html4/file/FileInput.js
 
 /**
- * RunTime.js
+ * FileInput.js
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -6967,364 +6134,239 @@ define("moxie/runtime/flash/runtime/Transporter", [
  * Contributing: http://www.plupload.com/contributing
  */
 
-/*global ActiveXObject:true */
-
 /**
-Defines constructor for Silverlight runtime.
-
-@class moxie/runtime/silverlight/Runtime
+@class moxie/runtime/html4/file/FileInput
 @private
 */
-define("moxie/runtime/silverlight/Runtime", [
+define("moxie/runtime/html4/file/FileInput", [
+	"moxie/runtime/html4/Runtime",
 	"moxie/core/utils/Basic",
-	"moxie/core/utils/Env",
 	"moxie/core/utils/Dom",
-	"moxie/core/Exceptions",
-	"moxie/runtime/Runtime"
-], function(Basic, Env, Dom, x, Runtime) {
+	"moxie/core/utils/Events",
+	"moxie/core/utils/Mime",
+	"moxie/core/utils/Env"
+], function(extensions, Basic, Dom, Events, Mime, Env) {
 	
-	var type = "silverlight", extensions = {};
-
-	function isInstalled(version) {
-		var isVersionSupported = false, control = null, actualVer,
-			actualVerArray, reqVerArray, requiredVersionPart, actualVersionPart, index = 0;
-
-		try {
-			try {
-				control = new ActiveXObject('AgControl.AgControl');
+	function FileInput() {
+		var _uid, _files = [], _mimes = [], _options;
 
-				if (control.IsVersionSupported(version)) {
-					isVersionSupported = true;
-				}
+		function addInput() {
+			var comp = this, I = comp.getRuntime(), shimContainer, browseButton, currForm, form, input, uid;
 
-				control = null;
-			} catch (e) {
-				var plugin = navigator.plugins["Silverlight Plug-In"];
+			uid = Basic.guid('uid_');
 
-				if (plugin) {
-					actualVer = plugin.description;
+			shimContainer = I.getShimContainer(); // we get new ref everytime to avoid memory leaks in IE
 
-					if (actualVer === "1.0.30226.2") {
-						actualVer = "2.0.30226.2";
-					}
+			if (_uid) { // move previous form out of the view
+				currForm = Dom.get(_uid + '_form');
+				if (currForm) {
+					Basic.extend(currForm.style, { top: '100%' });
+				}
+			}
 
-					actualVerArray = actualVer.split(".");
+			// build form in DOM, since innerHTML version not able to submit file for some reason
+			form = document.createElement('form');
+			form.setAttribute('id', uid + '_form');
+			form.setAttribute('method', 'post');
+			form.setAttribute('enctype', 'multipart/form-data');
+			form.setAttribute('encoding', 'multipart/form-data');
 
-					while (actualVerArray.length > 3) {
-						actualVerArray.pop();
-					}
+			Basic.extend(form.style, {
+				overflow: 'hidden',
+				position: 'absolute',
+				top: 0,
+				left: 0,
+				width: '100%',
+				height: '100%'
+			});
 
-					while ( actualVerArray.length < 4) {
-						actualVerArray.push(0);
-					}
+			input = document.createElement('input');
+			input.setAttribute('id', uid);
+			input.setAttribute('type', 'file');
+			input.setAttribute('name', _options.name || 'Filedata');
+			input.setAttribute('accept', _mimes.join(','));
 
-					reqVerArray = version.split(".");
+			Basic.extend(input.style, {
+				fontSize: '999px',
+				opacity: 0
+			});
 
-					while (reqVerArray.length > 4) {
-						reqVerArray.pop();
-					}
+			form.appendChild(input);
+			shimContainer.appendChild(form);
 
-					do {
-						requiredVersionPart = parseInt(reqVerArray[index], 10);
-						actualVersionPart = parseInt(actualVerArray[index], 10);
-						index++;
-					} while (index < reqVerArray.length && requiredVersionPart === actualVersionPart);
+			// prepare file input to be placed underneath the browse_button element
+			Basic.extend(input.style, {
+				position: 'absolute',
+				top: 0,
+				left: 0,
+				width: '100%',
+				height: '100%'
+			});
 
-					if (requiredVersionPart <= actualVersionPart && !isNaN(requiredVersionPart)) {
-						isVersionSupported = true;
-					}
-				}
+			if (Env.browser === 'IE' && Env.version < 10) {
+				Basic.extend(input.style, {
+					filter : "progid:DXImageTransform.Microsoft.Alpha(opacity=0)"
+				});
 			}
-		} catch (e2) {
-			isVersionSupported = false;
-		}
-
-		return isVersionSupported;
-	}
-
-	/**
-	Constructor for the Silverlight Runtime
 
-	@class SilverlightRuntime
-	@extends Runtime
-	*/
-	function SilverlightRuntime(options) {
-		var I = this, initTimer;
+			input.onchange = function() { // there should be only one handler for this
+				var file;
 
-		options = Basic.extend({ xap_url: Env.xap_url }, options);
+				if (!this.value) {
+					return;
+				}
 
-		Runtime.call(this, options, type, {
-			access_binary: Runtime.capTrue,
-			access_image_binary: Runtime.capTrue,
-			display_media: Runtime.capTrue,
-			do_cors: Runtime.capTrue,
-			drag_and_drop: false,
-			report_upload_progress: Runtime.capTrue,
-			resize_image: Runtime.capTrue,
-			return_response_headers: function(value) {
-				return value && I.mode === 'client';
-			},
-			return_response_type: function(responseType) {
-				if (responseType !== 'json') {
-					return true;
+				if (this.files) {
+					file = this.files[0];
 				} else {
-					return !!window.JSON;
+					file = {
+						name: this.value
+					};
 				}
-			},
-			return_status_code: function(code) {
-				return I.mode === 'client' || !Basic.arrayDiff(code, [200, 404]);
-			},
-			select_file: Runtime.capTrue,
-			select_multiple: Runtime.capTrue,
-			send_binary_string: Runtime.capTrue,
-			send_browser_cookies: function(value) {
-				return value && I.mode === 'browser';
-			},
-			send_custom_headers: function(value) {
-				return value && I.mode === 'client';
-			},
-			send_multipart: Runtime.capTrue,
-			slice_blob: Runtime.capTrue,
-			stream_upload: true,
-			summon_file_dialog: false,
-			upload_filesize: Runtime.capTrue,
-			use_http_method: function(methods) {
-				return I.mode === 'client' || !Basic.arrayDiff(methods, ['GET', 'POST']);
-			}
-		}, { 
-			// capabilities that require specific mode
-			return_response_headers: function(value) {
-				return value ? 'client' : 'browser';
-			},
-			return_status_code: function(code) {
-				return Basic.arrayDiff(code, [200, 404]) ? 'client' : ['client', 'browser'];
-			},
-			send_browser_cookies: function(value) {
-				return value ? 'browser' : 'client';
-			},
-			send_custom_headers: function(value) {
-				return value ? 'client' : 'browser';
-			},
-			use_http_method: function(methods) {
-				return Basic.arrayDiff(methods, ['GET', 'POST']) ? 'client' : ['client', 'browser'];
-			}
-		});
 
+				_files = [file];
 
-		// minimal requirement
-		if (!isInstalled('2.0.31005.0') || Env.browser === 'Opera') {
-			this.mode = false;
-		}
+				this.onchange = function() {}; // clear event handler
+				addInput.call(comp);
 
+				// after file is initialized as o.File, we need to update form and input ids
+				comp.bind('change', function onChange() {
+					var input = Dom.get(uid), form = Dom.get(uid + '_form'), file;
 
-		Basic.extend(this, {
-			getShim: function() {
-				return Dom.get(this.uid).content.Moxie;
-			},
+					comp.unbind('change', onChange);
 
-			shimExec: function(component, action) {
-				var args = [].slice.call(arguments, 2);
-				return I.getShim().exec(this.uid, component, action, args);
-			},
+					if (comp.files.length && input && form) {
+						file = comp.files[0];
 
-			init : function() {
-				var container;
+						input.setAttribute('id', file.uid);
+						form.setAttribute('id', file.uid + '_form');
 
-				container = this.getShimContainer();
+						// set upload target
+						form.setAttribute('target', file.uid + '_iframe');
+					}
+					input = form = null;
+				}, 998);
 
-				container.innerHTML = '<object id="' + this.uid + '" data="data:application/x-silverlight," type="application/x-silverlight-2" width="100%" height="100%" style="outline:none;">' +
-					'<param name="source" value="' + options.xap_url + '"/>' +
-					'<param name="background" value="Transparent"/>' +
-					'<param name="windowless" value="true"/>' +
-					'<param name="enablehtmlaccess" value="true"/>' +
-					'<param name="initParams" value="uid=' + this.uid + ',target=' + Env.global_event_dispatcher + '"/>' +
-				'</object>';
+				input = form = null;
+				comp.trigger('change');
+			};
 
-				// Init is dispatched by the shim
-				initTimer = setTimeout(function() {
-					if (I && !I.initialized) { // runtime might be already destroyed by this moment
-						I.trigger("Error", new x.RuntimeError(x.RuntimeError.NOT_INIT_ERR));
+
+			// route click event to the input
+			if (I.can('summon_file_dialog')) {
+				browseButton = Dom.get(_options.browse_button);
+				Events.removeEvent(browseButton, 'click', comp.uid);
+				Events.addEvent(browseButton, 'click', function(e) {
+					if (input && !input.disabled) { // for some reason FF (up to 8.0.1 so far) lets to click disabled input[type=file]
+						input.click();
 					}
-				}, Env.OS !== 'Windows'? 10000 : 5000); // give it more time to initialize in non Windows OS (like Mac)
-			},
+					e.preventDefault();
+				}, comp.uid);
+			}
+
+			_uid = uid;
+
+			shimContainer = currForm = browseButton = null;
+		}
 
-			destroy: (function(destroy) { // extend default destroy method
-				return function() {
-					destroy.call(I);
-					clearTimeout(initTimer); // initialization check might be still onwait
-					options = initTimer = destroy = I = null;
-				};
-			}(this.destroy))
+		Basic.extend(this, {
+			init: function(options) {
+				var comp = this, I = comp.getRuntime(), shimContainer;
 
-		}, extensions);
-	}
+				// figure out accept string
+				_options = options;
+				_mimes = options.accept.mimes || Mime.extList2mimes(options.accept, I.can('filter_by_extension'));
 
-	Runtime.addConstructor(type, SilverlightRuntime); 
+				shimContainer = I.getShimContainer();
 
-	return extensions;
-});
+				(function() {
+					var browseButton, zIndex, top;
 
-// Included from: src/javascript/runtime/silverlight/file/Blob.js
+					browseButton = Dom.get(options.browse_button);
 
-/**
- * Blob.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
+					// Route click event to the input[type=file] element for browsers that support such behavior
+					if (I.can('summon_file_dialog')) {
+						if (Dom.getStyle(browseButton, 'position') === 'static') {
+							browseButton.style.position = 'relative';
+						}
 
-/**
-@class moxie/runtime/silverlight/file/Blob
-@private
-*/
-define("moxie/runtime/silverlight/file/Blob", [
-	"moxie/runtime/silverlight/Runtime",
-	"moxie/core/utils/Basic",
-	"moxie/runtime/flash/file/Blob"
-], function(extensions, Basic, Blob) {
-	return (extensions.Blob = Basic.extend({}, Blob));
-});
+						zIndex = parseInt(Dom.getStyle(browseButton, 'z-index'), 10) || 1;
 
-// Included from: src/javascript/runtime/silverlight/file/FileInput.js
+						browseButton.style.zIndex = zIndex;
+						shimContainer.style.zIndex = zIndex - 1;
+					}
 
-/**
- * FileInput.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
+					/* Since we have to place input[type=file] on top of the browse_button for some browsers,
+					browse_button loses interactivity, so we restore it here */
+					top = I.can('summon_file_dialog') ? browseButton : shimContainer;
 
-/**
-@class moxie/runtime/silverlight/file/FileInput
-@private
-*/
-define("moxie/runtime/silverlight/file/FileInput", [
-	"moxie/runtime/silverlight/Runtime"
-], function(extensions) {
-	
-	var FileInput = {
-		init: function(options) {
+					Events.addEvent(top, 'mouseover', function() {
+						comp.trigger('mouseenter');
+					}, comp.uid);
 
-			function toFilters(accept) {
-				var filter = '';
-				for (var i = 0; i < accept.length; i++) {
-					filter += (filter !== '' ? '|' : '') + accept[i].title + " | *." + accept[i].extensions.replace(/,/g, ';*.');
-				}
-				return filter;
-			}
-			
-			this.getRuntime().shimExec.call(this, 'FileInput', 'init', toFilters(options.accept), options.name, options.multiple);
-			this.trigger('ready');
-		}
-	};
+					Events.addEvent(top, 'mouseout', function() {
+						comp.trigger('mouseleave');
+					}, comp.uid);
 
-	return (extensions.FileInput = FileInput);
-});
+					Events.addEvent(top, 'mousedown', function() {
+						comp.trigger('mousedown');
+					}, comp.uid);
 
-// Included from: src/javascript/runtime/silverlight/file/FileReader.js
+					Events.addEvent(Dom.get(options.container), 'mouseup', function() {
+						comp.trigger('mouseup');
+					}, comp.uid);
 
-/**
- * FileReader.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
+					browseButton = null;
+				}());
 
-/**
-@class moxie/runtime/silverlight/file/FileReader
-@private
-*/
-define("moxie/runtime/silverlight/file/FileReader", [
-	"moxie/runtime/silverlight/Runtime",
-	"moxie/core/utils/Basic",
-	"moxie/runtime/flash/file/FileReader"
-], function(extensions, Basic, FileReader) {
-	return (extensions.FileReader = Basic.extend({}, FileReader));
-});
+				addInput.call(this);
 
-// Included from: src/javascript/runtime/silverlight/file/FileReaderSync.js
+				shimContainer = null;
 
-/**
- * FileReaderSync.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
+				// trigger ready event asynchronously
+				comp.trigger({
+					type: 'ready',
+					async: true
+				});
+			},
 
-/**
-@class moxie/runtime/silverlight/file/FileReaderSync
-@private
-*/
-define("moxie/runtime/silverlight/file/FileReaderSync", [
-	"moxie/runtime/silverlight/Runtime",
-	"moxie/core/utils/Basic",
-	"moxie/runtime/flash/file/FileReaderSync"
-], function(extensions, Basic, FileReaderSync) {
-	return (extensions.FileReaderSync = Basic.extend({}, FileReaderSync));
-});
+			getFiles: function() {
+				return _files;
+			},
 
-// Included from: src/javascript/runtime/silverlight/xhr/XMLHttpRequest.js
+			disable: function(state) {
+				var input;
 
-/**
- * XMLHttpRequest.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
+				if ((input = Dom.get(_uid))) {
+					input.disabled = !!state;
+				}
+			},
 
-/**
-@class moxie/runtime/silverlight/xhr/XMLHttpRequest
-@private
-*/
-define("moxie/runtime/silverlight/xhr/XMLHttpRequest", [
-	"moxie/runtime/silverlight/Runtime",
-	"moxie/core/utils/Basic",
-	"moxie/runtime/flash/xhr/XMLHttpRequest"
-], function(extensions, Basic, XMLHttpRequest) {
-	return (extensions.XMLHttpRequest = Basic.extend({}, XMLHttpRequest));
-});
+			destroy: function() {
+				var I = this.getRuntime()
+				, shim = I.getShim()
+				, shimContainer = I.getShimContainer()
+				;
+				
+				Events.removeAllEvents(shimContainer, this.uid);
+				Events.removeAllEvents(_options && Dom.get(_options.container), this.uid);
+				Events.removeAllEvents(_options && Dom.get(_options.browse_button), this.uid);
+				
+				if (shimContainer) {
+					shimContainer.innerHTML = '';
+				}
 
-// Included from: src/javascript/runtime/silverlight/runtime/Transporter.js
+				shim.removeInstance(this.uid);
 
-/**
- * Transporter.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
+				_uid = _files = _mimes = _options = shimContainer = shim = null;
+			}
+		});
+	}
 
-/**
-@class moxie/runtime/silverlight/runtime/Transporter
-@private
-*/
-define("moxie/runtime/silverlight/runtime/Transporter", [
-	"moxie/runtime/silverlight/Runtime",
-	"moxie/core/utils/Basic",
-	"moxie/runtime/flash/runtime/Transporter"
-], function(extensions, Basic, Transporter) {
-	return (extensions.Transporter = Basic.extend({}, Transporter));
+	return (extensions.FileInput = FileInput);
 });
 
-
-// Included from: src/javascript/runtime/html4/Runtime.js
+// Included from: src/javascript/runtime/html5/Runtime.js
 
 /**
  * Runtime.js
@@ -7339,73 +6381,91 @@ define("moxie/runtime/silverlight/runtime/Transporter", [
 /*global File:true */
 
 /**
-Defines constructor for HTML4 runtime.
+Defines constructor for HTML5 runtime.
 
-@class moxie/runtime/html4/Runtime
+@class moxie/runtime/html5/Runtime
 @private
 */
-define("moxie/runtime/html4/Runtime", [
+define("moxie/runtime/html5/Runtime", [
 	"moxie/core/utils/Basic",
 	"moxie/core/Exceptions",
 	"moxie/runtime/Runtime",
 	"moxie/core/utils/Env"
 ], function(Basic, x, Runtime, Env) {
 	
-	var type = 'html4', extensions = {};
-
-	function Html4Runtime(options) {
+	var type = "html5", extensions = {};
+	
+	function Html5Runtime(options) {
 		var I = this
 		, Test = Runtime.capTest
 		, True = Runtime.capTrue
 		;
 
-		Runtime.call(this, options, type, {
-			access_binary: Test(window.FileReader || window.File && File.getAsDataURL),
-			access_image_binary: false,
-			display_media: Test(extensions.Image && (Env.can('create_canvas') || Env.can('use_data_uri_over32kb'))),
-			do_cors: false,
-			drag_and_drop: false,
-			filter_by_extension: Test(function() { // if you know how to feature-detect this, please suggest
-				return (Env.browser === 'Chrome' && Env.version >= 28) || (Env.browser === 'IE' && Env.version >= 10);
-			}()),
-			resize_image: function() {
-				return extensions.Image && I.can('access_binary') && Env.can('create_canvas');
-			},
-			report_upload_progress: false,
-			return_response_headers: false,
-			return_response_type: function(responseType) {
-				if (responseType === 'json' && !!window.JSON) {
-					return true;
-				} 
-				return !!~Basic.inArray(responseType, ['text', 'document', '']);
-			},
-			return_status_code: function(code) {
-				return !Basic.arrayDiff(code, [200, 404]);
-			},
-			select_file: function() {
-				return Env.can('use_fileinput');
-			},
-			select_multiple: false,
-			send_binary_string: false,
-			send_custom_headers: false,
-			send_multipart: true,
-			slice_blob: false,
-			stream_upload: function() {
-				return I.can('select_file');
-			},
-			summon_file_dialog: Test(function() { // yeah... some dirty sniffing here...
-				return (Env.browser === 'Firefox' && Env.version >= 4) ||
-					(Env.browser === 'Opera' && Env.version >= 12) ||
-					!!~Basic.inArray(Env.browser, ['Chrome', 'Safari']);
-			}()),
-			upload_filesize: True,
-			use_http_method: function(methods) {
-				return !Basic.arrayDiff(methods, ['GET', 'POST']);
-			}
-		});
+		var caps = Basic.extend({
+				access_binary: Test(window.FileReader || window.File && window.File.getAsDataURL),
+				access_image_binary: function() {
+					return I.can('access_binary') && !!extensions.Image;
+				},
+				display_media: Test(Env.can('create_canvas') || Env.can('use_data_uri_over32kb')),
+				do_cors: Test(window.XMLHttpRequest && 'withCredentials' in new XMLHttpRequest()),
+				drag_and_drop: Test(function() {
+					// this comes directly from Modernizr: http://www.modernizr.com/
+					var div = document.createElement('div');
+					// IE has support for drag and drop since version 5, but doesn't support dropping files from desktop
+					return (('draggable' in div) || ('ondragstart' in div && 'ondrop' in div)) && (Env.browser !== 'IE' || Env.version > 9);
+				}()),
+				filter_by_extension: Test(function() { // if you know how to feature-detect this, please suggest
+					return (Env.browser === 'Chrome' && Env.version >= 28) || (Env.browser === 'IE' && Env.version >= 10);
+				}()),
+				return_response_headers: True,
+				return_response_type: function(responseType) {
+					if (responseType === 'json' && !!window.JSON) { // we can fake this one even if it's not supported
+						return true;
+					} 
+					return Env.can('return_response_type', responseType);
+				},
+				return_status_code: True,
+				report_upload_progress: Test(window.XMLHttpRequest && new XMLHttpRequest().upload),
+				resize_image: function() {
+					return I.can('access_binary') && Env.can('create_canvas');
+				},
+				select_file: function() {
+					return Env.can('use_fileinput') && window.File;
+				},
+				select_folder: function() {
+					return I.can('select_file') && Env.browser === 'Chrome' && Env.version >= 21;
+				},
+				select_multiple: function() {
+					// it is buggy on Safari Windows and iOS
+					return I.can('select_file') && 
+						!(Env.browser === 'Safari' && Env.os === 'Windows') && 
+						!(Env.os === 'iOS' && Env.verComp(Env.osVersion, "7.0.4", '<'));
+				},
+				send_binary_string: Test(window.XMLHttpRequest && (new XMLHttpRequest().sendAsBinary || (window.Uint8Array && window.ArrayBuffer))),
+				send_custom_headers: Test(window.XMLHttpRequest),
+				send_multipart: function() {
+					return !!(window.XMLHttpRequest && new XMLHttpRequest().upload && window.FormData) || I.can('send_binary_string');
+				},
+				slice_blob: Test(window.File && (File.prototype.mozSlice || File.prototype.webkitSlice || File.prototype.slice)),
+				stream_upload: function(){
+					return I.can('slice_blob') && I.can('send_multipart');
+				},
+				summon_file_dialog: Test(function() { // yeah... some dirty sniffing here...
+					return (Env.browser === 'Firefox' && Env.version >= 4) ||
+						(Env.browser === 'Opera' && Env.version >= 12) ||
+						(Env.browser === 'IE' && Env.version >= 10) ||
+						!!~Basic.inArray(Env.browser, ['Chrome', 'Safari']);
+				}()),
+				upload_filesize: True
+			}, 
+			arguments[2]
+		);
+
+		Runtime.call(this, options, (arguments[1] || type), caps);
 
 
 		Basic.extend(this, {
+
 			init : function() {
 				this.trigger("Init");
 			},
@@ -7421,15 +6481,15 @@ define("moxie/runtime/html4/Runtime", [
 		Basic.extend(this.getShim(), extensions);
 	}
 
-	Runtime.addConstructor(type, Html4Runtime);
+	Runtime.addConstructor(type, Html5Runtime);
 
 	return extensions;
 });
 
-// Included from: src/javascript/runtime/html4/file/FileInput.js
+// Included from: src/javascript/runtime/html5/file/FileReader.js
 
 /**
- * FileInput.js
+ * FileReader.js
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -7439,241 +6499,347 @@ define("moxie/runtime/html4/Runtime", [
  */
 
 /**
-@class moxie/runtime/html4/file/FileInput
+@class moxie/runtime/html5/file/FileReader
 @private
 */
-define("moxie/runtime/html4/file/FileInput", [
-	"moxie/runtime/html4/Runtime",
-	"moxie/core/utils/Basic",
-	"moxie/core/utils/Dom",
-	"moxie/core/utils/Events",
-	"moxie/core/utils/Mime",
-	"moxie/core/utils/Env"
-], function(extensions, Basic, Dom, Events, Mime, Env) {
+define("moxie/runtime/html5/file/FileReader", [
+	"moxie/runtime/html5/Runtime",
+	"moxie/core/utils/Encode",
+	"moxie/core/utils/Basic"
+], function(extensions, Encode, Basic) {
 	
-	function FileInput() {
-		var _uid, _files = [], _mimes = [], _options;
+	function FileReader() {
+		var _fr, _convertToBinary = false;
 
-		function addInput() {
-			var comp = this, I = comp.getRuntime(), shimContainer, browseButton, currForm, form, input, uid;
+		Basic.extend(this, {
 
-			uid = Basic.guid('uid_');
+			read: function(op, blob) {
+				var target = this;
 
-			shimContainer = I.getShimContainer(); // we get new ref everytime to avoid memory leaks in IE
+				_fr = new window.FileReader();
 
-			if (_uid) { // move previous form out of the view
-				currForm = Dom.get(_uid + '_form');
-				if (currForm) {
-					Basic.extend(currForm.style, { top: '100%' });
-				}
-			}
+				_fr.addEventListener('progress', function(e) {
+					target.trigger(e);
+				});
 
-			// build form in DOM, since innerHTML version not able to submit file for some reason
-			form = document.createElement('form');
-			form.setAttribute('id', uid + '_form');
-			form.setAttribute('method', 'post');
-			form.setAttribute('enctype', 'multipart/form-data');
-			form.setAttribute('encoding', 'multipart/form-data');
+				_fr.addEventListener('load', function(e) {
+					target.trigger(e);
+				});
 
-			Basic.extend(form.style, {
-				overflow: 'hidden',
-				position: 'absolute',
-				top: 0,
-				left: 0,
-				width: '100%',
-				height: '100%'
-			});
+				_fr.addEventListener('error', function(e) {
+					target.trigger(e, _fr.error);
+				});
 
-			input = document.createElement('input');
-			input.setAttribute('id', uid);
-			input.setAttribute('type', 'file');
-			input.setAttribute('name', _options.name || 'Filedata');
-			input.setAttribute('accept', _mimes.join(','));
+				_fr.addEventListener('loadend', function() {
+					_fr = null;
+				});
 
-			Basic.extend(input.style, {
-				fontSize: '999px',
-				opacity: 0
-			});
+				if (Basic.typeOf(_fr[op]) === 'function') {
+					_convertToBinary = false;
+					_fr[op](blob.getSource());
+				} else if (op === 'readAsBinaryString') { // readAsBinaryString is depricated in general and never existed in IE10+
+					_convertToBinary = true;
+					_fr.readAsDataURL(blob.getSource());
+				}
+			},
 
-			form.appendChild(input);
-			shimContainer.appendChild(form);
+			getResult: function() {
+				return _fr && _fr.result ? (_convertToBinary ? _toBinary(_fr.result) : _fr.result) : null;
+			},
 
-			// prepare file input to be placed underneath the browse_button element
-			Basic.extend(input.style, {
-				position: 'absolute',
-				top: 0,
-				left: 0,
-				width: '100%',
-				height: '100%'
-			});
+			abort: function() {
+				if (_fr) {
+					_fr.abort();
+				}
+			},
 
-			if (Env.browser === 'IE' && Env.version < 10) {
-				Basic.extend(input.style, {
-					filter : "progid:DXImageTransform.Microsoft.Alpha(opacity=0)"
-				});
+			destroy: function() {
+				_fr = null;
 			}
+		});
 
-			input.onchange = function() { // there should be only one handler for this
-				var file;
+		function _toBinary(str) {
+			return Encode.atob(str.substring(str.indexOf('base64,') + 7));
+		}
+	}
 
-				if (!this.value) {
-					return;
-				}
+	return (extensions.FileReader = FileReader);
+});
 
-				if (this.files) {
-					file = this.files[0];
-				} else {
-					file = {
-						name: this.value
-					};
-				}
+// Included from: src/javascript/runtime/html4/file/FileReader.js
 
-				_files = [file];
+/**
+ * FileReader.js
+ *
+ * Copyright 2013, Moxiecode Systems AB
+ * Released under GPL License.
+ *
+ * License: http://www.plupload.com/license
+ * Contributing: http://www.plupload.com/contributing
+ */
 
-				this.onchange = function() {}; // clear event handler
-				addInput.call(comp);
+/**
+@class moxie/runtime/html4/file/FileReader
+@private
+*/
+define("moxie/runtime/html4/file/FileReader", [
+	"moxie/runtime/html4/Runtime",
+	"moxie/runtime/html5/file/FileReader"
+], function(extensions, FileReader) {
+	return (extensions.FileReader = FileReader);
+});
+
+// Included from: src/javascript/runtime/html4/xhr/XMLHttpRequest.js
+
+/**
+ * XMLHttpRequest.js
+ *
+ * Copyright 2013, Moxiecode Systems AB
+ * Released under GPL License.
+ *
+ * License: http://www.plupload.com/license
+ * Contributing: http://www.plupload.com/contributing
+ */
+
+/**
+@class moxie/runtime/html4/xhr/XMLHttpRequest
+@private
+*/
+define("moxie/runtime/html4/xhr/XMLHttpRequest", [
+	"moxie/runtime/html4/Runtime",
+	"moxie/core/utils/Basic",
+	"moxie/core/utils/Dom",
+	"moxie/core/utils/Url",
+	"moxie/core/Exceptions",
+	"moxie/core/utils/Events",
+	"moxie/file/Blob",
+	"moxie/xhr/FormData"
+], function(extensions, Basic, Dom, Url, x, Events, Blob, FormData) {
+	
+	function XMLHttpRequest() {
+		var _status, _response, _iframe;
 
-				// after file is initialized as o.File, we need to update form and input ids
-				comp.bind('change', function onChange() {
-					var input = Dom.get(uid), form = Dom.get(uid + '_form'), file;
+		function cleanup(cb) {
+			var target = this, uid, form, inputs, i, hasFile = false;
 
-					comp.unbind('change', onChange);
+			if (!_iframe) {
+				return;
+			}
 
-					if (comp.files.length && input && form) {
-						file = comp.files[0];
+			uid = _iframe.id.replace(/_iframe$/, '');
 
-						input.setAttribute('id', file.uid);
-						form.setAttribute('id', file.uid + '_form');
+			form = Dom.get(uid + '_form');
+			if (form) {
+				inputs = form.getElementsByTagName('input');
+				i = inputs.length;
 
-						// set upload target
-						form.setAttribute('target', file.uid + '_iframe');
+				while (i--) {
+					switch (inputs[i].getAttribute('type')) {
+						case 'hidden':
+							inputs[i].parentNode.removeChild(inputs[i]);
+							break;
+						case 'file':
+							hasFile = true; // flag the case for later
+							break;
 					}
-					input = form = null;
-				}, 998);
-
-				input = form = null;
-				comp.trigger('change');
-			};
-
+				}
+				inputs = [];
 
-			// route click event to the input
-			if (I.can('summon_file_dialog')) {
-				browseButton = Dom.get(_options.browse_button);
-				Events.removeEvent(browseButton, 'click', comp.uid);
-				Events.addEvent(browseButton, 'click', function(e) {
-					if (input && !input.disabled) { // for some reason FF (up to 8.0.1 so far) lets to click disabled input[type=file]
-						input.click();
-					}
-					e.preventDefault();
-				}, comp.uid);
+				if (!hasFile) { // we need to keep the form for sake of possible retries
+					form.parentNode.removeChild(form);
+				}
+				form = null;
 			}
 
-			_uid = uid;
+			// without timeout, request is marked as canceled (in console)
+			setTimeout(function() {
+				Events.removeEvent(_iframe, 'load', target.uid);
+				if (_iframe.parentNode) { // #382
+					_iframe.parentNode.removeChild(_iframe);
+				}
 
-			shimContainer = currForm = browseButton = null;
+				// check if shim container has any other children, if - not, remove it as well
+				var shimContainer = target.getRuntime().getShimContainer();
+				if (!shimContainer.children.length) {
+					shimContainer.parentNode.removeChild(shimContainer);
+				}
+
+				shimContainer = _iframe = null;
+				cb();
+			}, 1);
 		}
 
 		Basic.extend(this, {
-			init: function(options) {
-				var comp = this, I = comp.getRuntime(), shimContainer;
+			send: function(meta, data) {
+				var target = this, I = target.getRuntime(), uid, form, input, blob;
 
-				// figure out accept string
-				_options = options;
-				_mimes = options.accept.mimes || Mime.extList2mimes(options.accept, I.can('filter_by_extension'));
+				_status = _response = null;
 
-				shimContainer = I.getShimContainer();
+				function createIframe() {
+					var container = I.getShimContainer() || document.body
+					, temp = document.createElement('div')
+					;
 
-				(function() {
-					var browseButton, zIndex, top;
+					// IE 6 won't be able to set the name using setAttribute or iframe.name
+					temp.innerHTML = '<iframe id="' + uid + '_iframe" name="' + uid + '_iframe" src="javascript:&quot;&quot;" style="display:none"></iframe>';
+					_iframe = temp.firstChild;
+					container.appendChild(_iframe);
 
-					browseButton = Dom.get(options.browse_button);
+					/* _iframe.onreadystatechange = function() {
+						console.info(_iframe.readyState);
+					};*/
 
-					// Route click event to the input[type=file] element for browsers that support such behavior
-					if (I.can('summon_file_dialog')) {
-						if (Dom.getStyle(browseButton, 'position') === 'static') {
-							browseButton.style.position = 'relative';
-						}
+					Events.addEvent(_iframe, 'load', function() { // _iframe.onload doesn't work in IE lte 8
+						var el;
 
-						zIndex = parseInt(Dom.getStyle(browseButton, 'z-index'), 10) || 1;
+						try {
+							el = _iframe.contentWindow.document || _iframe.contentDocument || window.frames[_iframe.id].document;
 
-						browseButton.style.zIndex = zIndex;
-						shimContainer.style.zIndex = zIndex - 1;
-					}
+							// try to detect some standard error pages
+							if (/^4(0[0-9]|1[0-7]|2[2346])\s/.test(el.title)) { // test if title starts with 4xx HTTP error
+								_status = el.title.replace(/^(\d+).*$/, '$1');
+							} else {
+								_status = 200;
+								// get result
+								_response = Basic.trim(el.body.innerHTML);
 
-					/* Since we have to place input[type=file] on top of the browse_button for some browsers,
-					browse_button loses interactivity, so we restore it here */
-					top = I.can('summon_file_dialog') ? browseButton : shimContainer;
+								// we need to fire these at least once
+								target.trigger({
+									type: 'progress',
+									loaded: _response.length,
+									total: _response.length
+								});
 
-					Events.addEvent(top, 'mouseover', function() {
-						comp.trigger('mouseenter');
-					}, comp.uid);
+								if (blob) { // if we were uploading a file
+									target.trigger({
+										type: 'uploadprogress',
+										loaded: blob.size || 1025,
+										total: blob.size || 1025
+									});
+								}
+							}
+						} catch (ex) {
+							if (Url.hasSameOrigin(meta.url)) {
+								// if response is sent with error code, iframe in IE gets redirected to res://ieframe.dll/http_x.htm
+								// which obviously results to cross domain error (wtf?)
+								_status = 404;
+							} else {
+								cleanup.call(target, function() {
+									target.trigger('error');
+								});
+								return;
+							}
+						}	
+					
+						cleanup.call(target, function() {
+							target.trigger('load');
+						});
+					}, target.uid);
+				} // end createIframe
 
-					Events.addEvent(top, 'mouseout', function() {
-						comp.trigger('mouseleave');
-					}, comp.uid);
+				// prepare data to be sent and convert if required
+				if (data instanceof FormData && data.hasBlob()) {
+					blob = data.getBlob();
+					uid = blob.uid;
+					input = Dom.get(uid);
+					form = Dom.get(uid + '_form');
+					if (!form) {
+						throw new x.DOMException(x.DOMException.NOT_FOUND_ERR);
+					}
+				} else {
+					uid = Basic.guid('uid_');
 
-					Events.addEvent(top, 'mousedown', function() {
-						comp.trigger('mousedown');
-					}, comp.uid);
+					form = document.createElement('form');
+					form.setAttribute('id', uid + '_form');
+					form.setAttribute('method', meta.method);
+					form.setAttribute('enctype', 'multipart/form-data');
+					form.setAttribute('encoding', 'multipart/form-data');
+					form.setAttribute('target', uid + '_iframe');
 
-					Events.addEvent(Dom.get(options.container), 'mouseup', function() {
-						comp.trigger('mouseup');
-					}, comp.uid);
+					I.getShimContainer().appendChild(form);
+				}
 
-					browseButton = null;
-				}());
+				if (data instanceof FormData) {
+					data.each(function(value, name) {
+						if (value instanceof Blob) {
+							if (input) {
+								input.setAttribute('name', name);
+							}
+						} else {
+							var hidden = document.createElement('input');
 
-				addInput.call(this);
+							Basic.extend(hidden, {
+								type : 'hidden',
+								name : name,
+								value : value
+							});
 
-				shimContainer = null;
+							// make sure that input[type="file"], if it's there, comes last
+							if (input) {
+								form.insertBefore(hidden, input);
+							} else {
+								form.appendChild(hidden);
+							}
+						}
+					});
+				}
 
-				// trigger ready event asynchronously
-				comp.trigger({
-					type: 'ready',
-					async: true
-				});
+				// set destination url
+				form.setAttribute("action", meta.url);
+
+				createIframe();
+				form.submit();
+				target.trigger('loadstart');
 			},
 
-			getFiles: function() {
-				return _files;
+			getStatus: function() {
+				return _status;
 			},
 
-			disable: function(state) {
-				var input;
+			getResponse: function(responseType) {
+				if ('json' === responseType) {
+					// strip off <pre>..</pre> tags that might be enclosing the response
+					if (Basic.typeOf(_response) === 'string' && !!window.JSON) {
+						try {
+							return JSON.parse(_response.replace(/^\s*<pre[^>]*>/, '').replace(/<\/pre>\s*$/, ''));
+						} catch (ex) {
+							return null;
+						}
+					} 
+				} else if ('document' === responseType) {
 
-				if ((input = Dom.get(_uid))) {
-					input.disabled = !!state;
 				}
+				return _response;
 			},
 
-			destroy: function() {
-				var I = this.getRuntime()
-				, shim = I.getShim()
-				, shimContainer = I.getShimContainer()
-				;
-				
-				Events.removeAllEvents(shimContainer, this.uid);
-				Events.removeAllEvents(_options && Dom.get(_options.container), this.uid);
-				Events.removeAllEvents(_options && Dom.get(_options.browse_button), this.uid);
-				
-				if (shimContainer) {
-					shimContainer.innerHTML = '';
+			abort: function() {
+				var target = this;
+
+				if (_iframe && _iframe.contentWindow) {
+					if (_iframe.contentWindow.stop) { // FireFox/Safari/Chrome
+						_iframe.contentWindow.stop();
+					} else if (_iframe.contentWindow.document.execCommand) { // IE
+						_iframe.contentWindow.document.execCommand('Stop');
+					} else {
+						_iframe.src = "about:blank";
+					}
 				}
 
-				shim.removeInstance(this.uid);
-
-				_uid = _files = _mimes = _options = shimContainer = shim = null;
+				cleanup.call(this, function() {
+					// target.dispatchEvent('readystatechange');
+					target.dispatchEvent('abort');
+				});
 			}
 		});
 	}
 
-	return (extensions.FileInput = FileInput);
+	return (extensions.XMLHttpRequest = XMLHttpRequest);
 });
 
-// Included from: src/javascript/runtime/html4/file/FileReader.js
+// Included from: src/javascript/runtime/silverlight/Runtime.js
 
 /**
- * FileReader.js
+ * RunTime.js
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -7682,264 +6848,337 @@ define("moxie/runtime/html4/file/FileInput", [
  * Contributing: http://www.plupload.com/contributing
  */
 
-/**
-@class moxie/runtime/html4/file/FileReader
-@private
-*/
-define("moxie/runtime/html4/file/FileReader", [
-	"moxie/runtime/html4/Runtime",
-	"moxie/runtime/html5/file/FileReader"
-], function(extensions, FileReader) {
-	return (extensions.FileReader = FileReader);
-});
-
-// Included from: src/javascript/runtime/html4/xhr/XMLHttpRequest.js
+/*global ActiveXObject:true */
 
 /**
- * XMLHttpRequest.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
+Defines constructor for Silverlight runtime.
 
-/**
-@class moxie/runtime/html4/xhr/XMLHttpRequest
+@class moxie/runtime/silverlight/Runtime
 @private
 */
-define("moxie/runtime/html4/xhr/XMLHttpRequest", [
-	"moxie/runtime/html4/Runtime",
+define("moxie/runtime/silverlight/Runtime", [
 	"moxie/core/utils/Basic",
+	"moxie/core/utils/Env",
 	"moxie/core/utils/Dom",
-	"moxie/core/utils/Url",
 	"moxie/core/Exceptions",
-	"moxie/core/utils/Events",
-	"moxie/file/Blob",
-	"moxie/xhr/FormData"
-], function(extensions, Basic, Dom, Url, x, Events, Blob, FormData) {
+	"moxie/runtime/Runtime"
+], function(Basic, Env, Dom, x, Runtime) {
 	
-	function XMLHttpRequest() {
-		var _status, _response, _iframe;
+	var type = "silverlight", extensions = {};
 
-		function cleanup(cb) {
-			var target = this, uid, form, inputs, i, hasFile = false;
+	function isInstalled(version) {
+		var isVersionSupported = false, control = null, actualVer,
+			actualVerArray, reqVerArray, requiredVersionPart, actualVersionPart, index = 0;
 
-			if (!_iframe) {
-				return;
-			}
+		try {
+			try {
+				control = new ActiveXObject('AgControl.AgControl');
 
-			uid = _iframe.id.replace(/_iframe$/, '');
+				if (control.IsVersionSupported(version)) {
+					isVersionSupported = true;
+				}
 
-			form = Dom.get(uid + '_form');
-			if (form) {
-				inputs = form.getElementsByTagName('input');
-				i = inputs.length;
+				control = null;
+			} catch (e) {
+				var plugin = navigator.plugins["Silverlight Plug-In"];
 
-				while (i--) {
-					switch (inputs[i].getAttribute('type')) {
-						case 'hidden':
-							inputs[i].parentNode.removeChild(inputs[i]);
-							break;
-						case 'file':
-							hasFile = true; // flag the case for later
-							break;
+				if (plugin) {
+					actualVer = plugin.description;
+
+					if (actualVer === "1.0.30226.2") {
+						actualVer = "2.0.30226.2";
 					}
-				}
-				inputs = [];
 
-				if (!hasFile) { // we need to keep the form for sake of possible retries
-					form.parentNode.removeChild(form);
+					actualVerArray = actualVer.split(".");
+
+					while (actualVerArray.length > 3) {
+						actualVerArray.pop();
+					}
+
+					while ( actualVerArray.length < 4) {
+						actualVerArray.push(0);
+					}
+
+					reqVerArray = version.split(".");
+
+					while (reqVerArray.length > 4) {
+						reqVerArray.pop();
+					}
+
+					do {
+						requiredVersionPart = parseInt(reqVerArray[index], 10);
+						actualVersionPart = parseInt(actualVerArray[index], 10);
+						index++;
+					} while (index < reqVerArray.length && requiredVersionPart === actualVersionPart);
+
+					if (requiredVersionPart <= actualVersionPart && !isNaN(requiredVersionPart)) {
+						isVersionSupported = true;
+					}
 				}
-				form = null;
 			}
+		} catch (e2) {
+			isVersionSupported = false;
+		}
 
-			// without timeout, request is marked as canceled (in console)
-			setTimeout(function() {
-				Events.removeEvent(_iframe, 'load', target.uid);
-				if (_iframe.parentNode) { // #382
-					_iframe.parentNode.removeChild(_iframe);
-				}
+		return isVersionSupported;
+	}
 
-				// check if shim container has any other children, if - not, remove it as well
-				var shimContainer = target.getRuntime().getShimContainer();
-				if (!shimContainer.children.length) {
-					shimContainer.parentNode.removeChild(shimContainer);
+	/**
+	Constructor for the Silverlight Runtime
+
+	@class SilverlightRuntime
+	@extends Runtime
+	*/
+	function SilverlightRuntime(options) {
+		var I = this, initTimer;
+
+		options = Basic.extend({ xap_url: Env.xap_url }, options);
+
+		Runtime.call(this, options, type, {
+			access_binary: Runtime.capTrue,
+			access_image_binary: Runtime.capTrue,
+			display_media: Runtime.capTrue,
+			do_cors: Runtime.capTrue,
+			drag_and_drop: false,
+			report_upload_progress: Runtime.capTrue,
+			resize_image: Runtime.capTrue,
+			return_response_headers: function(value) {
+				return value && I.mode === 'client';
+			},
+			return_response_type: function(responseType) {
+				if (responseType !== 'json') {
+					return true;
+				} else {
+					return !!window.JSON;
 				}
+			},
+			return_status_code: function(code) {
+				return I.mode === 'client' || !Basic.arrayDiff(code, [200, 404]);
+			},
+			select_file: Runtime.capTrue,
+			select_multiple: Runtime.capTrue,
+			send_binary_string: Runtime.capTrue,
+			send_browser_cookies: function(value) {
+				return value && I.mode === 'browser';
+			},
+			send_custom_headers: function(value) {
+				return value && I.mode === 'client';
+			},
+			send_multipart: Runtime.capTrue,
+			slice_blob: Runtime.capTrue,
+			stream_upload: true,
+			summon_file_dialog: false,
+			upload_filesize: Runtime.capTrue,
+			use_http_method: function(methods) {
+				return I.mode === 'client' || !Basic.arrayDiff(methods, ['GET', 'POST']);
+			}
+		}, { 
+			// capabilities that require specific mode
+			return_response_headers: function(value) {
+				return value ? 'client' : 'browser';
+			},
+			return_status_code: function(code) {
+				return Basic.arrayDiff(code, [200, 404]) ? 'client' : ['client', 'browser'];
+			},
+			send_browser_cookies: function(value) {
+				return value ? 'browser' : 'client';
+			},
+			send_custom_headers: function(value) {
+				return value ? 'client' : 'browser';
+			},
+			use_http_method: function(methods) {
+				return Basic.arrayDiff(methods, ['GET', 'POST']) ? 'client' : ['client', 'browser'];
+			}
+		});
 
-				shimContainer = _iframe = null;
-				cb();
-			}, 1);
+
+		// minimal requirement
+		if (!isInstalled('2.0.31005.0') || Env.browser === 'Opera') {
+			this.mode = false;
 		}
 
+
 		Basic.extend(this, {
-			send: function(meta, data) {
-				var target = this, I = target.getRuntime(), uid, form, input, blob;
+			getShim: function() {
+				return Dom.get(this.uid).content.Moxie;
+			},
 
-				_status = _response = null;
+			shimExec: function(component, action) {
+				var args = [].slice.call(arguments, 2);
+				return I.getShim().exec(this.uid, component, action, args);
+			},
 
-				function createIframe() {
-					var container = I.getShimContainer() || document.body
-					, temp = document.createElement('div')
-					;
+			init : function() {
+				var container;
 
-					// IE 6 won't be able to set the name using setAttribute or iframe.name
-					temp.innerHTML = '<iframe id="' + uid + '_iframe" name="' + uid + '_iframe" src="javascript:&quot;&quot;" style="display:none"></iframe>';
-					_iframe = temp.firstChild;
-					container.appendChild(_iframe);
+				container = this.getShimContainer();
 
-					/* _iframe.onreadystatechange = function() {
-						console.info(_iframe.readyState);
-					};*/
+				container.innerHTML = '<object id="' + this.uid + '" data="data:application/x-silverlight," type="application/x-silverlight-2" width="100%" height="100%" style="outline:none;">' +
+					'<param name="source" value="' + options.xap_url + '"/>' +
+					'<param name="background" value="Transparent"/>' +
+					'<param name="windowless" value="true"/>' +
+					'<param name="enablehtmlaccess" value="true"/>' +
+					'<param name="initParams" value="uid=' + this.uid + ',target=' + Env.global_event_dispatcher + '"/>' +
+				'</object>';
 
-					Events.addEvent(_iframe, 'load', function() { // _iframe.onload doesn't work in IE lte 8
-						var el;
+				// Init is dispatched by the shim
+				initTimer = setTimeout(function() {
+					if (I && !I.initialized) { // runtime might be already destroyed by this moment
+						I.trigger("Error", new x.RuntimeError(x.RuntimeError.NOT_INIT_ERR));
+					}
+				}, Env.OS !== 'Windows'? 10000 : 5000); // give it more time to initialize in non Windows OS (like Mac)
+			},
+
+			destroy: (function(destroy) { // extend default destroy method
+				return function() {
+					destroy.call(I);
+					clearTimeout(initTimer); // initialization check might be still onwait
+					options = initTimer = destroy = I = null;
+				};
+			}(this.destroy))
 
-						try {
-							el = _iframe.contentWindow.document || _iframe.contentDocument || window.frames[_iframe.id].document;
+		}, extensions);
+	}
 
-							// try to detect some standard error pages
-							if (/^4(0[0-9]|1[0-7]|2[2346])\s/.test(el.title)) { // test if title starts with 4xx HTTP error
-								_status = el.title.replace(/^(\d+).*$/, '$1');
-							} else {
-								_status = 200;
-								// get result
-								_response = Basic.trim(el.body.innerHTML);
+	Runtime.addConstructor(type, SilverlightRuntime); 
 
-								// we need to fire these at least once
-								target.trigger({
-									type: 'progress',
-									loaded: _response.length,
-									total: _response.length
-								});
+	return extensions;
+});
 
-								if (blob) { // if we were uploading a file
-									target.trigger({
-										type: 'uploadprogress',
-										loaded: blob.size || 1025,
-										total: blob.size || 1025
-									});
-								}
-							}
-						} catch (ex) {
-							if (Url.hasSameOrigin(meta.url)) {
-								// if response is sent with error code, iframe in IE gets redirected to res://ieframe.dll/http_x.htm
-								// which obviously results to cross domain error (wtf?)
-								_status = 404;
-							} else {
-								cleanup.call(target, function() {
-									target.trigger('error');
-								});
-								return;
-							}
-						}	
-					
-						cleanup.call(target, function() {
-							target.trigger('load');
-						});
-					}, target.uid);
-				} // end createIframe
+// Included from: src/javascript/runtime/silverlight/file/Blob.js
 
-				// prepare data to be sent and convert if required
-				if (data instanceof FormData && data.hasBlob()) {
-					blob = data.getBlob();
-					uid = blob.uid;
-					input = Dom.get(uid);
-					form = Dom.get(uid + '_form');
-					if (!form) {
-						throw new x.DOMException(x.DOMException.NOT_FOUND_ERR);
-					}
-				} else {
-					uid = Basic.guid('uid_');
+/**
+ * Blob.js
+ *
+ * Copyright 2013, Moxiecode Systems AB
+ * Released under GPL License.
+ *
+ * License: http://www.plupload.com/license
+ * Contributing: http://www.plupload.com/contributing
+ */
 
-					form = document.createElement('form');
-					form.setAttribute('id', uid + '_form');
-					form.setAttribute('method', meta.method);
-					form.setAttribute('enctype', 'multipart/form-data');
-					form.setAttribute('encoding', 'multipart/form-data');
-					form.setAttribute('target', uid + '_iframe');
+/**
+@class moxie/runtime/silverlight/file/Blob
+@private
+*/
+define("moxie/runtime/silverlight/file/Blob", [
+	"moxie/runtime/silverlight/Runtime",
+	"moxie/core/utils/Basic",
+	"moxie/runtime/flash/file/Blob"
+], function(extensions, Basic, Blob) {
+	return (extensions.Blob = Basic.extend({}, Blob));
+});
 
-					I.getShimContainer().appendChild(form);
-				}
+// Included from: src/javascript/runtime/silverlight/file/FileInput.js
 
-				if (data instanceof FormData) {
-					data.each(function(value, name) {
-						if (value instanceof Blob) {
-							if (input) {
-								input.setAttribute('name', name);
-							}
-						} else {
-							var hidden = document.createElement('input');
+/**
+ * FileInput.js
+ *
+ * Copyright 2013, Moxiecode Systems AB
+ * Released under GPL License.
+ *
+ * License: http://www.plupload.com/license
+ * Contributing: http://www.plupload.com/contributing
+ */
 
-							Basic.extend(hidden, {
-								type : 'hidden',
-								name : name,
-								value : value
-							});
+/**
+@class moxie/runtime/silverlight/file/FileInput
+@private
+*/
+define("moxie/runtime/silverlight/file/FileInput", [
+	"moxie/runtime/silverlight/Runtime"
+], function(extensions) {
+	
+	var FileInput = {
+		init: function(options) {
 
-							// make sure that input[type="file"], if it's there, comes last
-							if (input) {
-								form.insertBefore(hidden, input);
-							} else {
-								form.appendChild(hidden);
-							}
-						}
-					});
+			function toFilters(accept) {
+				var filter = '';
+				for (var i = 0; i < accept.length; i++) {
+					filter += (filter !== '' ? '|' : '') + accept[i].title + " | *." + accept[i].extensions.replace(/,/g, ';*.');
 				}
+				return filter;
+			}
+			
+			this.getRuntime().shimExec.call(this, 'FileInput', 'init', toFilters(options.accept), options.name, options.multiple);
+			this.trigger('ready');
+		}
+	};
 
-				// set destination url
-				form.setAttribute("action", meta.url);
+	return (extensions.FileInput = FileInput);
+});
 
-				createIframe();
-				form.submit();
-				target.trigger('loadstart');
-			},
+// Included from: src/javascript/runtime/silverlight/file/FileReader.js
 
-			getStatus: function() {
-				return _status;
-			},
+/**
+ * FileReader.js
+ *
+ * Copyright 2013, Moxiecode Systems AB
+ * Released under GPL License.
+ *
+ * License: http://www.plupload.com/license
+ * Contributing: http://www.plupload.com/contributing
+ */
 
-			getResponse: function(responseType) {
-				if ('json' === responseType) {
-					// strip off <pre>..</pre> tags that might be enclosing the response
-					if (Basic.typeOf(_response) === 'string' && !!window.JSON) {
-						try {
-							return JSON.parse(_response.replace(/^\s*<pre[^>]*>/, '').replace(/<\/pre>\s*$/, ''));
-						} catch (ex) {
-							return null;
-						}
-					} 
-				} else if ('document' === responseType) {
+/**
+@class moxie/runtime/silverlight/file/FileReader
+@private
+*/
+define("moxie/runtime/silverlight/file/FileReader", [
+	"moxie/runtime/silverlight/Runtime",
+	"moxie/core/utils/Basic",
+	"moxie/runtime/flash/file/FileReader"
+], function(extensions, Basic, FileReader) {
+	return (extensions.FileReader = Basic.extend({}, FileReader));
+});
 
-				}
-				return _response;
-			},
+// Included from: src/javascript/runtime/silverlight/file/FileReaderSync.js
 
-			abort: function() {
-				var target = this;
+/**
+ * FileReaderSync.js
+ *
+ * Copyright 2013, Moxiecode Systems AB
+ * Released under GPL License.
+ *
+ * License: http://www.plupload.com/license
+ * Contributing: http://www.plupload.com/contributing
+ */
 
-				if (_iframe && _iframe.contentWindow) {
-					if (_iframe.contentWindow.stop) { // FireFox/Safari/Chrome
-						_iframe.contentWindow.stop();
-					} else if (_iframe.contentWindow.document.execCommand) { // IE
-						_iframe.contentWindow.document.execCommand('Stop');
-					} else {
-						_iframe.src = "about:blank";
-					}
-				}
+/**
+@class moxie/runtime/silverlight/file/FileReaderSync
+@private
+*/
+define("moxie/runtime/silverlight/file/FileReaderSync", [
+	"moxie/runtime/silverlight/Runtime",
+	"moxie/core/utils/Basic",
+	"moxie/runtime/flash/file/FileReaderSync"
+], function(extensions, Basic, FileReaderSync) {
+	return (extensions.FileReaderSync = Basic.extend({}, FileReaderSync));
+});
 
-				cleanup.call(this, function() {
-					// target.dispatchEvent('readystatechange');
-					target.dispatchEvent('abort');
-				});
-			}
-		});
-	}
+// Included from: src/javascript/runtime/silverlight/xhr/XMLHttpRequest.js
 
-	return (extensions.XMLHttpRequest = XMLHttpRequest);
-});
+/**
+ * XMLHttpRequest.js
+ *
+ * Copyright 2013, Moxiecode Systems AB
+ * Released under GPL License.
+ *
+ * License: http://www.plupload.com/license
+ * Contributing: http://www.plupload.com/contributing
+ */
 
+/**
+@class moxie/runtime/silverlight/xhr/XMLHttpRequest
+@private
+*/
+define("moxie/runtime/silverlight/xhr/XMLHttpRequest", [
+	"moxie/runtime/silverlight/Runtime",
+	"moxie/core/utils/Basic",
+	"moxie/runtime/flash/xhr/XMLHttpRequest"
+], function(extensions, Basic, XMLHttpRequest) {
+	return (extensions.XMLHttpRequest = Basic.extend({}, XMLHttpRequest));
+});
 
 expose(["moxie/core/utils/Basic","moxie/core/I18n","moxie/core/utils/Mime","moxie/core/utils/Env","moxie/core/utils/Dom","moxie/core/Exceptions","moxie/core/EventTarget","moxie/core/utils/Encode","moxie/runtime/Runtime","moxie/runtime/RuntimeClient","moxie/file/Blob","moxie/file/File","moxie/file/FileInput","moxie/runtime/RuntimeTarget","moxie/file/FileReader","moxie/core/utils/Url","moxie/file/FileReaderSync","moxie/xhr/FormData","moxie/xhr/XMLHttpRequest","moxie/runtime/Transporter","moxie/core/utils/Events"]);
 })(this);/**
@@ -7987,8 +7226,8 @@ Globally exposed namespace with the most frequently used public classes and hand
 
 	// expose globally
 	exports.mOxie = o;
-	if (window != exports && !exports.o) {
-		//exports.o = o;
+	if (!exports.o) {
+		exports.o = o;
 	}
 	return o;
 })(this);
@@ -8103,12 +7342,6 @@ Globally exposed namespace with the most frequently used public classes and hand
 					}
 
 					return inputValueDesc.prop._supget.call(this);
-				},
-				set: function(val){
-					if(val === '' && this.type == 'file' && $(this).hasClass('ws-filereader')){
-						webshim.data(this, 'fileList', []);
-					}
-					inputValueDesc.prop._supset.call(this);
 				}
 			}
 		}
@@ -8306,10 +7539,10 @@ Globally exposed namespace with the most frequently used public classes and hand
 	}
 
 	if(!featureOptions.swfpath){
-		featureOptions.swfpath = shimMoxiePath+'flash/Moxie.cdn.swf';
+		featureOptions.swfpath = shimMoxiePath+'flash/Moxie.min.swf';
 	}
 	if(!featureOptions.xappath){
-		featureOptions.xappath = shimMoxiePath+'silverlight/Moxie.cdn.xap';
+		featureOptions.xappath = shimMoxiePath+'silverlight/Moxie.min.xap';
 	}
 
 	if($.support.cors !== false || !window.XDomainRequest){
@@ -8359,6 +7592,13 @@ Globally exposed namespace with the most frequently used public classes and hand
 		}
 	});
 
+	webshim.onNodeNamesPropertyModify('input', 'value', function(value, boolVal, type){
+		if(value === '' && this.type == 'file' && $(this).hasClass('ws-filereader')){
+			webshim.data(this, 'fileList', []);
+		}
+	});
+
+
 	window.FileReader = notReadyYet;
 	window.FormData = notReadyYet;
 	webshim.ready('moxie', function(){
@@ -8393,7 +7633,7 @@ Globally exposed namespace with the most frequently used public classes and hand
 					if(inputName && !$(appendData[i]).is(':disabled')){
 						files = $.prop(appendData[i], 'files') || [];
 						if(files.length){
-							if(files.length > 1){
+							if(files.length > 1 || (moxieData.hasBlob && moxieData.hasBlob())){
 								webshim.error('FormData shim can only handle one file per ajax. Use multiple ajax request. One per file.');
 							}
 							for(fileI = 0, fileLen = files.length; fileI < fileLen; fileI++){