Ticket #48277: 48277.diff

src/js/_enqueues/vendor/plupload/license.txt

@@ -1 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+GNU AFFERO GENERAL PUBLIC LICENSE
+   Version 3, 19 November 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
 
-                            Preamble
+                Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
+The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-  When we speak of free software, we are referring to freedom, not
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
 
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
+A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
+The precise terms and conditions for copying, distribution and
 modification follow.
 
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+   TERMS AND CONDITIONS
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+0. Definitions.
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+"This License" refers to version 3 of the GNU Affero General Public License.
 
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
+"Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
 
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
+"The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
 
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+1. Source Code.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
+The Corresponding Source for a work in source code form is that
+same work.
 
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+2. Basic Permissions.
 
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+a) The work must carry prominent notices stating that you modified
+it, and giving a relevant date.
+
+b) The work must carry prominent notices stating that it is
+released under this License and any conditions added under section
+7.  This requirement modifies the requirement in section 4 to
+"keep intact all notices".
+
+c) You must license the entire work, as a whole, under this
+License to anyone who comes into possession of a copy.  This
+License will therefore apply, along with any applicable section 7
+additional terms, to the whole of the work, and all its parts,
+regardless of how they are packaged.  This License gives no
+permission to license the work in any other way, but it does not
+invalidate such permission if you have separately received it.
+
+d) If the work has interactive user interfaces, each must display
+Appropriate Legal Notices; however, if the Program has interactive
+interfaces that do not display Appropriate Legal Notices, your
+work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+a) Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by the
+Corresponding Source fixed on a durable physical medium
+customarily used for software interchange.
+
+b) Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by a
+written offer, valid for at least three years and valid for as
+long as you offer spare parts or customer support for that product
+model, to give anyone who possesses the object code either (1) a
+copy of the Corresponding Source for all the software in the
+product that is covered by this License, on a durable physical
+medium customarily used for software interchange, for a price no
+more than your reasonable cost of physically performing this
+conveying of source, or (2) access to copy the
+Corresponding Source from a network server at no charge.
+
+c) Convey individual copies of the object code with a copy of the
+written offer to provide the Corresponding Source.  This
+alternative is allowed only occasionally and noncommercially, and
+only if you received the object code with such an offer, in accord
+with subsection 6b.
+
+d) Convey the object code by offering access from a designated
+place (gratis or for a charge), and offer equivalent access to the
+Corresponding Source in the same way through the same place at no
+further charge.  You need not require recipients to copy the
+Corresponding Source along with the object code.  If the place to
+copy the object code is a network server, the Corresponding Source
+may be on a different server (operated by you or a third party)
+that supports equivalent copying facilities, provided you maintain
+clear directions next to the object code saying where to find the
+Corresponding Source.  Regardless of what server hosts the
+Corresponding Source, you remain obligated to ensure that it is
+available for as long as needed to satisfy these requirements.
+
+e) Convey the object code using peer-to-peer transmission, provided
+you inform other peers where the object code and Corresponding
+Source of the work are being offered to the general public at no
+charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+a) Disclaiming warranty or limiting liability differently from the
+terms of sections 15 and 16 of this License; or
+
+b) Requiring preservation of specified reasonable legal notices or
+author attributions in that material or in the Appropriate Legal
+Notices displayed by works containing it; or
+
+c) Prohibiting misrepresentation of the origin of that material, or
+requiring that modified versions of such material be marked in
+reasonable ways as different from the original version; or
+
+d) Limiting the use for publicity purposes of names of licensors or
+authors of the material; or
+
+e) Declining to grant rights under trademark law for use of some
+trade names, trademarks, or service marks; or
+
+f) Requiring indemnification of licensors and authors of that
+material by anyone who conveys the material (or modified versions of
+it) with contractual assumptions of liability to the recipient, for
+any liability that these contractual assumptions directly impose on
+those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
+13. Remote Network Interaction; Use with the GNU General Public License.
 
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
 
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+14. Revised Versions of this License.
 
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
+The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
+If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
 
-                            NO WARRANTY
+Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+15. Disclaimer of Warranty.
 
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
-                     END OF TERMS AND CONDITIONS
+16. Limitation of Liability.
 
-            How to Apply These Terms to Your New Programs
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
 
-  If you develop a new program, and you want it to be of the greatest
+17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
 
-  To do so, attach the following notices to the program.  It is safest
+To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+<one line to give the program's name and a brief idea of what it does.>
+Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.

src/js/_enqueues/vendor/plupload/moxie.js

@@ -1 +1 @@
 ;var MXI_DEBUG = false;
 /**
  * mOxie - multi-runtime File API & XMLHttpRequest L2 Polyfill
- * v1.3.5
+ * v1.5.7
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -9 +9 @@
  * License: http://www.plupload.com/license
  * Contributing: http://www.plupload.com/contributing
  *
- * Date: 2016-05-15
+ * Date: 2017-11-03
  */
+;(function (global, factory) {
+        var extract = function() {
+                var ctx = {};
+                factory.apply(ctx, arguments);
+                return ctx.moxie;
+        };
+        
+        if (typeof define === "function" && define.amd) {
+                define("moxie", [], extract);
+        } else if (typeof module === "object" && module.exports) {
+                module.exports = extract();
+        } else {
+                global.moxie = extract();
+        }
+}(this || window, function() {
 /**
  * Compiled inline version. (Library mode)
  */
 
-/**
- * Modified for WordPress, Silverlight and Flash runtimes support was removed.
- * See https://core.trac.wordpress.org/ticket/41755.
- */
-
 /*jshint smarttabs:true, undef:true, latedef:true, curly:true, bitwise:true, camelcase:true */
 /*globals $code */
 
@@ -110 +120 @@
  * Contributing: http://www.plupload.com/contributing
  */
 
+/**
+@class moxie/core/utils/Basic
+@public
+@static
+*/
+
 define('moxie/core/utils/Basic', [], function() {
         /**
         Gets the true type of the built-in object (better version of typeof).
@@ -116 +132 @@
         @author Angus Croll (http://javascriptweblog.wordpress.com/)
 
         @method typeOf
-        @for Utils
         @static
         @param {Object} o Object to check.
         @return {String} Object [[Class]]
         */
-        var typeOf = function(o) {
+        function typeOf(o) {
                 var undef;
 
                 if (o === undef) {
@@ -134 +149 @@
 
                 // the snippet below is awesome, however it fails to detect null, undefined and arguments types in IE lte 8
                 return ({}).toString.call(o).match(/\s([a-z|A-Z]+)/)[1].toLowerCase();
-        };
-                
+        }
+
         /**
-        Extends the specified object with another object.
+        Extends the specified object with another object(s).
 
         @method extend
         @static
@@ -145 +160 @@
         @param {Object} [obj]* Multiple objects to extend with.
         @return {Object} Same as target, the extended object.
         */
-        var extend = function(target) {
+        function extend() {
+                return merge(false, false, arguments);
+        }
+
+
+        /**
+        Extends the specified object with another object(s), but only if the property exists in the target.
+
+        @method extendIf
+        @static
+        @param {Object} target Object to extend.
+        @param {Object} [obj]* Multiple objects to extend with.
+        @return {Object} Same as target, the extended object.
+        */
+        function extendIf() {
+                return merge(true, false, arguments);
+        }
+
+
+        function extendImmutable() {
+                return merge(false, true, arguments);
+        }
+
+
+        function extendImmutableIf() {
+                return merge(true, true, arguments);
+        }
+
+
+        function clone(value) {
+                switch (typeOf(value)) {
+                        case 'array':
+                                return merge(false, true, [[], value]);
+
+                        case 'object':
+                                return merge(false, true, [{}, value]);
+
+                        default:
+                                return value;
+                }
+        }
+
+
+        function shallowCopy(obj) {
+                switch (typeOf(obj)) {
+                        case 'array':
+                                return Array.prototype.slice.call(obj);
+
+                        case 'object':
+                                return extend({}, obj);
+                }
+                return obj;
+        }
+
+
+        function merge(strict, immutable, args) {
                 var undef;
+                var target = args[0];
 
-                each(arguments, function(arg, i) {
+                each(args, function(arg, i) {
                         if (i > 0) {
                                 each(arg, function(value, key) {
-                                        if (value !== undef) {
-                                                if (typeOf(target[key]) === typeOf(value) && !!~inArray(typeOf(value), ['array', 'object'])) {
-                                                        extend(target[key], value);
-                                                } else {
-                                                        target[key] = value;
-                                                }
+                                        var isComplex = inArray(typeOf(value), ['array', 'object']) !== -1;
+
+                                        if (value === undef || strict && target[key] === undef) {
+                                                return true;
                                         }
+
+                                        if (isComplex && immutable) {
+                                                value = shallowCopy(value);
+                                        }
+
+                                        if (typeOf(target[key]) === typeOf(value) && isComplex) {
+                                                merge(strict, immutable, [target[key], value]);
+                                        } else {
+                                                target[key] = value;
+                                        }
                                 });
                         }
                 });
+
                 return target;
-        };
-                
+        }
+
+
         /**
+        A way to inherit one `class` from another in a consisstent way (more or less)
+
+        @method inherit
+        @static
+        @since >1.4.1
+        @param {Function} child
+        @param {Function} parent
+        @return {Function} Prepared constructor
+        */
+        function inherit(child, parent) {
+                // copy over all parent properties
+                for (var key in parent) {
+                        if ({}.hasOwnProperty.call(parent, key)) {
+                                child[key] = parent[key];
+                        }
+                }
+
+                // give child `class` a place to define its own methods
+                function ctor() {
+                        this.constructor = child;
+
+                        if (MXI_DEBUG) {
+                                var getCtorName = function(fn) {
+                                        var m = fn.toString().match(/^function\s([^\(\s]+)/);
+                                        return m ? m[1] : false;
+                                };
+
+                                this.ctorName = getCtorName(child);
+                        }
+                }
+                ctor.prototype = parent.prototype;
+                child.prototype = new ctor();
+
+                // keep a way to reference parent methods
+                child.parent = parent.prototype;
+                return child;
+        }
+
+
+        /**
         Executes the callback function for each item in array/object. If you return false in the
         callback it will break the loop.
 
@@ -173 +294 @@
         @param {Object} obj Object to iterate.
         @param {function} callback Callback function to execute for each item.
         */
-        var each = function(obj, callback) {
+        function each(obj, callback) {
                 var length, key, i, undef;
 
                 if (obj) {
-                        if (typeOf(obj.length) === 'number') { // it might be Array, FileList or even arguments object
-                                // Loop array items
-                                for (i = 0, length = obj.length; i < length; i++) {
-                                        if (callback(obj[i], i) === false) {
-                                                return;
-                                        }
-                                }
-                        } else if (typeOf(obj) === 'object') {
+                        try {
+                                length = obj.length;
+                        } catch(ex) {
+                                length = undef;
+                        }
+
+                        if (length === undef || typeof(length) !== 'number') {
                                 // Loop object items
                                 for (key in obj) {
                                         if (obj.hasOwnProperty(key)) {
@@ -193 +313 @@
                                                 }
                                         }
                                 }
+                        } else {
+                                // Loop array items
+                                for (i = 0; i < length; i++) {
+                                        if (callback(obj[i], i) === false) {
+                                                return;
+                                        }
+                                }
                         }
                 }
-        };
+        }
 
         /**
         Checks if object is empty.
-        
+
         @method isEmptyObj
         @static
         @param {Object} o Object to check.
         @return {Boolean}
         */
-        var isEmptyObj = function(obj) {
+        function isEmptyObj(obj) {
                 var prop;
 
                 if (!obj || typeOf(obj) !== 'object') {
@@ -217 +344 @@
                 }
 
                 return true;
-        };
+        }
 
         /**
         Recieve an array of functions (usually async) to call in sequence, each  function
@@ -231 +358 @@
         @param {Array} queue Array of functions to call in sequence
         @param {Function} cb Main callback that is called in the end, or in case of error
         */
-        var inSeries = function(queue, cb) {
+        function inSeries(queue, cb) {
                 var i = 0, length = queue.length;
 
                 if (typeOf(cb) !== 'function') {
@@ -251 +378 @@
                         }
                 }
                 callNext(i);
-        };
+        }
 
 
         /**
         Recieve an array of functions (usually async) to call in parallel, each  function
-        receives a callback as first argument that it should call, when it completes. After 
+        receives a callback as first argument that it should call, when it completes. After
         everything is complete, main callback is called. Passing truthy value to the
         callback as a first argument will interrupt the process and invoke main callback
         immediately.
@@ -264 +391 @@
         @method inParallel
         @static
         @param {Array} queue Array of functions to call in sequence
-        @param {Function} cb Main callback that is called in the end, or in case of error
+        @param {Function} cb Main callback that is called in the end, or in case of erro
         */
-        var inParallel = function(queue, cb) {
+        function inParallel(queue, cb) {
                 var count = 0, num = queue.length, cbArgs = new Array(num);
 
                 each(queue, function(fn, i) {
@@ -274 +401 @@
                                 if (error) {
                                         return cb(error);
                                 }
-                                
+
                                 var args = [].slice.call(arguments);
                                 args.shift(); // strip error - undefined or not
 
@@ -284 +411 @@
                                 if (count === num) {
                                         cbArgs.unshift(null);
                                         cb.apply(this, cbArgs);
-                                } 
+                                }
                         });
                 });
-        };
-        
-        
+        }
+
+
         /**
         Find an element in array and return it's index if present, otherwise return -1.
-        
+
         @method inArray
         @static
         @param {Mixed} needle Element to find
@@ -299 +426 @@
         @param {Array} array
         @return {Int} Index of the element, or -1 if not found
         */
-        var inArray = function(needle, array) {
+        function inArray(needle, array) {
                 if (array) {
                         if (Array.prototype.indexOf) {
                                 return Array.prototype.indexOf.call(array, needle);
                         }
-                
+
                         for (var i = 0, length = array.length; i < length; i++) {
                                 if (array[i] === needle) {
                                         return i;
@@ -312 +439 @@
                         }
                 }
                 return -1;
-        };
+        }
 
 
         /**
@@ -324 +451 @@
         @param {Array} array
         @return {Array|Boolean}
         */
-        var arrayDiff = function(needles, array) {
+        function arrayDiff(needles, array) {
                 var diff = [];
 
                 if (typeOf(needles) !== 'array') {
@@ -338 +465 @@
                 for (var i in needles) {
                         if (inArray(needles[i], array) === -1) {
                                 diff.push(needles[i]);
-                        }       
+                        }
                 }
                 return diff.length ? diff : false;
-        };
+        }
 
 
         /**
@@ -353 +480 @@
         @param {Array} array2
         @return {Array} Intersection of two arrays or null if there is none
         */
-        var arrayIntersect = function(array1, array2) {
+        function arrayIntersect(array1, array2) {
                 var result = [];
                 each(array1, function(item) {
                         if (inArray(item, array2) !== -1) {
@@ -361 +488 @@
                         }
                 });
                 return result.length ? result : null;
-        };
-        
-        
+        }
+
+
         /**
         Forces anything into an array.
-        
+
         @method toArray
         @static
         @param {Object} obj Object with length field.
         @return {Array} Array object containing all items.
         */
-        var toArray = function(obj) {
+        function toArray(obj) {
                 var i, arr = [];
 
                 for (i = 0; i < obj.length; i++) {
@@ -380 +507 @@
                 }
 
                 return arr;
-        };
-        
-                        
+        }
+
+
         /**
         Generates an unique ID. The only way a user would be able to get the same ID is if the two persons
-        at the same exact millisecond manage to get the same 5 random numbers between 0-65535; it also uses 
-        a counter so each ID is guaranteed to be unique for the given page. It is more probable for the earth 
+        at the same exact millisecond manage to get the same 5 random numbers between 0-65535; it also uses
+        a counter so each ID is guaranteed to be unique for the given page. It is more probable for the earth
         to be hit with an asteroid.
-        
+
         @method guid
         @static
         @param {String} prefix to prepend (by default 'o' will be prepended).
@@ -397 +524 @@
         */
         var guid = (function() {
                 var counter = 0;
-                
+
                 return function(prefix) {
                         var guid = new Date().getTime().toString(32), i;
 
@@ -404 +531 @@
                         for (i = 0; i < 5; i++) {
                                 guid += Math.floor(Math.random() * 65535).toString(32);
                         }
-                        
+
                         return (prefix || 'o_') + guid + (counter++).toString(32);
                 };
         }());
-        
 
+
         /**
         Trims white spaces around the string
-        
+
         @method trim
         @static
         @param {String} str
         @return {String}
         */
-        var trim = function(str) {
+        function trim(str) {
                 if (!str) {
                         return str;
                 }
                 return String.prototype.trim ? String.prototype.trim.call(str) : str.toString().replace(/^\s*/, '').replace(/\s*$/, '');
-        };
+        }
 
 
         /**
         Parses the specified size string into a byte value. For example 10kb becomes 10240.
-        
+
         @method parseSizeStr
         @static
         @param {String/Number} size String to parse or number to just pass through.
         @return {Number} Size in bytes.
         */
-        var parseSizeStr = function(size) {
+        function parseSizeStr(size) {
                 if (typeof(size) !== 'string') {
                         return size;
                 }
-                
+
                 var muls = {
                                 t: 1099511627776,
                                 g: 1073741824,
@@ -447 +574 @@
                         },
                         mul;
 
-
                 size = /^([0-9\.]+)([tmgk]?)$/.exec(size.toLowerCase().replace(/[^0-9\.tmkg]/g, ''));
                 mul = size[2];
                 size = +size[1];
-                
+
                 if (muls.hasOwnProperty(mul)) {
                         size *= muls[mul];
                 }
                 return Math.floor(size);
-        };
+        }
 
 
         /**
@@ -465 +591 @@
          * @param {String} str String with tokens
          * @return {String} String with replaced tokens
          */
-        var sprintf = function(str) {
+        function sprintf(str) {
                 var args = [].slice.call(arguments, 1);
 
-                return str.replace(/%[a-z]/g, function() {
+                return str.replace(/%([a-z])/g, function($0, $1) {
                         var value = args.shift();
-                        return typeOf(value) !== 'undefined' ? value : '';
+
+                        switch ($1) {
+                                case 's':
+                                        return value + '';
+
+                                case 'd':
+                                        return parseInt(value, 10);
+
+                                case 'f':
+                                        return parseFloat(value);
+
+                                case 'c':
+                                        return '';
+
+                                default:
+                                        return value;
+                        }
                 });
-        };
-        
+        }
 
+
+
+        function delay(cb, timeout) {
+                var self = this;
+                setTimeout(function() {
+                        cb.call(self);
+                }, timeout || 1);
+        }
+
+
         return {
                 guid: guid,
                 typeOf: typeOf,
                 extend: extend,
+                extendIf: extendIf,
+                extendImmutable: extendImmutable,
+                extendImmutableIf: extendImmutableIf,
+                clone: clone,
+                inherit: inherit,
                 each: each,
                 isEmptyObj: isEmptyObj,
                 inSeries: inSeries,
@@ -489 +645 @@
                 toArray: toArray,
                 trim: trim,
                 sprintf: sprintf,
-                parseSizeStr: parseSizeStr
+                parseSizeStr: parseSizeStr,
+                delay: delay
         };
 });
 
+// Included from: src/javascript/core/utils/Encode.js
+
+/**
+ * Encode.js
+ *
+ * Copyright 2013, Moxiecode Systems AB
+ * Released under GPL License.
+ *
+ * License: http://www.plupload.com/license
+ * Contributing: http://www.plupload.com/contributing
+ */
+
+/**
+@class moxie/core/utils/Encode
+@public
+@static
+*/
+
+define('moxie/core/utils/Encode', [], function() {
+
+        /**
+        Encode string with UTF-8
+
+        @method utf8_encode
+        @static
+        @param {String} str String to encode
+        @return {String} UTF-8 encoded string
+        */
+        var utf8_encode = function(str) {
+                return unescape(encodeURIComponent(str));
+        };
+        
+        /**
+        Decode UTF-8 encoded string
+
+        @method utf8_decode
+        @static
+        @param {String} str String to decode
+        @return {String} Decoded string
+        */
+        var utf8_decode = function(str_data) {
+                return decodeURIComponent(escape(str_data));
+        };
+        
+        /**
+        Decode Base64 encoded string (uses browser's default method if available),
+        from: https://raw.github.com/kvz/phpjs/master/functions/url/base64_decode.js
+
+        @method atob
+        @static
+        @param {String} data String to decode
+        @return {String} Decoded string
+        */
+        var atob = function(data, utf8) {
+                if (typeof(window.atob) === 'function') {
+                        return utf8 ? utf8_decode(window.atob(data)) : window.atob(data);
+                }
+
+                // http://kevin.vanzonneveld.net
+                // +   original by: Tyler Akins (http://rumkin.com)
+                // +   improved by: Thunder.m
+                // +      input by: Aman Gupta
+                // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+                // +   bugfixed by: Onno Marsman
+                // +   bugfixed by: Pellentesque Malesuada
+                // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+                // +      input by: Brett Zamir (http://brett-zamir.me)
+                // +   bugfixed by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+                // *     example 1: base64_decode('S2V2aW4gdmFuIFpvbm5ldmVsZA==');
+                // *     returns 1: 'Kevin van Zonneveld'
+                // mozilla has this native
+                // - but breaks in 2.0.0.12!
+                //if (typeof this.window.atob == 'function') {
+                //    return atob(data);
+                //}
+                var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+                var o1, o2, o3, h1, h2, h3, h4, bits, i = 0,
+                        ac = 0,
+                        dec = "",
+                        tmp_arr = [];
+
+                if (!data) {
+                        return data;
+                }
+
+                data += '';
+
+                do { // unpack four hexets into three octets using index points in b64
+                        h1 = b64.indexOf(data.charAt(i++));
+                        h2 = b64.indexOf(data.charAt(i++));
+                        h3 = b64.indexOf(data.charAt(i++));
+                        h4 = b64.indexOf(data.charAt(i++));
+
+                        bits = h1 << 18 | h2 << 12 | h3 << 6 | h4;
+
+                        o1 = bits >> 16 & 0xff;
+                        o2 = bits >> 8 & 0xff;
+                        o3 = bits & 0xff;
+
+                        if (h3 == 64) {
+                                tmp_arr[ac++] = String.fromCharCode(o1);
+                        } else if (h4 == 64) {
+                                tmp_arr[ac++] = String.fromCharCode(o1, o2);
+                        } else {
+                                tmp_arr[ac++] = String.fromCharCode(o1, o2, o3);
+                        }
+                } while (i < data.length);
+
+                dec = tmp_arr.join('');
+
+                return utf8 ? utf8_decode(dec) : dec;
+        };
+        
+        /**
+        Base64 encode string (uses browser's default method if available),
+        from: https://raw.github.com/kvz/phpjs/master/functions/url/base64_encode.js
+
+        @method btoa
+        @static
+        @param {String} data String to encode
+        @return {String} Base64 encoded string
+        */
+        var btoa = function(data, utf8) {
+                if (utf8) {
+                        data = utf8_encode(data);
+                }
+
+                if (typeof(window.btoa) === 'function') {
+                        return window.btoa(data);
+                }
+
+                // http://kevin.vanzonneveld.net
+                // +   original by: Tyler Akins (http://rumkin.com)
+                // +   improved by: Bayron Guevara
+                // +   improved by: Thunder.m
+                // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+                // +   bugfixed by: Pellentesque Malesuada
+                // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+                // +   improved by: Rafał Kukawski (http://kukawski.pl)
+                // *     example 1: base64_encode('Kevin van Zonneveld');
+                // *     returns 1: 'S2V2aW4gdmFuIFpvbm5ldmVsZA=='
+                // mozilla has this native
+                // - but breaks in 2.0.0.12!
+                var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+                var o1, o2, o3, h1, h2, h3, h4, bits, i = 0,
+                        ac = 0,
+                        enc = "",
+                        tmp_arr = [];
+
+                if (!data) {
+                        return data;
+                }
+
+                do { // pack three octets into four hexets
+                        o1 = data.charCodeAt(i++);
+                        o2 = data.charCodeAt(i++);
+                        o3 = data.charCodeAt(i++);
+
+                        bits = o1 << 16 | o2 << 8 | o3;
+
+                        h1 = bits >> 18 & 0x3f;
+                        h2 = bits >> 12 & 0x3f;
+                        h3 = bits >> 6 & 0x3f;
+                        h4 = bits & 0x3f;
+
+                        // use hexets to index into b64, and append result to encoded string
+                        tmp_arr[ac++] = b64.charAt(h1) + b64.charAt(h2) + b64.charAt(h3) + b64.charAt(h4);
+                } while (i < data.length);
+
+                enc = tmp_arr.join('');
+
+                var r = data.length % 3;
+
+                return (r ? enc.slice(0, r - 3) : enc) + '==='.slice(r || 3);
+        };
+
+
+        return {
+                utf8_encode: utf8_encode,
+                utf8_decode: utf8_decode,
+                atob: atob,
+                btoa: btoa
+        };
+});
+
 // Included from: src/javascript/core/utils/Env.js
 
 /**
@@ -505 +847 @@
  * Contributing: http://www.plupload.com/contributing
  */
 
+/**
+@class moxie/core/utils/Env
+@public
+@static
+*/
+
 define("moxie/core/utils/Env", [
         "moxie/core/utils/Basic"
 ], function(Basic) {
-        
+
         /**
          * UAParser.js v0.7.7
          * Lightweight JavaScript-based User-Agent string parser
@@ -711 +1059 @@
             var regexes = {
 
                 browser : [[
-                
+
                     // Presto based
                     /(opera\smini)\/([\w\.-]+)/i,                                       // Opera Mini
                     /(opera\s[mobiletab]+).+version\/([\w\.-]+)/i,                      // Opera Mobi/Tablet
@@ -1046 +1394 @@
 
         var can = (function() {
                 var caps = {
-                                define_property: (function() {
-                                        /* // currently too much extra code required, not exactly worth it
-                                        try { // as of IE8, getters/setters are supported only on DOM elements
-                                                var obj = {};
-                                                if (Object.defineProperty) {
-                                                        Object.defineProperty(obj, 'prop', {
-                                                                enumerable: true,
-                                                                configurable: true
-                                                        });
-                                                        return true;
-                                                }
-                                        } catch(ex) {}
+                        access_global_ns: function () {
+                                return !!window.moxie;
+                        },
 
-                                        if (Object.prototype.__defineGetter__ && Object.prototype.__defineSetter__) {
+                        define_property: (function() {
+                                /* // currently too much extra code required, not exactly worth it
+                                try { // as of IE8, getters/setters are supported only on DOM elements
+                                        var obj = {};
+                                        if (Object.defineProperty) {
+                                                Object.defineProperty(obj, 'prop', {
+                                                        enumerable: true,
+                                                        configurable: true
+                                                });
                                                 return true;
-                                        }*/
-                                        return false;
-                                }()),
+                                        }
+                                } catch(ex) {}
 
-                                create_canvas: (function() {
-                                        // On the S60 and BB Storm, getContext exists, but always returns undefined
-                                        // so we actually have to call getContext() to verify
-                                        // github.com/Modernizr/Modernizr/issues/issue/97/
-                                        var el = document.createElement('canvas');
-                                        return !!(el.getContext && el.getContext('2d'));
-                                }()),
+                                if (Object.prototype.__defineGetter__ && Object.prototype.__defineSetter__) {
+                                        return true;
+                                }*/
+                                return false;
+                        }()),
 
-                                return_response_type: function(responseType) {
-                                        try {
-                                                if (Basic.inArray(responseType, ['', 'text', 'document']) !== -1) {
+                        create_canvas: function() {
+                                // On the S60 and BB Storm, getContext exists, but always returns undefined
+                                // so we actually have to call getContext() to verify
+                                // github.com/Modernizr/Modernizr/issues/issue/97/
+                                var el = document.createElement('canvas');
+                                var isSupported = !!(el.getContext && el.getContext('2d'));
+                                caps.create_canvas = isSupported;
+                                return isSupported;
+                        },
+
+                        return_response_type: function(responseType) {
+                                try {
+                                        if (Basic.inArray(responseType, ['', 'text', 'document']) !== -1) {
+                                                return true;
+                                        } else if (window.XMLHttpRequest) {
+                                                var xhr = new XMLHttpRequest();
+                                                xhr.open('get', '/'); // otherwise Gecko throws an exception
+                                                if ('responseType' in xhr) {
+                                                        xhr.responseType = responseType;
+                                                        // as of 23.0.1271.64, Chrome switched from throwing exception to merely logging it to the console (why? o why?)
+                                                        if (xhr.responseType !== responseType) {
+                                                                return false;
+                                                        }
                                                         return true;
-                                                } else if (window.XMLHttpRequest) {
-                                                        var xhr = new XMLHttpRequest();
-                                                        xhr.open('get', '/'); // otherwise Gecko throws an exception
-                                                        if ('responseType' in xhr) {
-                                                                xhr.responseType = responseType;
-                                                                // as of 23.0.1271.64, Chrome switched from throwing exception to merely logging it to the console (why? o why?)
-                                                                if (xhr.responseType !== responseType) {
-                                                                        return false;
-                                                                }
-                                                                return true;
-                                                        }
                                                 }
-                                        } catch (ex) {}
-                                        return false;
-                                },
+                                        }
+                                } catch (ex) {}
+                                return false;
+                        },
 
-                                // ideas for this heavily come from Modernizr (http://modernizr.com/)
-                                use_data_uri: (function() {
-                                        var du = new Image();
+                        use_blob_uri: function() {
+                                var URL = window.URL;
+                                caps.use_blob_uri = (URL &&
+                                        'createObjectURL' in URL &&
+                                        'revokeObjectURL' in URL &&
+                                        (Env.browser !== 'IE' || Env.verComp(Env.version, '11.0.46', '>=')) // IE supports createObjectURL, but not fully, for example it fails to use it as a src for the image
+                                );
+                                return caps.use_blob_uri;
+                        },
 
-                                        du.onload = function() {
-                                                caps.use_data_uri = (du.width === 1 && du.height === 1);
-                                        };
-                                        
-                                        setTimeout(function() {
-                                                du.src = "data:image/gif;base64,R0lGODlhAQABAIAAAP8AAAAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==";
-                                        }, 1);
-                                        return false;
-                                }()),
+                        // ideas for this heavily come from Modernizr (http://modernizr.com/)
+                        use_data_uri: (function() {
+                                var du = new Image();
 
-                                use_data_uri_over32kb: function() { // IE8
-                                        return caps.use_data_uri && (Env.browser !== 'IE' || Env.version >= 9);
-                                },
+                                du.onload = function() {
+                                        caps.use_data_uri = (du.width === 1 && du.height === 1);
+                                };
 
-                                use_data_uri_of: function(bytes) {
-                                        return (caps.use_data_uri && bytes < 33000 || caps.use_data_uri_over32kb());
-                                },
+                                setTimeout(function() {
+                                        du.src = "data:image/gif;base64,R0lGODlhAQABAIAAAP8AAAAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==";
+                                }, 1);
+                                return false;
+                        }()),
 
-                                use_fileinput: function() {
-                                        if (navigator.userAgent.match(/(Android (1.0|1.1|1.5|1.6|2.0|2.1))|(Windows Phone (OS 7|8.0))|(XBLWP)|(ZuneWP)|(w(eb)?OSBrowser)|(webOS)|(Kindle\/(1.0|2.0|2.5|3.0))/)) {
-                                                return false;
-                                        }
+                        use_data_uri_over32kb: function() { // IE8
+                                return caps.use_data_uri && (Env.browser !== 'IE' || Env.version >= 9);
+                        },
 
-                                        var el = document.createElement('input');
-                                        el.setAttribute('type', 'file');
-                                        return !el.disabled;
+                        use_data_uri_of: function(bytes) {
+                                return (caps.use_data_uri && bytes < 33000 || caps.use_data_uri_over32kb());
+                        },
+
+                        use_fileinput: function() {
+                                if (navigator.userAgent.match(/(Android (1.0|1.1|1.5|1.6|2.0|2.1))|(Windows Phone (OS 7|8.0))|(XBLWP)|(ZuneWP)|(w(eb)?OSBrowser)|(webOS)|(Kindle\/(1.0|2.0|2.5|3.0))/)) {
+                                        return false;
                                 }
-                        };
 
+                                var el = document.createElement('input');
+                                el.setAttribute('type', 'file');
+                                return caps.use_fileinput = !el.disabled;
+                        },
+
+                        use_webgl: function() {
+                                var canvas = document.createElement('canvas');
+                                var gl = null, isSupported;
+                                try {
+                                        gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl");
+                                }
+                                catch(e) {}
+
+                                if (!gl) { // it seems that sometimes it doesn't throw exception, but still fails to get context
+                                        gl = null;
+                                }
+
+                                isSupported = !!gl;
+                                caps.use_webgl = isSupported; // save result of our check
+                                canvas = undefined;
+                                return isSupported;
+                        }
+                };
+
                 return function(cap) {
                         var args = [].slice.call(arguments);
                         args.shift(); // shift of cap
@@ -1141 +1523 @@
                 can: can,
 
                 uaParser: UAParser,
-                
+
                 browser: uaResult.browser.name,
                 version: uaResult.browser.version,
                 os: uaResult.os.name, // everybody intuitively types it in a lowercase for some reason
@@ -1149 +1531 @@
 
                 verComp: version_compare,
 
+                swf_url: "../flash/Moxie.swf",
+                xap_url: "../silverlight/Moxie.xap",
                 global_event_dispatcher: "moxie.core.EventTarget.instance.dispatchEvent"
         };
 
@@ -1163 +1547 @@
                 };
 
                 Env.log = function() {
-                        
+
                         function logObj(data) {
                                 // TODO: this should recursively print out the object in a pretty way
                                 console.appendChild(document.createTextNode(data + "\n"));
                         }
 
-                        var data = arguments[0];
-
-                        if (Basic.typeOf(data) === 'string') {
-                                data = Basic.sprintf.apply(this, arguments);
-                        }
-
-                        if (window && window.console && window.console.log) {
-                                window.console.log(data);
+                        // if debugger present, IE8 might have window.console.log method, but not be able to apply on it (why...)
+                        if (window && window.console && window.console.log && window.console.log.apply) {
+                                window.console.log.apply(window.console, arguments);
                         } else if (document) {
                                 var console = document.getElementById('moxie-console');
                                 if (!console) {
@@ -1186 +1565 @@
                                         document.body.appendChild(console);
                                 }
 
-                                if (Basic.inArray(Basic.typeOf(data), ['object', 'array']) !== -1) {
+                                var data = arguments[0];
+                                if (Basic.typeOf(data) === 'string') {
+                                        data = Basic.sprintf.apply(this, arguments);
+                                } else if (Basic.inArray(Basic.typeOf(data), ['object', 'array']) !== -1) {
                                         logObj(data);
-                                } else {
-                                        console.appendChild(document.createTextNode(data + "\n"));
+                                        return;
                                 }
+
+                                console.appendChild(document.createTextNode(data + "\n"));
                         }
                 };
         }
@@ -1198 +1581 @@
         return Env;
 });
 
-// Included from: src/javascript/core/I18n.js
+// Included from: src/javascript/core/Exceptions.js
 
 /**
- * I18n.js
+ * Exceptions.js
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -1210 +1593 @@
  * Contributing: http://www.plupload.com/contributing
  */
 
-define("moxie/core/I18n", [
-        "moxie/core/utils/Basic"
+define('moxie/core/Exceptions', [
+        'moxie/core/utils/Basic'
 ], function(Basic) {
-        var i18n = {};
+        
+        function _findKey(obj, value) {
+                var key;
+                for (key in obj) {
+                        if (obj[key] === value) {
+                                return key;
+                        }
+                }
+                return null;
+        }
 
+        /**
+        @class moxie/core/Exception
+        */
         return {
-                /**
-                 * Extends the language pack object with new items.
-                 *
-                 * @param {Object} pack Language pack items to add.
-                 * @return {Object} Extended language pack object.
-                 */
-                addI18n: function(pack) {
-                        return Basic.extend(i18n, pack);
-                },
+                RuntimeError: (function() {
+                        var namecodes = {
+                                NOT_INIT_ERR: 1,
+                                EXCEPTION_ERR: 3,
+                                NOT_SUPPORTED_ERR: 9,
+                                JS_ERR: 4
+                        };
 
-                /**
-                 * Translates the specified string by checking for the english string in the language pack lookup.
-                 *
-                 * @param {String} str String to look for.
-                 * @return {String} Translated string or the input string if it wasn't found.
-                 */
-                translate: function(str) {
-                        return i18n[str] || str;
-                },
-
-                /**
-                 * Shortcut for translate function
-                 *
-                 * @param {String} str String to look for.
-                 * @return {String} Translated string or the input string if it wasn't found.
-                 */
-                _: function(str) {
-                        return this.translate(str);
-                },
-
-                /**
-                 * Pseudo sprintf implementation - simple way to replace tokens with specified values.
-                 *
-                 * @param {String} str String with tokens
-                 * @return {String} String with replaced tokens
-                 */
-                sprintf: function(str) {
-                        var args = [].slice.call(arguments, 1);
-
-                        return str.replace(/%[a-z]/g, function() {
-                                var value = args.shift();
-                                return Basic.typeOf(value) !== 'undefined' ? value : '';
+                        function RuntimeError(code, message) {
+                                this.code = code;
+                                this.name = _findKey(namecodes, code);
+                                this.message = this.name + (message || ": RuntimeError " + this.code);
+                        }
+                        
+                        Basic.extend(RuntimeError, namecodes);
+                        RuntimeError.prototype = Error.prototype;
+                        return RuntimeError;
+                }()),
+                
+                OperationNotAllowedException: (function() {
+                        
+                        function OperationNotAllowedException(code) {
+                                this.code = code;
+                                this.name = 'OperationNotAllowedException';
+                        }
+                        
+                        Basic.extend(OperationNotAllowedException, {
+                                NOT_ALLOWED_ERR: 1
                         });
-                }
-        };
-});
+                        
+                        OperationNotAllowedException.prototype = Error.prototype;
+                        
+                        return OperationNotAllowedException;
+                }()),
 
-// Included from: src/javascript/core/utils/Mime.js
+                ImageError: (function() {
+                        var namecodes = {
+                                WRONG_FORMAT: 1,
+                                MAX_RESOLUTION_ERR: 2,
+                                INVALID_META_ERR: 3
+                        };
 
-/**
- * Mime.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
-
-define("moxie/core/utils/Mime", [
-        "moxie/core/utils/Basic",
-        "moxie/core/I18n"
-], function(Basic, I18n) {
-        
-        var mimeData = "" +
-                "application/msword,doc dot," +
-                "application/pdf,pdf," +
-                "application/pgp-signature,pgp," +
-                "application/postscript,ps ai eps," +
-                "application/rtf,rtf," +
-                "application/vnd.ms-excel,xls xlb," +
-                "application/vnd.ms-powerpoint,ppt pps pot," +
-                "application/zip,zip," +
-                "application/x-shockwave-flash,swf swfl," +
-                "application/vnd.openxmlformats-officedocument.wordprocessingml.document,docx," +
-                "application/vnd.openxmlformats-officedocument.wordprocessingml.template,dotx," +
-                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,xlsx," +
-                "application/vnd.openxmlformats-officedocument.presentationml.presentation,pptx," +
-                "application/vnd.openxmlformats-officedocument.presentationml.template,potx," +
-                "application/vnd.openxmlformats-officedocument.presentationml.slideshow,ppsx," +
-                "application/x-javascript,js," +
-                "application/json,json," +
-                "audio/mpeg,mp3 mpga mpega mp2," +
-                "audio/x-wav,wav," +
-                "audio/x-m4a,m4a," +
-                "audio/ogg,oga ogg," +
-                "audio/aiff,aiff aif," +
-                "audio/flac,flac," +
-                "audio/aac,aac," +
-                "audio/ac3,ac3," +
-                "audio/x-ms-wma,wma," +
-                "image/bmp,bmp," +
-                "image/gif,gif," +
-                "image/jpeg,jpg jpeg jpe," +
-                "image/photoshop,psd," +
-                "image/png,png," +
-                "image/svg+xml,svg svgz," +
-                "image/tiff,tiff tif," +
-                "text/plain,asc txt text diff log," +
-                "text/html,htm html xhtml," +
-                "text/css,css," +
-                "text/csv,csv," +
-                "text/rtf,rtf," +
-                "video/mpeg,mpeg mpg mpe m2v," +
-                "video/quicktime,qt mov," +
-                "video/mp4,mp4," +
-                "video/x-m4v,m4v," +
-                "video/x-flv,flv," +
-                "video/x-ms-wmv,wmv," +
-                "video/avi,avi," +
-                "video/webm,webm," +
-                "video/3gpp,3gpp 3gp," +
-                "video/3gpp2,3g2," +
-                "video/vnd.rn-realvideo,rv," +
-                "video/ogg,ogv," + 
-                "video/x-matroska,mkv," +
-                "application/vnd.oasis.opendocument.formula-template,otf," +
-                "application/octet-stream,exe";
-        
-        
-        var Mime = {
-
-                mimes: {},
-
-                extensions: {},
-
-                // Parses the default mime types string into a mimes and extensions lookup maps
-                addMimeType: function (mimeData) {
-                        var items = mimeData.split(/,/), i, ii, ext;
-                        
-                        for (i = 0; i < items.length; i += 2) {
-                                ext = items[i + 1].split(/ /);
-
-                                // extension to mime lookup
-                                for (ii = 0; ii < ext.length; ii++) {
-                                        this.mimes[ext[ii]] = items[i];
-                                }
-                                // mime to extension lookup
-                                this.extensions[items[i]] = ext;
+                        function ImageError(code) {
+                                this.code = code;
+                                this.name = _findKey(namecodes, code);
+                                this.message = this.name + ": ImageError " + this.code;
                         }
-                },
-
-
-                extList2mimes: function (filters, addMissingExtensions) {
-                        var self = this, ext, i, ii, type, mimes = [];
                         
-                        // convert extensions to mime types list
-                        for (i = 0; i < filters.length; i++) {
-                                ext = filters[i].extensions.split(/\s*,\s*/);
+                        Basic.extend(ImageError, namecodes);
+                        ImageError.prototype = Error.prototype;
 
-                                for (ii = 0; ii < ext.length; ii++) {
-                                        
-                                        // if there's an asterisk in the list, then accept attribute is not required
-                                        if (ext[ii] === '*') {
-                                                return [];
-                                        }
+                        return ImageError;
+                }()),
 
-                                        type = self.mimes[ext[ii]];
-                                        if (type && Basic.inArray(type, mimes) === -1) {
-                                                mimes.push(type);
-                                        }
+                FileException: (function() {
+                        var namecodes = {
+                                NOT_FOUND_ERR: 1,
+                                SECURITY_ERR: 2,
+                                ABORT_ERR: 3,
+                                NOT_READABLE_ERR: 4,
+                                ENCODING_ERR: 5,
+                                NO_MODIFICATION_ALLOWED_ERR: 6,
+                                INVALID_STATE_ERR: 7,
+                                SYNTAX_ERR: 8
+                        };
 
-                                        // future browsers should filter by extension, finally
-                                        if (addMissingExtensions && /^\w+$/.test(ext[ii])) {
-                                                mimes.push('.' + ext[ii]);
-                                        } else if (!type) {
-                                                // if we have no type in our map, then accept all
-                                                return [];
-                                        }
-                                }
+                        function FileException(code) {
+                                this.code = code;
+                                this.name = _findKey(namecodes, code);
+                                this.message = this.name + ": FileException " + this.code;
                         }
-                        return mimes;
-                },
-
-
-                mimes2exts: function(mimes) {
-                        var self = this, exts = [];
                         
-                        Basic.each(mimes, function(mime) {
-                                if (mime === '*') {
-                                        exts = [];
-                                        return false;
-                                }
+                        Basic.extend(FileException, namecodes);
+                        FileException.prototype = Error.prototype;
+                        return FileException;
+                }()),
+                
+                DOMException: (function() {
+                        var namecodes = {
+                                INDEX_SIZE_ERR: 1,
+                                DOMSTRING_SIZE_ERR: 2,
+                                HIERARCHY_REQUEST_ERR: 3,
+                                WRONG_DOCUMENT_ERR: 4,
+                                INVALID_CHARACTER_ERR: 5,
+                                NO_DATA_ALLOWED_ERR: 6,
+                                NO_MODIFICATION_ALLOWED_ERR: 7,
+                                NOT_FOUND_ERR: 8,
+                                NOT_SUPPORTED_ERR: 9,
+                                INUSE_ATTRIBUTE_ERR: 10,
+                                INVALID_STATE_ERR: 11,
+                                SYNTAX_ERR: 12,
+                                INVALID_MODIFICATION_ERR: 13,
+                                NAMESPACE_ERR: 14,
+                                INVALID_ACCESS_ERR: 15,
+                                VALIDATION_ERR: 16,
+                                TYPE_MISMATCH_ERR: 17,
+                                SECURITY_ERR: 18,
+                                NETWORK_ERR: 19,
+                                ABORT_ERR: 20,
+                                URL_MISMATCH_ERR: 21,
+                                QUOTA_EXCEEDED_ERR: 22,
+                                TIMEOUT_ERR: 23,
+                                INVALID_NODE_TYPE_ERR: 24,
+                                DATA_CLONE_ERR: 25
+                        };
 
-                                // check if this thing looks like mime type
-                                var m = mime.match(/^(\w+)\/(\*|\w+)$/);
-                                if (m) {
-                                        if (m[2] === '*') { 
-                                                // wildcard mime type detected
-                                                Basic.each(self.extensions, function(arr, mime) {
-                                                        if ((new RegExp('^' + m[1] + '/')).test(mime)) {
-                                                                [].push.apply(exts, self.extensions[mime]);
-                                                        }
-                                                });
-                                        } else if (self.extensions[mime]) {
-                                                [].push.apply(exts, self.extensions[mime]);
-                                        }
-                                }
-                        });
-                        return exts;
-                },
-
-
-                mimes2extList: function(mimes) {
-                        var accept = [], exts = [];
-
-                        if (Basic.typeOf(mimes) === 'string') {
-                                mimes = Basic.trim(mimes).split(/\s*,\s*/);
+                        function DOMException(code) {
+                                this.code = code;
+                                this.name = _findKey(namecodes, code);
+                                this.message = this.name + ": DOMException " + this.code;
                         }
-
-                        exts = this.mimes2exts(mimes);
                         
-                        accept.push({
-                                title: I18n.translate('Files'),
-                                extensions: exts.length ? exts.join(',') : '*'
+                        Basic.extend(DOMException, namecodes);
+                        DOMException.prototype = Error.prototype;
+                        return DOMException;
+                }()),
+                
+                EventException: (function() {
+                        function EventException(code) {
+                                this.code = code;
+                                this.name = 'EventException';
+                        }
+                        
+                        Basic.extend(EventException, {
+                                UNSPECIFIED_EVENT_TYPE_ERR: 0
                         });
                         
-                        // save original mimes string
-                        accept.mimes = mimes;
-
-                        return accept;
-                },
-
-
-                getFileExtension: function(fileName) {
-                        var matches = fileName && fileName.match(/\.([^.]+)$/);
-                        if (matches) {
-                                return matches[1].toLowerCase();
-                        }
-                        return '';
-                },
-
-                getFileMime: function(fileName) {
-                        return this.mimes[this.getFileExtension(fileName)] || '';
-                }
+                        EventException.prototype = Error.prototype;
+                        
+                        return EventException;
+                }())
         };
-
-        Mime.addMimeType(mimeData);
-
-        return Mime;
 });
 
 // Included from: src/javascript/core/utils/Dom.js
@@ -1470 +1757 @@
  * Contributing: http://www.plupload.com/contributing
  */
 
+/**
+@class moxie/core/utils/Dom
+@public
+@static
+*/
+
 define('moxie/core/utils/Dom', ['moxie/core/utils/Env'], function(Env) {
 
         /**
@@ -1476 +1769 @@
         Get DOM Element by it's id.
 
         @method get
-        @for Utils
         @param {String} id Identifier of the DOM Element
         @return {DOMElement}
         */
@@ -1641 +1933 @@
         };
 });
 
-// Included from: src/javascript/core/Exceptions.js
+// Included from: src/javascript/core/EventTarget.js
 
 /**
- * Exceptions.js
+ * EventTarget.js
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -1653 +1945 @@
  * Contributing: http://www.plupload.com/contributing
  */
 
-define('moxie/core/Exceptions', [
+define('moxie/core/EventTarget', [
+        'moxie/core/utils/Env',
+        'moxie/core/Exceptions',
         'moxie/core/utils/Basic'
-], function(Basic) {
-        function _findKey(obj, value) {
-                var key;
-                for (key in obj) {
-                        if (obj[key] === value) {
-                                return key;
-                        }
-                }
-                return null;
+], function(Env, x, Basic) {
+
+        // hash of event listeners by object uid
+        var eventpool = {};
+
+        /**
+        Parent object for all event dispatching components and objects
+
+        @class moxie/core/EventTarget
+        @constructor EventTarget
+        */
+        function EventTarget() {
+                /**
+                Unique id of the event dispatcher, usually overriden by children
+
+                @property uid
+                @type String
+                */
+                this.uid = Basic.guid();
         }
 
-        return {
-                RuntimeError: (function() {
-                        var namecodes = {
-                                NOT_INIT_ERR: 1,
-                                NOT_SUPPORTED_ERR: 9,
-                                JS_ERR: 4
-                        };
 
-                        function RuntimeError(code) {
-                                this.code = code;
-                                this.name = _findKey(namecodes, code);
-                                this.message = this.name + ": RuntimeError " + this.code;
-                        }
-                        
-                        Basic.extend(RuntimeError, namecodes);
-                        RuntimeError.prototype = Error.prototype;
-                        return RuntimeError;
-                }()),
-                
-                OperationNotAllowedException: (function() {
-                        
-                        function OperationNotAllowedException(code) {
-                                this.code = code;
-                                this.name = 'OperationNotAllowedException';
-                        }
-                        
-                        Basic.extend(OperationNotAllowedException, {
-                                NOT_ALLOWED_ERR: 1
-                        });
-                        
-                        OperationNotAllowedException.prototype = Error.prototype;
-                        
-                        return OperationNotAllowedException;
-                }()),
+        Basic.extend(EventTarget.prototype, {
 
-                ImageError: (function() {
-                        var namecodes = {
-                                WRONG_FORMAT: 1,
-                                MAX_RESOLUTION_ERR: 2,
-                                INVALID_META_ERR: 3
-                        };
+                /**
+                Can be called from within a child  in order to acquire uniqie id in automated manner
 
-                        function ImageError(code) {
-                                this.code = code;
-                                this.name = _findKey(namecodes, code);
-                                this.message = this.name + ": ImageError " + this.code;
+                @method init
+                */
+                init: function() {
+                        if (!this.uid) {
+                                this.uid = Basic.guid('uid_');
                         }
-                        
-                        Basic.extend(ImageError, namecodes);
-                        ImageError.prototype = Error.prototype;
+                },
 
-                        return ImageError;
-                }()),
+                /**
+                Register a handler to a specific event dispatched by the object
 
-                FileException: (function() {
-                        var namecodes = {
-                                NOT_FOUND_ERR: 1,
-                                SECURITY_ERR: 2,
-                                ABORT_ERR: 3,
-                                NOT_READABLE_ERR: 4,
-                                ENCODING_ERR: 5,
-                                NO_MODIFICATION_ALLOWED_ERR: 6,
-                                INVALID_STATE_ERR: 7,
-                                SYNTAX_ERR: 8
-                        };
+                @method addEventListener
+                @param {String} type Type or basically a name of the event to subscribe to
+                @param {Function} fn Callback function that will be called when event happens
+                @param {Number} [priority=0] Priority of the event handler - handlers with higher priorities will be called first
+                @param {Object} [scope=this] A scope to invoke event handler in
+                */
+                addEventListener: function(type, fn, priority, scope) {
+                        var self = this, list;
 
-                        function FileException(code) {
-                                this.code = code;
-                                this.name = _findKey(namecodes, code);
-                                this.message = this.name + ": FileException " + this.code;
+                        // without uid no event handlers can be added, so make sure we got one
+                        if (!this.hasOwnProperty('uid')) {
+                                this.uid = Basic.guid('uid_');
                         }
-                        
-                        Basic.extend(FileException, namecodes);
-                        FileException.prototype = Error.prototype;
-                        return FileException;
-                }()),
-                
-                DOMException: (function() {
-                        var namecodes = {
-                                INDEX_SIZE_ERR: 1,
-                                DOMSTRING_SIZE_ERR: 2,
-                                HIERARCHY_REQUEST_ERR: 3,
-                                WRONG_DOCUMENT_ERR: 4,
-                                INVALID_CHARACTER_ERR: 5,
-                                NO_DATA_ALLOWED_ERR: 6,
-                                NO_MODIFICATION_ALLOWED_ERR: 7,
-                                NOT_FOUND_ERR: 8,
-                                NOT_SUPPORTED_ERR: 9,
-                                INUSE_ATTRIBUTE_ERR: 10,
-                                INVALID_STATE_ERR: 11,
-                                SYNTAX_ERR: 12,
-                                INVALID_MODIFICATION_ERR: 13,
-                                NAMESPACE_ERR: 14,
-                                INVALID_ACCESS_ERR: 15,
-                                VALIDATION_ERR: 16,
-                                TYPE_MISMATCH_ERR: 17,
-                                SECURITY_ERR: 18,
-                                NETWORK_ERR: 19,
-                                ABORT_ERR: 20,
-                                URL_MISMATCH_ERR: 21,
-                                QUOTA_EXCEEDED_ERR: 22,
-                                TIMEOUT_ERR: 23,
-                                INVALID_NODE_TYPE_ERR: 24,
-                                DATA_CLONE_ERR: 25
-                        };
 
-                        function DOMException(code) {
-                                this.code = code;
-                                this.name = _findKey(namecodes, code);
-                                this.message = this.name + ": DOMException " + this.code;
+                        type = Basic.trim(type);
+
+                        if (/\s/.test(type)) {
+                                // multiple event types were passed for one handler
+                                Basic.each(type.split(/\s+/), function(type) {
+                                        self.addEventListener(type, fn, priority, scope);
+                                });
+                                return;
                         }
-                        
-                        Basic.extend(DOMException, namecodes);
-                        DOMException.prototype = Error.prototype;
-                        return DOMException;
-                }()),
-                
-                EventException: (function() {
-                        function EventException(code) {
-                                this.code = code;
-                                this.name = 'EventException';
-                        }
-                        
-                        Basic.extend(EventException, {
-                                UNSPECIFIED_EVENT_TYPE_ERR: 0
-                        });
-                        
-                        EventException.prototype = Error.prototype;
-                        
-                        return EventException;
-                }())
-        };
-});
 
-// Included from: src/javascript/core/EventTarget.js
+                        type = type.toLowerCase();
+                        priority = parseInt(priority, 10) || 0;
 
-/**
- * EventTarget.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
+                        list = eventpool[this.uid] && eventpool[this.uid][type] || [];
+                        list.push({fn : fn, priority : priority, scope : scope || this});
 
-define('moxie/core/EventTarget', [
-        'moxie/core/utils/Env',
-        'moxie/core/Exceptions',
-        'moxie/core/utils/Basic'
-], function(Env, x, Basic) {
-        /**
-        Parent object for all event dispatching components and objects
+                        if (!eventpool[this.uid]) {
+                                eventpool[this.uid] = {};
+                        }
+                        eventpool[this.uid][type] = list;
+                },
 
-        @class EventTarget
-        @constructor EventTarget
-        */
-        function EventTarget() {
-                // hash of event listeners by object uid
-                var eventpool = {};
-                                
-                Basic.extend(this, {
-                        
-                        /**
-                        Unique id of the event dispatcher, usually overriden by children
+                /**
+                Check if any handlers were registered to the specified event
 
-                        @property uid
-                        @type String
-                        */
-                        uid: null,
-                        
-                        /**
-                        Can be called from within a child  in order to acquire uniqie id in automated manner
+                @method hasEventListener
+                @param {String} [type] Type or basically a name of the event to check
+                @return {Mixed} Returns a handler if it was found and false, if - not
+                */
+                hasEventListener: function(type) {
+                        var list;
+                        if (type) {
+                                type = type.toLowerCase();
+                                list = eventpool[this.uid] && eventpool[this.uid][type];
+                        } else {
+                                list = eventpool[this.uid];
+                        }
+                        return list ? list : false;
+                },
 
-                        @method init
-                        */
-                        init: function() {
-                                if (!this.uid) {
-                                        this.uid = Basic.guid('uid_');
-                                }
-                        },
+                /**
+                Unregister the handler from the event, or if former was not specified - unregister all handlers
 
-                        /**
-                        Register a handler to a specific event dispatched by the object
+                @method removeEventListener
+                @param {String} type Type or basically a name of the event
+                @param {Function} [fn] Handler to unregister
+                */
+                removeEventListener: function(type, fn) {
+                        var self = this, list, i;
 
-                        @method addEventListener
-                        @param {String} type Type or basically a name of the event to subscribe to
-                        @param {Function} fn Callback function that will be called when event happens
-                        @param {Number} [priority=0] Priority of the event handler - handlers with higher priorities will be called first
-                        @param {Object} [scope=this] A scope to invoke event handler in
-                        */
-                        addEventListener: function(type, fn, priority, scope) {
-                                var self = this, list;
+                        type = type.toLowerCase();
 
-                                // without uid no event handlers can be added, so make sure we got one
-                                if (!this.hasOwnProperty('uid')) {
-                                        this.uid = Basic.guid('uid_');
-                                }
-                                
-                                type = Basic.trim(type);
-                                
-                                if (/\s/.test(type)) {
-                                        // multiple event types were passed for one handler
-                                        Basic.each(type.split(/\s+/), function(type) {
-                                                self.addEventListener(type, fn, priority, scope);
-                                        });
-                                        return;
-                                }
-                                
-                                type = type.toLowerCase();
-                                priority = parseInt(priority, 10) || 0;
-                                
-                                list = eventpool[this.uid] && eventpool[this.uid][type] || [];
-                                list.push({fn : fn, priority : priority, scope : scope || this});
-                                
-                                if (!eventpool[this.uid]) {
-                                        eventpool[this.uid] = {};
-                                }
-                                eventpool[this.uid][type] = list;
-                        },
-                        
-                        /**
-                        Check if any handlers were registered to the specified event
+                        if (/\s/.test(type)) {
+                                // multiple event types were passed for one handler
+                                Basic.each(type.split(/\s+/), function(type) {
+                                        self.removeEventListener(type, fn);
+                                });
+                                return;
+                        }
 
-                        @method hasEventListener
-                        @param {String} type Type or basically a name of the event to check
-                        @return {Mixed} Returns a handler if it was found and false, if - not
-                        */
-                        hasEventListener: function(type) {
-                                var list = type ? eventpool[this.uid] && eventpool[this.uid][type] : eventpool[this.uid];
-                                return list ? list : false;
-                        },
-                        
-                        /**
-                        Unregister the handler from the event, or if former was not specified - unregister all handlers
+                        list = eventpool[this.uid] && eventpool[this.uid][type];
 
-                        @method removeEventListener
-                        @param {String} type Type or basically a name of the event
-                        @param {Function} [fn] Handler to unregister
-                        */
-                        removeEventListener: function(type, fn) {
-                                type = type.toLowerCase();
-        
-                                var list = eventpool[this.uid] && eventpool[this.uid][type], i;
-        
-                                if (list) {
-                                        if (fn) {
-                                                for (i = list.length - 1; i >= 0; i--) {
-                                                        if (list[i].fn === fn) {
-                                                                list.splice(i, 1);
-                                                                break;
-                                                        }
+                        if (list) {
+                                if (fn) {
+                                        for (i = list.length - 1; i >= 0; i--) {
+                                                if (list[i].fn === fn) {
+                                                        list.splice(i, 1);
+                                                        break;
                                                 }
-                                        } else {
-                                                list = [];
                                         }
-        
-                                        // delete event list if it has become empty
-                                        if (!list.length) {
-                                                delete eventpool[this.uid][type];
-                                                
-                                                // and object specific entry in a hash if it has no more listeners attached
-                                                if (Basic.isEmptyObj(eventpool[this.uid])) {
-                                                        delete eventpool[this.uid];
-                                                }
-                                        }
+                                } else {
+                                        list = [];
                                 }
-                        },
-                        
-                        /**
-                        Remove all event handlers from the object
 
-                        @method removeAllEventListeners
-                        */
-                        removeAllEventListeners: function() {
-                                if (eventpool[this.uid]) {
-                                        delete eventpool[this.uid];
+                                // delete event list if it has become empty
+                                if (!list.length) {
+                                        delete eventpool[this.uid][type];
+
+                                        // and object specific entry in a hash if it has no more listeners attached
+                                        if (Basic.isEmptyObj(eventpool[this.uid])) {
+                                                delete eventpool[this.uid];
+                                        }
                                 }
-                        },
-                        
-                        /**
-                        Dispatch the event
+                        }
+                },
 
-                        @method dispatchEvent
-                        @param {String/Object} Type of event or event object to dispatch
-                        @param {Mixed} [...] Variable number of arguments to be passed to a handlers
-                        @return {Boolean} true by default and false if any handler returned false
-                        */
-                        dispatchEvent: function(type) {
-                                var uid, list, args, tmpEvt, evt = {}, result = true, undef;
-                                
-                                if (Basic.typeOf(type) !== 'string') {
-                                        // we can't use original object directly (because of Silverlight)
-                                        tmpEvt = type;
+                /**
+                Remove all event handlers from the object
 
-                                        if (Basic.typeOf(tmpEvt.type) === 'string') {
-                                                type = tmpEvt.type;
+                @method removeAllEventListeners
+                */
+                removeAllEventListeners: function() {
+                        if (eventpool[this.uid]) {
+                                delete eventpool[this.uid];
+                        }
+                },
 
-                                                if (tmpEvt.total !== undef && tmpEvt.loaded !== undef) { // progress event
-                                                        evt.total = tmpEvt.total;
-                                                        evt.loaded = tmpEvt.loaded;
-                                                }
-                                                evt.async = tmpEvt.async || false;
-                                        } else {
-                                                throw new x.EventException(x.EventException.UNSPECIFIED_EVENT_TYPE_ERR);
+                /**
+                Dispatch the event
+
+                @method dispatchEvent
+                @param {String/Object} Type of event or event object to dispatch
+                @param {Mixed} [...] Variable number of arguments to be passed to a handlers
+                @return {Boolean} true by default and false if any handler returned false
+                */
+                dispatchEvent: function(type) {
+                        var uid, list, args, tmpEvt, evt = {}, result = true, undef;
+
+                        if (Basic.typeOf(type) !== 'string') {
+                                // we can't use original object directly (because of Silverlight)
+                                tmpEvt = type;
+
+                                if (Basic.typeOf(tmpEvt.type) === 'string') {
+                                        type = tmpEvt.type;
+
+                                        if (tmpEvt.total !== undef && tmpEvt.loaded !== undef) { // progress event
+                                                evt.total = tmpEvt.total;
+                                                evt.loaded = tmpEvt.loaded;
                                         }
-                                }
-                                
-                                // check if event is meant to be dispatched on an object having specific uid
-                                if (type.indexOf('::') !== -1) {
-                                        (function(arr) {
-                                                uid = arr[0];
-                                                type = arr[1];
-                                        }(type.split('::')));
+                                        evt.async = tmpEvt.async || false;
                                 } else {
-                                        uid = this.uid;
+                                        throw new x.EventException(x.EventException.UNSPECIFIED_EVENT_TYPE_ERR);
                                 }
-                                
-                                type = type.toLowerCase();
-                                                                
-                                list = eventpool[uid] && eventpool[uid][type];
+                        }
 
-                                if (list) {
-                                        // sort event list by prority
-                                        list.sort(function(a, b) { return b.priority - a.priority; });
-                                        
-                                        args = [].slice.call(arguments);
-                                        
-                                        // first argument will be pseudo-event object
-                                        args.shift();
-                                        evt.type = type;
-                                        args.unshift(evt);
+                        // check if event is meant to be dispatched on an object having specific uid
+                        if (type.indexOf('::') !== -1) {
+                                (function(arr) {
+                                        uid = arr[0];
+                                        type = arr[1];
+                                }(type.split('::')));
+                        } else {
+                                uid = this.uid;
+                        }
 
-                                        if (MXI_DEBUG && Env.debug.events) {
-                                                Env.log("Event '%s' fired on %u", evt.type, uid);       
-                                        }
+                        type = type.toLowerCase();
 
-                                        // Dispatch event to all listeners
-                                        var queue = [];
-                                        Basic.each(list, function(handler) {
-                                                // explicitly set the target, otherwise events fired from shims do not get it
-                                                args[0].target = handler.scope;
-                                                // if event is marked as async, detach the handler
-                                                if (evt.async) {
-                                                        queue.push(function(cb) {
-                                                                setTimeout(function() {
-                                                                        cb(handler.fn.apply(handler.scope, args) === false);
-                                                                }, 1);
-                                                        });
-                                                } else {
-                                                        queue.push(function(cb) {
-                                                                cb(handler.fn.apply(handler.scope, args) === false); // if handler returns false stop propagation
-                                                        });
-                                                }
-                                        });
-                                        if (queue.length) {
-                                                Basic.inSeries(queue, function(err) {
-                                                        result = !err;
+                        list = eventpool[uid] && eventpool[uid][type];
+
+                        if (list) {
+                                // sort event list by prority
+                                list.sort(function(a, b) { return b.priority - a.priority; });
+
+                                args = [].slice.call(arguments);
+
+                                // first argument will be pseudo-event object
+                                args.shift();
+                                evt.type = type;
+                                args.unshift(evt);
+
+                                if (MXI_DEBUG && Env.debug.events) {
+                                        Env.log("%cEvent '%s' fired on %s", 'color: #999;', evt.type, (this.ctorName ? this.ctorName + '::' : '') + uid);
+                                }
+
+                                // Dispatch event to all listeners
+                                var queue = [];
+                                Basic.each(list, function(handler) {
+                                        // explicitly set the target, otherwise events fired from shims do not get it
+                                        args[0].target = handler.scope;
+                                        // if event is marked as async, detach the handler
+                                        if (evt.async) {
+                                                queue.push(function(cb) {
+                                                        setTimeout(function() {
+                                                                cb(handler.fn.apply(handler.scope, args) === false);
+                                                        }, 1);
                                                 });
+                                        } else {
+                                                queue.push(function(cb) {
+                                                        cb(handler.fn.apply(handler.scope, args) === false); // if handler returns false stop propagation
+                                                });
                                         }
+                                });
+                                if (queue.length) {
+                                        Basic.inSeries(queue, function(err) {
+                                                result = !err;
+                                        });
                                 }
-                                return result;
-                        },
-                        
-                        /**
-                        Alias for addEventListener
+                        }
+                        return result;
+                },
 
-                        @method bind
-                        @protected
-                        */
-                        bind: function() {
-                                this.addEventListener.apply(this, arguments);
-                        },
-                        
-                        /**
-                        Alias for removeEventListener
+                /**
+                Register a handler to the event type that will run only once
 
-                        @method unbind
-                        @protected
-                        */
-                        unbind: function() {
-                                this.removeEventListener.apply(this, arguments);
-                        },
-                        
-                        /**
-                        Alias for removeAllEventListeners
+                @method bindOnce
+                @since >1.4.1
+                @param {String} type Type or basically a name of the event to subscribe to
+                @param {Function} fn Callback function that will be called when event happens
+                @param {Number} [priority=0] Priority of the event handler - handlers with higher priorities will be called first
+                @param {Object} [scope=this] A scope to invoke event handler in
+                */
+                bindOnce: function(type, fn, priority, scope) {
+                        var self = this;
+                        self.bind.call(this, type, function cb() {
+                                self.unbind(type, cb);
+                                return fn.apply(this, arguments);
+                        }, priority, scope);
+                },
 
-                        @method unbindAll
-                        @protected
-                        */
-                        unbindAll: function() {
-                                this.removeAllEventListeners.apply(this, arguments);
-                        },
-                        
-                        /**
-                        Alias for dispatchEvent
+                /**
+                Alias for addEventListener
 
-                        @method trigger
-                        @protected
-                        */
-                        trigger: function() {
-                                return this.dispatchEvent.apply(this, arguments);
-                        },
-                        
+                @method bind
+                @protected
+                */
+                bind: function() {
+                        this.addEventListener.apply(this, arguments);
+                },
 
-                        /**
-                        Handle properties of on[event] type.
+                /**
+                Alias for removeEventListener
 
-                        @method handleEventProps
-                        @private
-                        */
-                        handleEventProps: function(dispatches) {
-                                var self = this;
+                @method unbind
+                @protected
+                */
+                unbind: function() {
+                        this.removeEventListener.apply(this, arguments);
+                },
 
-                                this.bind(dispatches.join(' '), function(e) {
-                                        var prop = 'on' + e.type.toLowerCase();
-                                        if (Basic.typeOf(this[prop]) === 'function') {
-                                                this[prop].apply(this, arguments);
-                                        }
-                                });
+                /**
+                Alias for removeAllEventListeners
 
-                                // object must have defined event properties, even if it doesn't make use of them
-                                Basic.each(dispatches, function(prop) {
-                                        prop = 'on' + prop.toLowerCase(prop);
-                                        if (Basic.typeOf(self[prop]) === 'undefined') {
-                                                self[prop] = null; 
-                                        }
-                                });
-                        }
-                        
-                });
-        }
+                @method unbindAll
+                @protected
+                */
+                unbindAll: function() {
+                        this.removeAllEventListeners.apply(this, arguments);
+                },
 
-        EventTarget.instance = new EventTarget(); 
+                /**
+                Alias for dispatchEvent
 
+                @method trigger
+                @protected
+                */
+                trigger: function() {
+                        return this.dispatchEvent.apply(this, arguments);
+                },
+
+
+                /**
+                Handle properties of on[event] type.
+
+                @method handleEventProps
+                @private
+                */
+                handleEventProps: function(dispatches) {
+                        var self = this;
+
+                        this.bind(dispatches.join(' '), function(e) {
+                                var prop = 'on' + e.type.toLowerCase();
+                                if (Basic.typeOf(this[prop]) === 'function') {
+                                        this[prop].apply(this, arguments);
+                                }
+                        });
+
+                        // object must have defined event properties, even if it doesn't make use of them
+                        Basic.each(dispatches, function(prop) {
+                                prop = 'on' + prop.toLowerCase(prop);
+                                if (Basic.typeOf(self[prop]) === 'undefined') {
+                                        self[prop] = null;
+                                }
+                        });
+                }
+
+        });
+
+
+        EventTarget.instance = new EventTarget();
+
         return EventTarget;
 });
 
@@ -2127 +2297 @@
         /**
         Common set of methods and properties for every runtime instance
 
-        @class Runtime
+        @class moxie/runtime/Runtime
 
         @param {Object} options
         @param {String} type Sanitized name of the runtime
@@ -2371 +2541 @@
 
                                 // if no container for shim, create one
                                 if (!shimContainer) {
-                                        container = this.options.container ? Dom.get(this.options.container) : document.body;
+                                        container = Dom.get(this.options.container) || document.body;
 
                                         // create shim container and insert it at an absolute position into the outer container
                                         shimContainer = document.createElement('div');
@@ -2475 +2645 @@
         @type String
         @static
         */
-        Runtime.order = 'html5,html4';
+        Runtime.order = 'html5,flash,silverlight,html4';
 
 
         /**
@@ -2646 +2816 @@
                                                 // if cap requires conflicting mode - runtime cannot fulfill required caps
 
                                                 if (MXI_DEBUG && Env.debug.runtime) {
-                                                        Env.log("\t\t%c: %v (conflicting mode requested: %s)", cap, value, capMode);    
+                                                        Env.log("\t\t%s: %s (conflicting mode requested: %s)", cap, value, capMode);
                                                 }
 
                                                 return (mode = false);
@@ -2654 +2824 @@
                                 }
 
                                 if (MXI_DEBUG && Env.debug.runtime) {
-                                        Env.log("\t\t%c: %v (compatible modes: %s)", cap, value, mode); 
+                                        Env.log("\t\t%s: %s (compatible modes: %s)", cap, value, mode);
                                 }
                         });
 
@@ -2669 +2839 @@
 
 
         /**
+         * Third party shims (Flash and Silverlight) require global event target against which they
+         * will fire their events. However when moxie is not loaded to global namespace, default
+         * event target is not accessible and we have to create artificial ones.
+         *
+         * @method getGlobalEventTarget
+         * @static
+         * @return {String} Name of the global event target
+         */
+        Runtime.getGlobalEventTarget = function() {
+                if (/^moxie\./.test(Env.global_event_dispatcher) && !Env.can('access_global_ns')) {
+                        var uniqueCallbackName = Basic.guid('moxie_event_target_');
+
+                        window[uniqueCallbackName] = function(e, data) {
+                                EventTarget.instance.dispatchEvent(e, data);
+                        };
+
+                        Env.global_event_dispatcher = uniqueCallbackName;
+                }
+
+                return Env.global_event_dispatcher;
+        };
+
+
+        /**
         Capability check that always returns true
 
         @private
@@ -2728 +2922 @@
         /**
         Set of methods and properties, required by a component to acquire ability to connect to a runtime
 
-        @class RuntimeClient
+        @class moxie/runtime/RuntimeClient
         */
         return function RuntimeClient() {
                 var runtime;
@@ -2758 +2952 @@
                                         type = items.shift().toLowerCase();
                                         constructor = Runtime.getConstructor(type);
                                         if (!constructor) {
+                                                if (MXI_DEBUG && Env.debug.runtime) {
+                                                        Env.log("Constructor for '%s' runtime is not available.", type);
+                                                }
                                                 initialize(items);
                                                 return;
                                         }
@@ -2781 +2978 @@
                                                 // jailbreak ...
                                                 setTimeout(function() {
                                                         runtime.clients++;
+                                                        comp.ruid = runtime.uid;
                                                         // this will be triggered on component
                                                         comp.trigger('RuntimeInit', runtime);
                                                 }, 1);
@@ -2795 +2993 @@
                                                 initialize(items);
                                         });
 
-                                        /*runtime.bind('Exception', function() { });*/
+                                        runtime.bind('Exception', function(e, err) {
+                                                var message = err.name + "(#" + err.code + ")" + (err.message ? ", from: " + err.message : '');
+                                                
+                                                if (MXI_DEBUG && Env.debug.runtime) {
+                                                        Env.log("Runtime '%s' has thrown an exception: %s", this.type, message);
+                                                }
+                                                comp.trigger('RuntimeError', new x.RuntimeError(x.RuntimeError.EXCEPTION_ERR, message));
+                                        });
 
                                         if (MXI_DEBUG && Env.debug.runtime) {
                                                 Env.log("\tselected mode: %s", runtime.mode);   
@@ -2820 +3025 @@
                                 if (ruid) {
                                         runtime = Runtime.getRuntime(ruid);
                                         if (runtime) {
+                                                comp.ruid = ruid;
                                                 runtime.clients++;
                                                 return runtime;
                                         } else {
@@ -2871 +3077 @@
                         @return {Mixed} Whatever runtime extension method returns
                         */
                         exec: function() {
-                                if (runtime) {
-                                        return runtime.exec.apply(this, arguments);
+                                return runtime ? runtime.exec.apply(this, arguments) : null;
+                        },
+
+
+                        /**
+                        Test runtime client for specific capability
+                        
+                        @method can
+                        @param {String} cap
+                        @return {Bool}
+                        */
+                        can: function(cap) {
+                                return runtime ? runtime.can(cap) : false;
+                        }
+
+                });
+        };
+
+
+});
+
+// Included from: src/javascript/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
+ */
+
+define('moxie/file/Blob', [
+        'moxie/core/utils/Basic',
+        'moxie/core/utils/Encode',
+        'moxie/runtime/RuntimeClient'
+], function(Basic, Encode, RuntimeClient) {
+        
+        var blobpool = {};
+
+        /**
+        @class moxie/file/Blob
+        @constructor
+        @param {String} ruid Unique id of the runtime, to which this blob belongs to
+        @param {Object} blob Object "Native" blob object, as it is represented in the runtime
+        */
+        function Blob(ruid, blob) {
+
+                function _sliceDetached(start, end, type) {
+                        var blob, data = blobpool[this.uid];
+
+                        if (Basic.typeOf(data) !== 'string' || !data.length) {
+                                return null; // or throw exception
+                        }
+
+                        blob = new Blob(null, {
+                                type: type,
+                                size: end - start
+                        });
+                        blob.detach(data.substr(start, blob.size));
+
+                        return blob;
+                }
+
+                RuntimeClient.call(this);
+
+                if (ruid) {     
+                        this.connectRuntime(ruid);
+                }
+
+                if (!blob) {
+                        blob = {};
+                } else if (Basic.typeOf(blob) === 'string') { // dataUrl or binary string
+                        blob = { data: blob };
+                }
+
+                Basic.extend(this, {
+                        
+                        /**
+                        Unique id of the component
+
+                        @property uid
+                        @type {String}
+                        */
+                        uid: blob.uid || Basic.guid('uid_'),
+                        
+                        /**
+                        Unique id of the connected runtime, if falsy, then runtime will have to be initialized 
+                        before this Blob can be used, modified or sent
+
+                        @property ruid
+                        @type {String}
+                        */
+                        ruid: ruid,
+        
+                        /**
+                        Size of blob
+
+                        @property size
+                        @type {Number}
+                        @default 0
+                        */
+                        size: blob.size || 0,
+                        
+                        /**
+                        Mime type of blob
+
+                        @property type
+                        @type {String}
+                        @default ''
+                        */
+                        type: blob.type || '',
+                        
+                        /**
+                        @method slice
+                        @param {Number} [start=0]
+                        */
+                        slice: function(start, end, type) {             
+                                if (this.isDetached()) {
+                                        return _sliceDetached.apply(this, arguments);
                                 }
-                                return null;
+                                return this.getRuntime().exec.call(this, 'Blob', 'slice', this.getSource(), start, end, type);
+                        },
+
+                        /**
+                        Returns "native" blob object (as it is represented in connected runtime) or null if not found
+
+                        @method getSource
+                        @return {Blob} Returns "native" blob object or null if not found
+                        */
+                        getSource: function() {
+                                if (!blobpool[this.uid]) {
+                                        return null;    
+                                }
+                                return blobpool[this.uid];
+                        },
+
+                        /** 
+                        Detaches blob from any runtime that it depends on and initialize with standalone value
+
+                        @method detach
+                        @protected
+                        @param {DOMString} [data=''] Standalone value
+                        */
+                        detach: function(data) {
+                                if (this.ruid) {
+                                        this.getRuntime().exec.call(this, 'Blob', 'destroy');
+                                        this.disconnectRuntime();
+                                        this.ruid = null;
+                                }
+
+                                data = data || '';
+
+                                // if dataUrl, convert to binary string
+                                if (data.substr(0, 5) == 'data:') {
+                                        var base64Offset = data.indexOf(';base64,');
+                                        this.type = data.substring(5, base64Offset);
+                                        data = Encode.atob(data.substring(base64Offset + 8));
+                                }
+
+                                this.size = data.length;
+
+                                blobpool[this.uid] = data;
+                        },
+
+                        /**
+                        Checks if blob is standalone (detached of any runtime)
+                        
+                        @method isDetached
+                        @protected
+                        @return {Boolean}
+                        */
+                        isDetached: function() {
+                                return !this.ruid && Basic.typeOf(blobpool[this.uid]) === 'string';
+                        },
+                        
+                        /** 
+                        Destroy Blob and free any resources it was using
+
+                        @method destroy
+                        */
+                        destroy: function() {
+                                this.detach();
+                                delete blobpool[this.uid];
                         }
+                });
 
+                
+                if (blob.data) {
+                        this.detach(blob.data); // auto-detach if payload has been passed
+                } else {
+                        blobpool[this.uid] = blob;      
+                }
+        }
+        
+        return Blob;
+});
+
+// Included from: src/javascript/core/I18n.js
+
+/**
+ * I18n.js
+ *
+ * Copyright 2013, Moxiecode Systems AB
+ * Released under GPL License.
+ *
+ * License: http://www.plupload.com/license
+ * Contributing: http://www.plupload.com/contributing
+ */
+
+define("moxie/core/I18n", [
+        "moxie/core/utils/Basic"
+], function(Basic) {
+        var i18n = {};
+
+        /**
+        @class moxie/core/I18n
+        */
+        return {
+                /**
+                 * Extends the language pack object with new items.
+                 *
+                 * @param {Object} pack Language pack items to add.
+                 * @return {Object} Extended language pack object.
+                 */
+                addI18n: function(pack) {
+                        return Basic.extend(i18n, pack);
+                },
+
+                /**
+                 * Translates the specified string by checking for the english string in the language pack lookup.
+                 *
+                 * @param {String} str String to look for.
+                 * @return {String} Translated string or the input string if it wasn't found.
+                 */
+                translate: function(str) {
+                        return i18n[str] || str;
+                },
+
+                /**
+                 * Shortcut for translate function
+                 *
+                 * @param {String} str String to look for.
+                 * @return {String} Translated string or the input string if it wasn't found.
+                 */
+                _: function(str) {
+                        return this.translate(str);
+                },
+
+                /**
+                 * Pseudo sprintf implementation - simple way to replace tokens with specified values.
+                 *
+                 * @param {String} str String with tokens
+                 * @return {String} String with replaced tokens
+                 */
+                sprintf: function(str) {
+                        var args = [].slice.call(arguments, 1);
+
+                        return str.replace(/%[a-z]/g, function() {
+                                var value = args.shift();
+                                return Basic.typeOf(value) !== 'undefined' ? value : '';
+                        });
+                }
+        };
+});
+
+// Included from: src/javascript/core/utils/Mime.js
+
+/**
+ * Mime.js
+ *
+ * Copyright 2013, Moxiecode Systems AB
+ * Released under GPL License.
+ *
+ * License: http://www.plupload.com/license
+ * Contributing: http://www.plupload.com/contributing
+ */
+
+/**
+@class moxie/core/utils/Mime
+@public
+@static
+*/
+
+define("moxie/core/utils/Mime", [
+        "moxie/core/utils/Basic",
+        "moxie/core/I18n"
+], function(Basic, I18n) {
+
+        var mimeData = "" +
+                "application/msword,doc dot," +
+                "application/pdf,pdf," +
+                "application/pgp-signature,pgp," +
+                "application/postscript,ps ai eps," +
+                "application/rtf,rtf," +
+                "application/vnd.ms-excel,xls xlb xlt xla," +
+                "application/vnd.ms-powerpoint,ppt pps pot ppa," +
+                "application/zip,zip," +
+                "application/x-shockwave-flash,swf swfl," +
+                "application/vnd.openxmlformats-officedocument.wordprocessingml.document,docx," +
+                "application/vnd.openxmlformats-officedocument.wordprocessingml.template,dotx," +
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,xlsx," +
+                "application/vnd.openxmlformats-officedocument.presentationml.presentation,pptx," +
+                "application/vnd.openxmlformats-officedocument.presentationml.template,potx," +
+                "application/vnd.openxmlformats-officedocument.presentationml.slideshow,ppsx," +
+                "application/x-javascript,js," +
+                "application/json,json," +
+                "audio/mpeg,mp3 mpga mpega mp2," +
+                "audio/x-wav,wav," +
+                "audio/x-m4a,m4a," +
+                "audio/ogg,oga ogg," +
+                "audio/aiff,aiff aif," +
+                "audio/flac,flac," +
+                "audio/aac,aac," +
+                "audio/ac3,ac3," +
+                "audio/x-ms-wma,wma," +
+                "image/bmp,bmp," +
+                "image/gif,gif," +
+                "image/jpeg,jpg jpeg jpe," +
+                "image/photoshop,psd," +
+                "image/png,png," +
+                "image/svg+xml,svg svgz," +
+                "image/tiff,tiff tif," +
+                "text/plain,asc txt text diff log," +
+                "text/html,htm html xhtml," +
+                "text/css,css," +
+                "text/csv,csv," +
+                "text/rtf,rtf," +
+                "video/mpeg,mpeg mpg mpe m2v," +
+                "video/quicktime,qt mov," +
+                "video/mp4,mp4," +
+                "video/x-m4v,m4v," +
+                "video/x-flv,flv," +
+                "video/x-ms-wmv,wmv," +
+                "video/avi,avi," +
+                "video/webm,webm," +
+                "video/3gpp,3gpp 3gp," +
+                "video/3gpp2,3g2," +
+                "video/vnd.rn-realvideo,rv," +
+                "video/ogg,ogv," +
+                "video/x-matroska,mkv," +
+                "application/vnd.oasis.opendocument.formula-template,otf," +
+                "application/octet-stream,exe";
+
+
+        /**
+         * Map of mimes to extensions
+         *
+         * @property mimes
+         * @type {Object}
+         */
+        var mimes = {};
+
+        /**
+         * Map of extensions to mimes
+         *
+         * @property extensions
+         * @type {Object}
+         */
+        var extensions = {};
+
+
+        /**
+        * Parses mimeData string into a mimes and extensions lookup maps. String should have the
+        * following format:
+        *
+        * application/msword,doc dot,application/pdf,pdf, ...
+        *
+        * so mime-type followed by comma and followed by space-separated list of associated extensions,
+        * then comma again and then another mime-type, etc.
+        *
+        * If invoked externally will replace override internal lookup maps with user-provided data.
+        *
+        * @method addMimeType
+        * @param {String} mimeData
+        */
+        var addMimeType = function (mimeData) {
+                var items = mimeData.split(/,/), i, ii, ext;
+
+                for (i = 0; i < items.length; i += 2) {
+                        ext = items[i + 1].split(/ /);
+
+                        // extension to mime lookup
+                        for (ii = 0; ii < ext.length; ii++) {
+                                mimes[ext[ii]] = items[i];
+                        }
+                        // mime to extension lookup
+                        extensions[items[i]] = ext;
+                }
+        };
+
+
+        var extList2mimes = function (filters, addMissingExtensions) {
+                var ext, i, ii, type, mimes = [];
+
+                // convert extensions to mime types list
+                for (i = 0; i < filters.length; i++) {
+                        ext = filters[i].extensions.toLowerCase().split(/\s*,\s*/);
+
+                        for (ii = 0; ii < ext.length; ii++) {
+
+                                // if there's an asterisk in the list, then accept attribute is not required
+                                if (ext[ii] === '*') {
+                                        return [];
+                                }
+
+                                type = mimes[ext[ii]];
+
+                                // future browsers should filter by extension, finally
+                                if (addMissingExtensions && /^\w+$/.test(ext[ii])) {
+                                        mimes.push('.' + ext[ii]);
+                                } else if (type && Basic.inArray(type, mimes) === -1) {
+                                        mimes.push(type);
+                                } else if (!type) {
+                                        // if we have no type in our map, then accept all
+                                        return [];
+                                }
+                        }
+                }
+                return mimes;
+        };
+
+
+        var mimes2exts = function(mimes) {
+                var exts = [];
+
+                Basic.each(mimes, function(mime) {
+                        mime = mime.toLowerCase();
+
+                        if (mime === '*') {
+                                exts = [];
+                                return false;
+                        }
+
+                        // check if this thing looks like mime type
+                        var m = mime.match(/^(\w+)\/(\*|\w+)$/);
+                        if (m) {
+                                if (m[2] === '*') {
+                                        // wildcard mime type detected
+                                        Basic.each(extensions, function(arr, mime) {
+                                                if ((new RegExp('^' + m[1] + '/')).test(mime)) {
+                                                        [].push.apply(exts, extensions[mime]);
+                                                }
+                                        });
+                                } else if (extensions[mime]) {
+                                        [].push.apply(exts, extensions[mime]);
+                                }
+                        }
                 });
+                return exts;
         };
 
 
+        var mimes2extList = function(mimes) {
+                var accept = [], exts = [];
+
+                if (Basic.typeOf(mimes) === 'string') {
+                        mimes = Basic.trim(mimes).split(/\s*,\s*/);
+                }
+
+                exts = mimes2exts(mimes);
+
+                accept.push({
+                        title: I18n.translate('Files'),
+                        extensions: exts.length ? exts.join(',') : '*'
+                });
+
+                return accept;
+        };
+
+        /**
+         * Extract extension from the given filename
+         *
+         * @method getFileExtension
+         * @param {String} fileName
+         * @return {String} File extension
+         */
+        var getFileExtension = function(fileName) {
+                var matches = fileName && fileName.match(/\.([^.]+)$/);
+                if (matches) {
+                        return matches[1].toLowerCase();
+                }
+                return '';
+        };
+
+
+        /**
+         * Get file mime-type from it's filename - will try to match the extension
+         * against internal mime-type lookup map
+         *
+         * @method getFileMime
+         * @param {String} fileName
+         * @return File mime-type if found or an empty string if not
+         */
+        var getFileMime = function(fileName) {
+                return mimes[getFileExtension(fileName)] || '';
+        };
+
+
+        addMimeType(mimeData);
+
+        return {
+                mimes: mimes,
+                extensions: extensions,
+                addMimeType: addMimeType,
+                extList2mimes: extList2mimes,
+                mimes2exts: mimes2exts,
+                mimes2extList: mimes2extList,
+                getFileExtension: getFileExtension,
+                getFileMime: getFileMime
+        }
 });
 
 // Included from: src/javascript/file/FileInput.js
@@ -2911 +3619 @@
         converts selected files to _File_ objects, to be used in conjunction with _Image_, preloaded in memory
         with _FileReader_ or uploaded to a server through _XMLHttpRequest_.
 
-        @class FileInput
+        @class moxie/file/FileInput
         @constructor
         @extends EventTarget
         @uses RuntimeClient
@@ -2918 +3626 @@
         @param {Object|String|DOMElement} options If options is string or node, argument is considered as _browse\_button_.
                 @param {String|DOMElement} options.browse_button DOM Element to turn into file picker.
                 @param {Array} [options.accept] Array of mime types to accept. By default accepts all.
-                @param {String} [options.file='file'] Name of the file field (not the filename).
                 @param {Boolean} [options.multiple=false] Enable selection of multiple files.
                 @param {Boolean} [options.directory=false] Turn file input into the folder input (cannot be both at the same time).
-                @param {String|DOMElement} [options.container] DOM Element to use as a container for file-picker. Defaults to parentNode 
+                @param {String|DOMElement} [options.container] DOM Element to use as a container for file-picker. Defaults to parentNode
                 for _browse\_button_.
                 @param {Object|String} [options.required_caps] Set of required capabilities, that chosen runtime must support.
 
@@ -2931 +3638 @@
                 </div>
 
                 <script>
-                        var fileInput = new mOxie.FileInput({
+                        var fileInput = new moxie.file.FileInput({
                                 browse_button: 'file-picker', // or document.getElementById('file-picker')
                                 container: 'container',
                                 accept: [
@@ -2958 +3665 @@
                 'ready',
 
                 /**
-                Dispatched right after [ready](#event_ready) event, and whenever [refresh()](#method_refresh) is invoked. 
+                Dispatched right after [ready](#event_ready) event, and whenever [refresh()](#method_refresh) is invoked.
                 Check [corresponding documentation entry](#method_refresh) for more info.
 
                 @event refresh
@@ -3012 +3719 @@
 
         function FileInput(options) {
                 if (MXI_DEBUG) {
-                        Env.log("Instantiating FileInput...");  
+                        Env.log("Instantiating FileInput...");
                 }
 
-                var self = this,
-                        container, browseButton, defaults;
+                var container, browseButton, defaults;
 
                 // if flat argument passed it should be browse_button id
                 if (Basic.inArray(Basic.typeOf(options), ['string', 'node']) !== -1) {
@@ -3036 +3742 @@
                                 title: I18n.translate('All Files'),
                                 extensions: '*'
                         }],
-                        name: 'file',
                         multiple: false,
                         required_caps: false,
                         container: browseButton.parentNode || document.body
                 };
-                
+
                 options = Basic.extend({}, defaults, options);
 
                 // convert to object representation
@@ -3048 +3753 @@
                 if (typeof(options.required_caps) === 'string') {
                         options.required_caps = Runtime.parseCaps(options.required_caps);
                 }
-                                        
+
                 // normalize accept option (could be list of mime types or array of title/extensions pairs)
                 if (typeof(options.accept) === 'string') {
                         options.accept = Mime.mimes2extList(options.accept);
@@ -3066 +3771 @@
                 }
 
                 container = browseButton = null; // IE
-                                                
-                RuntimeClient.call(self);
-                
-                Basic.extend(self, {
+
+                RuntimeClient.call(this);
+
+                Basic.extend(this, {
                         /**
                         Unique id of the component
 
@@ -3080 +3785 @@
                         @default UID
                         */
                         uid: Basic.guid('uid_'),
-                        
+
                         /**
                         Unique id of the connected runtime, if any.
 
@@ -3098 +3803 @@
                         @type {String}
                         */
                         shimid: null,
-                        
+
                         /**
-                        Array of selected mOxie.File objects
+                        Array of selected moxie.file.File objects
 
                         @property files
                         @type {Array}
@@ -3114 +3819 @@
                         @method init
                         */
                         init: function() {
+                                var self = this;
+
                                 self.bind('RuntimeInit', function(e, runtime) {
                                         self.ruid = runtime.uid;
                                         self.shimid = runtime.shimid;
@@ -3124 +3831 @@
 
                                         // re-position and resize shim container
                                         self.bind('Refresh', function() {
-                                                var pos, size, browseButton, shimContainer;
-                                                
+                                                var pos, size, browseButton, shimContainer, zIndex;
+
                                                 browseButton = Dom.get(options.browse_button);
                                                 shimContainer = Dom.get(runtime.shimid); // do not use runtime.getShimContainer(), since it will create container if it doesn't exist
 
@@ -3132 +3839 @@
                                                 if (browseButton) {
                                                         pos = Dom.getPos(browseButton, Dom.get(options.container));
                                                         size = Dom.getSize(browseButton);
+                                                        zIndex = parseInt(Dom.getStyle(browseButton, 'z-index'), 10) || 0;
 
                                                         if (shimContainer) {
                                                                 Basic.extend(shimContainer.style, {
-                                                                        top     : pos.y + 'px',
-                                                                        left    : pos.x + 'px',
-                                                                        width   : size.w + 'px',
-                                                                        height  : size.h + 'px'
+                                                                        top: pos.y + 'px',
+                                                                        left: pos.x + 'px',
+                                                                        width: size.w + 'px',
+                                                                        height: size.h + 'px',
+                                                                        zIndex: zIndex + 1
                                                                 });
                                                         }
                                                 }
                                                 shimContainer = browseButton = null;
                                         });
-                                        
+
                                         runtime.exec.call(self, 'FileInput', 'init', options);
                                 });
 
@@ -3156 +3865 @@
                                 }));
                         },
 
+
                         /**
+                         * Get current option value by its name
+                         *
+                         * @method getOption
+                         * @param name
+                         * @return {Mixed}
+                         */
+                        getOption: function(name) {
+                                return options[name];
+                        },
+
+
+                        /**
+                         * Sets a new value for the option specified by name
+                         *
+                         * @method setOption
+                         * @param name
+                         * @param value
+                         */
+                        setOption: function(name, value) {
+                                if (!options.hasOwnProperty(name)) {
+                                        return;
+                                }
+
+                                var oldValue = options[name];
+
+                                switch (name) {
+                                        case 'accept':
+                                                if (typeof(value) === 'string') {
+                                                        value = Mime.mimes2extList(value);
+                                                }
+                                                break;
+
+                                        case 'container':
+                                        case 'required_caps':
+                                                throw new x.FileException(x.FileException.NO_MODIFICATION_ALLOWED_ERR);
+                                }
+
+                                options[name] = value;
+                                this.exec('FileInput', 'setOption', name, value);
+
+                                this.trigger('OptionChanged', name, value, oldValue);
+                        },
+
+                        /**
                         Disables file-picker element, so that it doesn't react to mouse clicks.
 
                         @method disable
@@ -3165 +3919 @@
                         disable: function(state) {
                                 var runtime = this.getRuntime();
                                 if (runtime) {
-                                        runtime.exec.call(this, 'FileInput', 'disable', Basic.typeOf(state) === 'undefined' ? true : state);
+                                        this.exec('FileInput', 'disable', Basic.typeOf(state) === 'undefined' ? true : state);
                                 }
                         },
 
@@ -3176 +3930 @@
                         @method refresh
                         */
                         refresh: function() {
-                                self.trigger("Refresh");
+                                this.trigger("Refresh");
                         },
 
 
@@ -3197 +3951 @@
                                         Basic.each(this.files, function(file) {
                                                 file.destroy();
                                         });
-                                } 
+                                }
                                 this.files = null;
 
                                 this.unbindAll();
@@ -3212 +3966 @@
         return FileInput;
 });
 
-// Included from: src/javascript/core/utils/Encode.js
-
-/**
- * Encode.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
-
-define('moxie/core/utils/Encode', [], function() {
-
-        /**
-        Encode string with UTF-8
-
-        @method utf8_encode
-        @for Utils
-        @static
-        @param {String} str String to encode
-        @return {String} UTF-8 encoded string
-        */
-        var utf8_encode = function(str) {
-                return unescape(encodeURIComponent(str));
-        };
-        
-        /**
-        Decode UTF-8 encoded string
-
-        @method utf8_decode
-        @static
-        @param {String} str String to decode
-        @return {String} Decoded string
-        */
-        var utf8_decode = function(str_data) {
-                return decodeURIComponent(escape(str_data));
-        };
-        
-        /**
-        Decode Base64 encoded string (uses browser's default method if available),
-        from: https://raw.github.com/kvz/phpjs/master/functions/url/base64_decode.js
-
-        @method atob
-        @static
-        @param {String} data String to decode
-        @return {String} Decoded string
-        */
-        var atob = function(data, utf8) {
-                if (typeof(window.atob) === 'function') {
-                        return utf8 ? utf8_decode(window.atob(data)) : window.atob(data);
-                }
-
-                // http://kevin.vanzonneveld.net
-                // +   original by: Tyler Akins (http://rumkin.com)
-                // +   improved by: Thunder.m
-                // +      input by: Aman Gupta
-                // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
-                // +   bugfixed by: Onno Marsman
-                // +   bugfixed by: Pellentesque Malesuada
-                // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
-                // +      input by: Brett Zamir (http://brett-zamir.me)
-                // +   bugfixed by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
-                // *     example 1: base64_decode('S2V2aW4gdmFuIFpvbm5ldmVsZA==');
-                // *     returns 1: 'Kevin van Zonneveld'
-                // mozilla has this native
-                // - but breaks in 2.0.0.12!
-                //if (typeof this.window.atob == 'function') {
-                //    return atob(data);
-                //}
-                var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-                var o1, o2, o3, h1, h2, h3, h4, bits, i = 0,
-                        ac = 0,
-                        dec = "",
-                        tmp_arr = [];
-
-                if (!data) {
-                        return data;
-                }
-
-                data += '';
-
-                do { // unpack four hexets into three octets using index points in b64
-                        h1 = b64.indexOf(data.charAt(i++));
-                        h2 = b64.indexOf(data.charAt(i++));
-                        h3 = b64.indexOf(data.charAt(i++));
-                        h4 = b64.indexOf(data.charAt(i++));
-
-                        bits = h1 << 18 | h2 << 12 | h3 << 6 | h4;
-
-                        o1 = bits >> 16 & 0xff;
-                        o2 = bits >> 8 & 0xff;
-                        o3 = bits & 0xff;
-
-                        if (h3 == 64) {
-                                tmp_arr[ac++] = String.fromCharCode(o1);
-                        } else if (h4 == 64) {
-                                tmp_arr[ac++] = String.fromCharCode(o1, o2);
-                        } else {
-                                tmp_arr[ac++] = String.fromCharCode(o1, o2, o3);
-                        }
-                } while (i < data.length);
-
-                dec = tmp_arr.join('');
-
-                return utf8 ? utf8_decode(dec) : dec;
-        };
-        
-        /**
-        Base64 encode string (uses browser's default method if available),
-        from: https://raw.github.com/kvz/phpjs/master/functions/url/base64_encode.js
-
-        @method btoa
-        @static
-        @param {String} data String to encode
-        @return {String} Base64 encoded string
-        */
-        var btoa = function(data, utf8) {
-                if (utf8) {
-                        data = utf8_encode(data);
-                }
-
-                if (typeof(window.btoa) === 'function') {
-                        return window.btoa(data);
-                }
-
-                // http://kevin.vanzonneveld.net
-                // +   original by: Tyler Akins (http://rumkin.com)
-                // +   improved by: Bayron Guevara
-                // +   improved by: Thunder.m
-                // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
-                // +   bugfixed by: Pellentesque Malesuada
-                // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
-                // +   improved by: Rafał Kukawski (http://kukawski.pl)
-                // *     example 1: base64_encode('Kevin van Zonneveld');
-                // *     returns 1: 'S2V2aW4gdmFuIFpvbm5ldmVsZA=='
-                // mozilla has this native
-                // - but breaks in 2.0.0.12!
-                var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-                var o1, o2, o3, h1, h2, h3, h4, bits, i = 0,
-                        ac = 0,
-                        enc = "",
-                        tmp_arr = [];
-
-                if (!data) {
-                        return data;
-                }
-
-                do { // pack three octets into four hexets
-                        o1 = data.charCodeAt(i++);
-                        o2 = data.charCodeAt(i++);
-                        o3 = data.charCodeAt(i++);
-
-                        bits = o1 << 16 | o2 << 8 | o3;
-
-                        h1 = bits >> 18 & 0x3f;
-                        h2 = bits >> 12 & 0x3f;
-                        h3 = bits >> 6 & 0x3f;
-                        h4 = bits & 0x3f;
-
-                        // use hexets to index into b64, and append result to encoded string
-                        tmp_arr[ac++] = b64.charAt(h1) + b64.charAt(h2) + b64.charAt(h3) + b64.charAt(h4);
-                } while (i < data.length);
-
-                enc = tmp_arr.join('');
-
-                var r = data.length % 3;
-
-                return (r ? enc.slice(0, r - 3) : enc) + '==='.slice(r || 3);
-        };
-
-
-        return {
-                utf8_encode: utf8_encode,
-                utf8_decode: utf8_decode,
-                atob: atob,
-                btoa: btoa
-        };
-});
-
-// Included from: src/javascript/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
- */
-
-define('moxie/file/Blob', [
-        'moxie/core/utils/Basic',
-        'moxie/core/utils/Encode',
-        'moxie/runtime/RuntimeClient'
-], function(Basic, Encode, RuntimeClient) {
-        
-        var blobpool = {};
-
-        /**
-        @class Blob
-        @constructor
-        @param {String} ruid Unique id of the runtime, to which this blob belongs to
-        @param {Object} blob Object "Native" blob object, as it is represented in the runtime
-        */
-        function Blob(ruid, blob) {
-
-                function _sliceDetached(start, end, type) {
-                        var blob, data = blobpool[this.uid];
-
-                        if (Basic.typeOf(data) !== 'string' || !data.length) {
-                                return null; // or throw exception
-                        }
-
-                        blob = new Blob(null, {
-                                type: type,
-                                size: end - start
-                        });
-                        blob.detach(data.substr(start, blob.size));
-
-                        return blob;
-                }
-
-                RuntimeClient.call(this);
-
-                if (ruid) {     
-                        this.connectRuntime(ruid);
-                }
-
-                if (!blob) {
-                        blob = {};
-                } else if (Basic.typeOf(blob) === 'string') { // dataUrl or binary string
-                        blob = { data: blob };
-                }
-
-                Basic.extend(this, {
-                        
-                        /**
-                        Unique id of the component
-
-                        @property uid
-                        @type {String}
-                        */
-                        uid: blob.uid || Basic.guid('uid_'),
-                        
-                        /**
-                        Unique id of the connected runtime, if falsy, then runtime will have to be initialized 
-                        before this Blob can be used, modified or sent
-
-                        @property ruid
-                        @type {String}
-                        */
-                        ruid: ruid,
-        
-                        /**
-                        Size of blob
-
-                        @property size
-                        @type {Number}
-                        @default 0
-                        */
-                        size: blob.size || 0,
-                        
-                        /**
-                        Mime type of blob
-
-                        @property type
-                        @type {String}
-                        @default ''
-                        */
-                        type: blob.type || '',
-                        
-                        /**
-                        @method slice
-                        @param {Number} [start=0]
-                        */
-                        slice: function(start, end, type) {             
-                                if (this.isDetached()) {
-                                        return _sliceDetached.apply(this, arguments);
-                                }
-                                return this.getRuntime().exec.call(this, 'Blob', 'slice', this.getSource(), start, end, type);
-                        },
-
-                        /**
-                        Returns "native" blob object (as it is represented in connected runtime) or null if not found
-
-                        @method getSource
-                        @return {Blob} Returns "native" blob object or null if not found
-                        */
-                        getSource: function() {
-                                if (!blobpool[this.uid]) {
-                                        return null;    
-                                }
-                                return blobpool[this.uid];
-                        },
-
-                        /** 
-                        Detaches blob from any runtime that it depends on and initialize with standalone value
-
-                        @method detach
-                        @protected
-                        @param {DOMString} [data=''] Standalone value
-                        */
-                        detach: function(data) {
-                                if (this.ruid) {
-                                        this.getRuntime().exec.call(this, 'Blob', 'destroy');
-                                        this.disconnectRuntime();
-                                        this.ruid = null;
-                                }
-
-                                data = data || '';
-
-                                // if dataUrl, convert to binary string
-                                if (data.substr(0, 5) == 'data:') {
-                                        var base64Offset = data.indexOf(';base64,');
-                                        this.type = data.substring(5, base64Offset);
-                                        data = Encode.atob(data.substring(base64Offset + 8));
-                                }
-
-                                this.size = data.length;
-
-                                blobpool[this.uid] = data;
-                        },
-
-                        /**
-                        Checks if blob is standalone (detached of any runtime)
-                        
-                        @method isDetached
-                        @protected
-                        @return {Boolean}
-                        */
-                        isDetached: function() {
-                                return !this.ruid && Basic.typeOf(blobpool[this.uid]) === 'string';
-                        },
-                        
-                        /** 
-                        Destroy Blob and free any resources it was using
-
-                        @method destroy
-                        */
-                        destroy: function() {
-                                this.detach();
-                                delete blobpool[this.uid];
-                        }
-                });
-
-                
-                if (blob.data) {
-                        this.detach(blob.data); // auto-detach if payload has been passed
-                } else {
-                        blobpool[this.uid] = blob;      
-                }
-        }
-        
-        return Blob;
-});
-
 // Included from: src/javascript/file/File.js
 
 /**
@@ -3588 +3984 @@
         'moxie/file/Blob'
 ], function(Basic, Mime, Blob) {
         /**
-        @class File
+        @class moxie/file/File
         @extends Blob
         @constructor
         @param {String} ruid Unique id of the runtime, to which this blob belongs to
@@ -3691 +4087 @@
                 <div id="filelist"></div>
 
                 <script type="text/javascript">
-                        var fileDrop = new mOxie.FileDrop('drop_zone'), fileList = mOxie.get('filelist');
+                        var fileDrop = new moxie.file.FileDrop('drop_zone'), fileList = moxie.utils.Dom.get('filelist');
 
                         fileDrop.ondrop = function() {
-                                mOxie.each(this.files, function(file) {
+                                moxie.utils.Basic.each(this.files, function(file) {
                                         fileList.innerHTML += '<div>' + file.name + '</div>';
                                 });
                         };
@@ -3702 +4098 @@
                         fileDrop.init();
                 </script>
 
-        @class FileDrop
+        @class moxie/file/FileDrop
         @constructor
         @extends EventTarget
         @uses RuntimeClient
@@ -3855 +4251 @@
         Utility for preloading o.Blob/o.File objects in memory. By design closely follows [W3C FileReader](http://www.w3.org/TR/FileAPI/#dfn-filereader)
         interface. Where possible uses native FileReader, where - not falls back to shims.
 
-        @class FileReader
+        @class moxie/file/FileReader
         @constructor FileReader
         @extends EventTarget
         @uses RuntimeClient
@@ -4118 +4514 @@
  * Contributing: http://www.plupload.com/contributing
  */
 
-define('moxie/core/utils/Url', [], function() {
+/**
+@class moxie/core/utils/Url
+@public
+@static
+*/
+
+define('moxie/core/utils/Url', [
+        'moxie/core/utils/Basic'
+], function(Basic) {
         /**
         Parse url into separate components and fill in absent parts with parts from current url,
         based on https://raw.github.com/kvz/phpjs/master/functions/url/parse_url.js
 
         @method parseUrl
-        @for Utils
         @static
         @param {String} url Url to parse (defaults to empty string if undefined)
         @return {Object} Hash containing extracted uri components
@@ -4137 +4540 @@
                         https: 443
                 }
                 , uri = {}
-                , regex = /^(?:([^:\/?#]+):)?(?:\/\/()(?:(?:()(?:([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?))?()(?:(()(?:(?:[^?#\/]*\/)*)()(?:[^?#]*))(?:\\?([^#]*))?(?:#(.*))?)/
+                , regex = /^(?:([^:\/?#]+):)?(?:\/\/()(?:(?:()(?:([^:@\/]*):?([^:@\/]*))?@)?(\[[\da-fA-F:]+\]|[^:\/?#]*)(?::(\d*))?))?()(?:(()(?:(?:[^?#\/]*\/)*)()(?:[^?#]*))(?:\\?([^#]*))?(?:#(.*))?)/
                 , m = regex.exec(url || '')
+                , isRelative
+                , isSchemeLess = /^\/\/\w/.test(url)
                 ;
-                                        
+
+                switch (Basic.typeOf(currentUrl)) {
+                        case 'undefined':
+                                currentUrl = parseUrl(document.location.href, false);
+                                break;
+
+                        case 'string':
+                                currentUrl = parseUrl(currentUrl, false);
+                                break;
+                }
+
                 while (i--) {
                         if (m[i]) {
                                 uri[key[i]] = m[i];
@@ -4147 +4562 @@
                         }
                 }
 
-                // when url is relative, we set the origin and the path ourselves
-                if (!uri.scheme) {
-                        // come up with defaults
-                        if (!currentUrl || typeof(currentUrl) === 'string') {
-                                currentUrl = parseUrl(currentUrl || document.location.href);
-                        }
+                isRelative = !isSchemeLess && !uri.scheme;
 
+                if (isSchemeLess || isRelative) {
                         uri.scheme = currentUrl.scheme;
+                }
+
+                // when url is relative, we set the origin and the path ourselves
+                if (isRelative) {
                         uri.host = currentUrl.host;
                         uri.port = currentUrl.port;
 
@@ -4175 +4590 @@
 
                 if (!uri.port) {
                         uri.port = ports[uri.scheme] || 80;
-                } 
-                
+                }
+
                 uri.port = parseInt(uri.port, 10);
 
                 if (!uri.path) {
@@ -4211 +4626 @@
         Check if specified url has the same origin as the current document
 
         @method hasSameOrigin
+        @static
         @param {String|Object} url
         @return {Boolean}
         */
@@ -4218 +4634 @@
                 function origin(url) {
                         return [url.scheme, url.host, url.port].join('/');
                 }
-                        
+
                 if (typeof url === 'string') {
                         url = parseUrl(url);
-                }       
-                
+                }
+
                 return origin(parseUrl()) === origin(url);
         };
 
@@ -4254 +4670 @@
         Instance of this class can be used as a target for the events dispatched by shims,
         when allowing them onto components is for either reason inappropriate
 
-        @class RuntimeTarget
+        @class moxie/runtime/RuntimeTarget
         @constructor
         @protected
         @extends EventTarget
@@ -4297 +4713 @@
         it can be used to read only preloaded blobs/files and only below certain size (not yet sure what that'd be,
         but probably < 1mb). Not meant to be used directly by user.
 
-        @class FileReaderSync
+        @class moxie/file/FileReaderSync
         @private
         @constructor
         */
@@ -4368 +4784 @@
         /**
         FormData
 
-        @class FormData
+        @class moxie/xhr/FormData
         @constructor
         */
         function FormData() {
@@ -4555 +4971 @@
         function XMLHttpRequestUpload() {
                 this.uid = Basic.guid('uid_');
         }
-        
+
         XMLHttpRequestUpload.prototype = EventTarget.instance;
 
         /**
         Implementation of XMLHttpRequest
 
-        @class XMLHttpRequest
+        @class moxie/xhr/XMLHttpRequest
         @constructor
         @uses RuntimeClient
         @extends EventTarget
@@ -4582 +4998 @@
                 'loadend'
 
                 // readystatechange (for historical reasons)
-        ]; 
-        
+        ];
+
         var NATIVE = 1, RUNTIME = 2;
-                                        
+
         function XMLHttpRequest() {
                 var self = this,
                         // this (together with _p() @see below) is here to gracefully upgrade to setter/getter syntax where possible
@@ -4651 +5067 @@
                                 /**
                                 Returns the response type. Can be set to change the response type. Values are:
                                 the empty string (default), "arraybuffer", "blob", "document", "json", and "text".
-                                
+
                                 @property responseType
                                 @type String
                                 */
@@ -4659 +5075 @@
 
                                 /**
                                 Returns the document response entity body.
-                                
+
                                 Throws an "InvalidStateError" exception if responseType is not the empty string or "document".
 
                                 @property responseXML
@@ -4669 +5085 @@
 
                                 /**
                                 Returns the text response entity body.
-                                
+
                                 Throws an "InvalidStateError" exception if responseType is not the empty string or "text".
 
                                 @property responseText
@@ -4680 +5096 @@
                                 /**
                                 Returns the response entity body (http://www.w3.org/TR/XMLHttpRequest/#response-entity-body).
                                 Can become: ArrayBuffer, Blob, Document, JSON, Text
-                                
+
                                 @property response
                                 @type Mixed
                                 */
@@ -4717 +5133 @@
                         _responseHeadersBag
                         ;
 
-                
+
                 Basic.extend(this, props, {
                         /**
                         Unique id of the component
@@ -4726 +5142 @@
                         @type String
                         */
                         uid: Basic.guid('uid_'),
-                        
+
                         /**
                         Target for Upload events
 
@@ -4734 +5150 @@
                         @type XMLHttpRequestUpload
                         */
                         upload: new XMLHttpRequestUpload(),
-                        
 
+
                         /**
                         Sets the request method, request URL, synchronous flag, request username, and request password.
 
@@ -4762 +5178 @@
                         */
                         open: function(method, url, async, user, password) {
                                 var urlp;
-                                
+
                                 // first two arguments are required
                                 if (!method || !url) {
                                         throw new x.DOMException(x.DOMException.SYNTAX_ERR);
                                 }
-                                
+
                                 // 2 - check if any code point in method is higher than U+00FF or after deflating method it does not match the method
                                 if (/[\u0100-\uffff]/.test(method) || Encode.utf8_encode(method) !== method) {
                                         throw new x.DOMException(x.DOMException.SYNTAX_ERR);
@@ -4777 +5193 @@
                                 if (!!~Basic.inArray(method.toUpperCase(), ['CONNECT', 'DELETE', 'GET', 'HEAD', 'OPTIONS', 'POST', 'PUT', 'TRACE', 'TRACK'])) {
                                         _method = method.toUpperCase();
                                 }
-                                
-                                
+
+
                                 // 4 - allowing these methods poses a security risk
                                 if (!!~Basic.inArray(_method, ['CONNECT', 'TRACE', 'TRACK'])) {
                                         throw new x.DOMException(x.DOMException.SECURITY_ERR);
@@ -4786 +5202 @@
 
                                 // 5
                                 url = Encode.utf8_encode(url);
-                                
+
                                 // 6 - Resolve url relative to the XMLHttpRequest base URL. If the algorithm returns an error, throw a "SyntaxError".
                                 urlp = Url.parseUrl(url);
 
                                 _same_origin_flag = Url.hasSameOrigin(urlp);
-                                                                                                                                
+
                                 // 7 - manually build up absolute url
                                 _url = Url.resolveUrl(url);
-                
+
                                 // 9-10, 12-13
                                 if ((user || password) && !_same_origin_flag) {
                                         throw new x.DOMException(x.DOMException.INVALID_ACCESS_ERR);
@@ -4802 +5218 @@
 
                                 _user = user || urlp.user;
                                 _password = password || urlp.pass;
-                                
+
                                 // 11
                                 _async = async || true;
-                                
+
                                 if (_async === false && (_p('timeout') || _p('withCredentials') || _p('responseType') !== "")) {
                                         throw new x.DOMException(x.DOMException.INVALID_ACCESS_ERR);
                                 }
-                                
+
                                 // 14 - terminate abort()
-                                
+
                                 // 15 - terminate send()
 
                                 // 18
@@ -4822 +5238 @@
 
                                 // 19
                                 _p('readyState', XMLHttpRequest.OPENED);
-                                
+
                                 // 20
                                 this.dispatchEvent('readystatechange');
                         },
-                        
+
                         /**
                         Appends an header to the list of author request headers, or if header is already
                         in the list of author request headers, combines its value with value.
@@ -4834 +5250 @@
                         Throws an "InvalidStateError" exception if the state is not OPENED or if the send() flag is set.
                         Throws a "SyntaxError" exception if header is not a valid HTTP header field name or if value
                         is not a valid HTTP header field value.
-                        
+
                         @method setRequestHeader
                         @param {String} header
                         @param {String|Number} value
@@ -4863 +5279 @@
                                                 "user-agent",
                                                 "via"
                                         ];
-                                
+
                                 // 1-2
                                 if (_p('readyState') !== XMLHttpRequest.OPENED || _send_flag) {
                                         throw new x.DOMException(x.DOMException.INVALID_STATE_ERR);
@@ -4881 +5297 @@
                                 }*/
 
                                 header = Basic.trim(header).toLowerCase();
-                                
+
                                 // setting of proxy-* and sec-* headers is prohibited by spec
                                 if (!!~Basic.inArray(header, uaHeaders) || /^(proxy\-|sec\-)/.test(header)) {
                                         return false;
@@ -4890 +5306 @@
                                 // camelize
                                 // browsers lowercase header names (at least for custom ones)
                                 // header = header.replace(/\b\w/g, function($1) { return $1.toUpperCase(); });
-                                
+
                                 if (!_headers[header]) {
                                         _headers[header] = value;
                                 } else {
@@ -4901 +5317 @@
                         },
 
                         /**
+                         * Test if the specified header is already set on this request.
+                         * Returns a header value or boolean false if it's not yet set.
+                         *
+                         * @method hasRequestHeader
+                         * @param {String} header Name of the header to test
+                         * @return {Boolean|String}
+                         */
+                        hasRequestHeader: function(header) {
+                                return header && _headers[header.toLowerCase()] || false;
+                        },
+
+                        /**
                         Returns all headers from the response, with the exception of those whose field name is Set-Cookie or Set-Cookie2.
 
                         @method getAllResponseHeaders
@@ -4911 +5339 @@
                         },
 
                         /**
-                        Returns the header field value from the response of which the field name matches header, 
+                        Returns the header field value from the response of which the field name matches header,
                         unless the field name is Set-Cookie or Set-Cookie2.
 
                         @method getResponseHeader
@@ -4946 +5374 @@
                                 }
                                 return null;
                         },
-                        
+
                         /**
                         Sets the Content-Type header for the response to mime.
                         Throws an "InvalidStateError" exception if the state is LOADING or DONE.
@@ -4957 +5385 @@
                         */
                         overrideMimeType: function(mime) {
                                 var matches, charset;
-                        
+
                                 // 1
                                 if (!!~Basic.inArray(_p('readyState'), [XMLHttpRequest.LOADING, XMLHttpRequest.DONE])) {
                                         throw new x.DOMException(x.DOMException.INVALID_STATE_ERR);
@@ -4981 +5409 @@
                                 _finalMime = mime;
                                 _finalCharset = charset;
                         },
-                        
+
                         /**
                         Initiates the request. The optional argument provides the request entity body.
                         The argument is ignored if request method is GET or HEAD.
@@ -4992 +5420 @@
                         @param {Blob|Document|String|FormData} [data] Request entity body
                         @param {Object} [options] Set of requirements and pre-requisities for runtime initialization
                         */
-                        send: function(data, options) {                                 
+                        send: function(data, options) {
                                 if (Basic.typeOf(options) === 'string') {
                                         _options = { ruid: options };
                                 } else if (!options) {
@@ -5000 +5428 @@
                                 } else {
                                         _options = options;
                                 }
-                                                                                                                        
+
                                 // 1-2
                                 if (this.readyState !== XMLHttpRequest.OPENED || _send_flag) {
                                         throw new x.DOMException(x.DOMException.INVALID_STATE_ERR);
                                 }
-                                
-                                // 3                                    
+
+                                // 3
                                 // sending Blob
                                 if (data instanceof Blob) {
                                         _options.ruid = data.ruid;
                                         _mimeType = data.type || 'application/octet-stream';
                                 }
-                                
+
                                 // FormData
                                 else if (data instanceof FormData) {
                                         if (data.hasBlob()) {
@@ -5021 +5449 @@
                                                 _mimeType = blob.type || 'application/octet-stream';
                                         }
                                 }
-                                
+
                                 // DOMString
                                 else if (typeof data === 'string') {
                                         _encoding = 'UTF-8';
                                         _mimeType = 'text/plain;charset=UTF-8';
-                                        
+
                                         // data should be converted to Unicode and encoded as UTF-8
                                         data = Encode.utf8_encode(data);
                                 }
@@ -5057 +5485 @@
                                 // 8.5 - Return the send() method call, but continue running the steps in this algorithm.
                                 _doXHR.call(this, data);
                         },
-                        
+
                         /**
                         Cancels any network activity.
-                        
+
                         @method abort
                         */
                         abort: function() {
@@ -5267 +5695 @@
                                 }
                         }
                 }
-                
+
                 /*
                 function _toASCII(str, AllowUnassigned, UseSTD3ASCIIRules) {
                         // TODO: http://tools.ietf.org/html/rfc3490#section-4.1
@@ -5274 +5702 @@
                         return str.toLowerCase();
                 }
                 */
-                
-                
+
+
                 function _doXHR(data) {
                         var self = this;
-                        
+
                         _start_time = new Date().getTime();
 
                         _xhr = new RuntimeTarget();
@@ -5298 +5726 @@
                                         self.dispatchEvent('readystatechange');
 
                                         self.dispatchEvent(e);
-                                        
+
                                         if (_upload_events_flag) {
                                                 self.upload.dispatchEvent(e);
                                         }
                                 });
-                                
+
                                 _xhr.bind('Progress', function(e) {
                                         if (_p('readyState') !== XMLHttpRequest.LOADING) {
                                                 _p('readyState', XMLHttpRequest.LOADING); // LoadStart unreliable (in Flash for example)
@@ -5311 +5739 @@
                                         }
                                         self.dispatchEvent(e);
                                 });
-                                
+
                                 _xhr.bind('UploadProgress', function(e) {
                                         if (_upload_events_flag) {
                                                 self.upload.dispatchEvent({
@@ -5322 +5750 @@
                                                 });
                                         }
                                 });
-                                
+
                                 _xhr.bind('Load', function(e) {
                                         _p('readyState', XMLHttpRequest.DONE);
                                         _p('status', Number(runtime.exec.call(_xhr, 'XMLHttpRequest', 'getStatus') || 0));
                                         _p('statusText', httpCode[_p('status')] || "");
-                                        
+
                                         _p('response', runtime.exec.call(_xhr, 'XMLHttpRequest', 'getResponse', _p('responseType')));
 
                                         if (!!~Basic.inArray(_p('responseType'), ['text', ''])) {
@@ -5339 +5767 @@
                                         _responseHeaders = runtime.exec.call(_xhr, 'XMLHttpRequest', 'getAllResponseHeaders');
 
                                         self.dispatchEvent('readystatechange');
-                                        
+
                                         if (_p('status') > 0) { // status 0 usually means that server is unreachable
                                                 if (_upload_events_flag) {
                                                         self.upload.dispatchEvent(e);
@@ -5356 +5784 @@
                                         self.dispatchEvent(e);
                                         loadEnd();
                                 });
-                                
+
                                 _xhr.bind('Error', function(e) {
                                         _error_flag = true;
                                         _p('readyState', XMLHttpRequest.DONE);
@@ -5401 +5829 @@
                         if (!_same_origin_flag) {
                                 _options.required_caps.do_cors = true;
                         }
-                        
 
+
                         if (_options.ruid) { // we do not need to wait if we can connect directly
                                 exec(_xhr.connectRuntime(_options));
                         } else {
@@ -5415 +5843 @@
                                 _xhr.connectRuntime(_options);
                         }
                 }
-        
-                
+
+
                 function _reset() {
                         _p('responseText', "");
                         _p('responseXML', null);
@@ -5432 +5860 @@
         XMLHttpRequest.HEADERS_RECEIVED = 2;
         XMLHttpRequest.LOADING = 3;
         XMLHttpRequest.DONE = 4;
-        
+
         XMLHttpRequest.prototype = EventTarget.instance;
 
         return XMLHttpRequest;
@@ -5456 +5884 @@
         "moxie/runtime/RuntimeClient",
         "moxie/core/EventTarget"
 ], function(Basic, Encode, RuntimeClient, EventTarget) {
+
+        /**
+        @class moxie/runtime/Transporter
+        @private
+        @constructor
+        */
         function Transporter() {
                 var mod, _runtime, _data, _size, _pos, _chunk_size;
 
@@ -5605 +6039 @@
         /**
         Image preloading and manipulation utility. Additionally it provides access to image meta info (Exif, GPS) and raw binary data.
 
-        @class Image
+        @class moxie/image/Image
         @constructor
         @extends EventTarget
         */
@@ -5624 +6058 @@
 
                 /**
                 Dispatched when resize operation is complete.
-                
+
                 @event resize
                 @param {Object} event
                 */
@@ -5716 +6150 @@
                         meta: {},
 
                         /**
-                        Alias for load method, that takes another mOxie.Image object as a source (see load).
+                        Alias for load method, that takes another moxie.image.Image object as a source (see load).
 
                         @method clone
                         @param {Image} src Source for the image
@@ -5727 +6161 @@
                         },
 
                         /**
-                        Loads image from various sources. Currently the source for new image can be: mOxie.Image, mOxie.Blob/mOxie.File, 
-                        native Blob/File, dataUrl or URL. Depending on the type of the source, arguments - differ. When source is URL, 
-                        Image will be downloaded from remote destination and loaded in memory.
+                        Loads image from various sources. Currently the source for new image can be: moxie.image.Image,
+                        moxie.file.Blob/moxie.file.File, native Blob/File, dataUrl or URL. Depending on the type of the
+                        source, arguments - differ. When source is URL, Image will be downloaded from remote destination
+                        and loaded in memory.
 
                         @example
-                                var img = new mOxie.Image();
+                                var img = new moxie.image.Image();
                                 img.onload = function() {
                                         var blob = img.getAsBlob();
-                                        
-                                        var formData = new mOxie.FormData();
+
+                                        var formData = new moxie.xhr.FormData();
                                         formData.append('file', blob);
 
-                                        var xhr = new mOxie.XMLHttpRequest();
+                                        var xhr = new moxie.xhr.XMLHttpRequest();
                                         xhr.onload = function() {
                                                 // upload complete
                                         };
@@ -5747 +6182 @@
                                         xhr.send(formData);
                                 };
                                 img.load("http://www.moxiecode.com/images/mox-logo.jpg"); // notice file extension (.jpg)
-                        
 
+
                         @method load
                         @param {Image|Blob|File|String} src Source for the image
                         @param {Boolean|Object} [mixed]
@@ -5757 +6192 @@
                                 _load.apply(this, arguments);
                         },
 
+
                         /**
+                        Resizes the image to fit the specified width/height. If crop is specified, image will also be
+                        cropped to the exact dimensions.
+
+                        @method resize
+                        @since 3.0
+                        @param {Object} options
+                                @param {Number} options.width Resulting width
+                                @param {Number} [options.height=width] Resulting height (optional, if not supplied will default to width)
+                                @param {String} [options.type='image/jpeg'] MIME type of the resulting image
+                                @param {Number} [options.quality=90] In the case of JPEG, controls the quality of resulting image
+                                @param {Boolean} [options.crop='cc'] If not falsy, image will be cropped, by default from center
+                                @param {Boolean} [options.fit=true] Whether to upscale the image to fit the exact dimensions
+                                @param {Boolean} [options.preserveHeaders=true] Whether to preserve meta headers (on JPEGs after resize)
+                                @param {String} [options.resample='default'] Resampling algorithm to use during resize
+                                @param {Boolean} [options.multipass=true] Whether to scale the image in steps (results in better quality)
+                        */
+                        resize: function(options) {
+                                var self = this;
+                                var orientation;
+                                var scale;
+
+                                var srcRect = {
+                                        x: 0,
+                                        y: 0,
+                                        width: self.width,
+                                        height: self.height
+                                };
+
+                                var opts = Basic.extendIf({
+                                        width: self.width,
+                                        height: self.height,
+                                        type: self.type || 'image/jpeg',
+                                        quality: 90,
+                                        crop: false,
+                                        fit: true,
+                                        preserveHeaders: true,
+                                        resample: 'default',
+                                        multipass: true
+                                }, options);
+
+                                try {
+                                        if (!self.size) { // only preloaded image objects can be used as source
+                                                throw new x.DOMException(x.DOMException.INVALID_STATE_ERR);
+                                        }
+
+                                        // no way to reliably intercept the crash due to high resolution, so we simply avoid it
+                                        if (self.width > Image.MAX_RESIZE_WIDTH || self.height > Image.MAX_RESIZE_HEIGHT) {
+                                                throw new x.ImageError(x.ImageError.MAX_RESOLUTION_ERR);
+                                        }
+
+                                        // take into account orientation tag
+                                        orientation = (self.meta && self.meta.tiff && self.meta.tiff.Orientation) || 1;
+
+                                        if (Basic.inArray(orientation, [5,6,7,8]) !== -1) { // values that require 90 degree rotation
+                                                var tmp = opts.width;
+                                                opts.width = opts.height;
+                                                opts.height = tmp;
+                                        }
+
+                                        if (opts.crop) {
+                                                scale = Math.max(opts.width/self.width, opts.height/self.height);
+
+                                                if (options.fit) {
+                                                        // first scale it up or down to fit the original image
+                                                        srcRect.width = Math.min(Math.ceil(opts.width/scale), self.width);
+                                                        srcRect.height = Math.min(Math.ceil(opts.height/scale), self.height);
+
+                                                        // recalculate the scale for adapted dimensions
+                                                        scale = opts.width/srcRect.width;
+                                                } else {
+                                                        srcRect.width = Math.min(opts.width, self.width);
+                                                        srcRect.height = Math.min(opts.height, self.height);
+
+                                                        // now we do not need to scale it any further
+                                                        scale = 1;
+                                                }
+
+                                                if (typeof(opts.crop) === 'boolean') {
+                                                        opts.crop = 'cc';
+                                                }
+
+                                                switch (opts.crop.toLowerCase().replace(/_/, '-')) {
+                                                        case 'rb':
+                                                        case 'right-bottom':
+                                                                srcRect.x = self.width - srcRect.width;
+                                                                srcRect.y = self.height - srcRect.height;
+                                                                break;
+
+                                                        case 'cb':
+                                                        case 'center-bottom':
+                                                                srcRect.x = Math.floor((self.width - srcRect.width) / 2);
+                                                                srcRect.y = self.height - srcRect.height;
+                                                                break;
+
+                                                        case 'lb':
+                                                        case 'left-bottom':
+                                                                srcRect.x = 0;
+                                                                srcRect.y = self.height - srcRect.height;
+                                                                break;
+
+                                                        case 'lt':
+                                                        case 'left-top':
+                                                                srcRect.x = 0;
+                                                                srcRect.y = 0;
+                                                                break;
+
+                                                        case 'ct':
+                                                        case 'center-top':
+                                                                srcRect.x = Math.floor((self.width - srcRect.width) / 2);
+                                                                srcRect.y = 0;
+                                                                break;
+
+                                                        case 'rt':
+                                                        case 'right-top':
+                                                                srcRect.x = self.width - srcRect.width;
+                                                                srcRect.y = 0;
+                                                                break;
+
+                                                        case 'rc':
+                                                        case 'right-center':
+                                                        case 'right-middle':
+                                                                srcRect.x = self.width - srcRect.width;
+                                                                srcRect.y = Math.floor((self.height - srcRect.height) / 2);
+                                                                break;
+
+
+                                                        case 'lc':
+                                                        case 'left-center':
+                                                        case 'left-middle':
+                                                                srcRect.x = 0;
+                                                                srcRect.y = Math.floor((self.height - srcRect.height) / 2);
+                                                                break;
+
+                                                        case 'cc':
+                                                        case 'center-center':
+                                                        case 'center-middle':
+                                                        default:
+                                                                srcRect.x = Math.floor((self.width - srcRect.width) / 2);
+                                                                srcRect.y = Math.floor((self.height - srcRect.height) / 2);
+                                                }
+
+                                                // original image might be smaller than requested crop, so - avoid negative values
+                                                srcRect.x = Math.max(srcRect.x, 0);
+                                                srcRect.y = Math.max(srcRect.y, 0);
+                                        } else {
+                                                scale = Math.min(opts.width/self.width, opts.height/self.height);
+
+                                                // do not upscale if we were asked to not fit it
+                                                if (scale > 1 && !opts.fit) {
+                                                        scale = 1;
+                                                }
+                                        }
+
+                                        this.exec('Image', 'resize', srcRect, scale, opts);
+                                } catch(ex) {
+                                        // for now simply trigger error event
+                                        self.trigger('error', ex.code);
+                                }
+                        },
+
+                        /**
                         Downsizes the image to fit the specified width/height. If crop is supplied, image will be cropped to exact dimensions.
 
                         @method downsize
-                        @param {Object} opts
-                                @param {Number} opts.width Resulting width
-                                @param {Number} [opts.height=width] Resulting height (optional, if not supplied will default to width)
-                                @param {Boolean} [opts.crop=false] Whether to crop the image to exact dimensions
-                                @param {Boolean} [opts.preserveHeaders=true] Whether to preserve meta headers (on JPEGs after resize)
-                                @param {String} [opts.resample=false] Resampling algorithm to use for resizing
+                        @deprecated use resize()
                         */
-                        downsize: function(opts) {
+                        downsize: function(options) {
                                 var defaults = {
                                         width: this.width,
                                         height: this.height,
@@ -5775 +6367 @@
                                         type: this.type || 'image/jpeg',
                                         quality: 90,
                                         crop: false,
+                                        fit: false,
                                         preserveHeaders: true,
-                                        resample: false
-                                };
+                                        resample: 'default'
+                                }, opts;
 
-                                if (typeof(opts) === 'object') {
-                                        opts = Basic.extend(defaults, opts);
+                                if (typeof(options) === 'object') {
+                                        opts = Basic.extend(defaults, options);
                                 } else {
                                         // for backward compatibility
                                         opts = Basic.extend(defaults, {
@@ -5791 +6384 @@
                                         });
                                 }
 
-                                try {
-                                        if (!this.size) { // only preloaded image objects can be used as source
-                                                throw new x.DOMException(x.DOMException.INVALID_STATE_ERR);
-                                        }
-
-                                        // no way to reliably intercept the crash due to high resolution, so we simply avoid it
-                                        if (this.width > Image.MAX_RESIZE_WIDTH || this.height > Image.MAX_RESIZE_HEIGHT) {
-                                                throw new x.ImageError(x.ImageError.MAX_RESOLUTION_ERR);
-                                        }
-
-                                        this.exec('Image', 'downsize', opts.width, opts.height, opts.crop, opts.preserveHeaders);
-                                } catch(ex) {
-                                        // for now simply trigger error event
-                                        this.trigger('error', ex.code);
-                                }
+                                this.resize(opts);
                         },
 
                         /**
                         Alias for downsize(width, height, true). (see downsize)
-                        
+
                         @method crop
                         @param {Number} width Resulting width
                         @param {Number} [height=width] Resulting height (optional, if not supplied will default to width)
@@ -5824 +6403 @@
                                 if (!Env.can('create_canvas')) {
                                         throw new x.RuntimeError(x.RuntimeError.NOT_SUPPORTED_ERR);
                                 }
-
-                                var runtime = this.connectRuntime(this.ruid);
-                                return runtime.exec.call(this, 'Image', 'getAsCanvas');
+                                return this.exec('Image', 'getAsCanvas');
                         },
 
                         /**
-                        Retrieves image in it's current state as mOxie.Blob object. Cannot be run on empty or image in progress (throws
+                        Retrieves image in it's current state as moxie.file.Blob object. Cannot be run on empty or image in progress (throws
                         DOMException.INVALID_STATE_ERR).
 
                         @method getAsBlob
@@ -5876 +6453 @@
                         },
 
                         /**
-                        Embeds a visual representation of the image into the specified node. Depending on the runtime, 
-                        it might be a canvas, an img node or a thrid party shim object (Flash or SilverLight - very rare, 
+                        Embeds a visual representation of the image into the specified node. Depending on the runtime,
+                        it might be a canvas, an img node or a thrid party shim object (Flash or SilverLight - very rare,
                         can be used in legacy browsers that do not have canvas or proper dataURI support).
 
                         @method embed
                         @param {DOMElement} el DOM element to insert the image object into
-                        @param {Object} [opts]
-                                @param {Number} [opts.width] The width of an embed (defaults to the image width)
-                                @param {Number} [opts.height] The height of an embed (defaults to the image height)
-                                @param {String} [type="image/jpeg"] Mime type
-                                @param {Number} [quality=90] Quality of an embed, if mime type is image/jpeg
-                                @param {Boolean} [crop=false] Whether to crop an embed to the specified dimensions
+                        @param {Object} [options]
+                                @param {Number} [options.width] The width of an embed (defaults to the image width)
+                                @param {Number} [options.height] The height of an embed (defaults to the image height)
+                                @param {String} [options.type="image/jpeg"] Mime type
+                                @param {Number} [options.quality=90] Quality of an embed, if mime type is image/jpeg
+                                @param {Boolean} [options.crop=false] Whether to crop an embed to the specified dimensions
+                                @param {Boolean} [options.fit=true] By default thumbs will be up- or downscaled as necessary to fit the dimensions
                         */
-                        embed: function(el, opts) {
+                        embed: function(el, options) {
                                 var self = this
                                 , runtime // this has to be outside of all the closures to contain proper runtime
                                 ;
 
-                                opts = Basic.extend({
+                                var opts = Basic.extend({
                                         width: this.width,
                                         height: this.height,
                                         type: this.type || 'image/jpeg',
-                                        quality: 90
-                                }, opts || {});
-                                
+                                        quality: 90,
+                                        fit: true,
+                                        resample: 'nearest'
+                                }, options);
 
+
                                 function render(type, quality) {
                                         var img = this;
 
@@ -5923 +6503 @@
                                         }
 
                                         if (Env.can('use_data_uri_of', dataUrl.length)) {
-                                                el.innerHTML = '<img src="' + dataUrl + '" width="' + img.width + '" height="' + img.height + '" />';
+                                                el.innerHTML = '<img src="' + dataUrl + '" width="' + img.width + '" height="' + img.height + '" alt="" />';
                                                 img.destroy();
                                                 self.trigger('embedded');
                                         } else {
@@ -5976 +6556 @@
                                         if (!this.size) { // only preloaded image objects can be used as source
                                                 throw new x.DOMException(x.DOMException.INVALID_STATE_ERR);
                                         }
-                                        
+
                                         // high-resolution images cannot be consistently handled across the runtimes
                                         if (this.width > Image.MAX_RESIZE_WIDTH || this.height > Image.MAX_RESIZE_HEIGHT) {
                                                 //throw new x.ImageError(x.ImageError.MAX_RESOLUTION_ERR);
@@ -5989 +6569 @@
                                         });
 
                                         imgCopy.bind("Load", function() {
-                                                imgCopy.downsize(opts);
+                                                this.downsize(opts);
                                         });
 
                                         // if embedded thumb data is available and dimensions are big enough, use it
@@ -6007 +6587 @@
                         },
 
                         /**
-                        Properly destroys the image and frees resources in use. If any. Recommended way to dispose mOxie.Image object.
+                        Properly destroys the image and frees resources in use. If any. Recommended way to dispose
+                        moxie.image.Image object.
 
                         @method destroy
                         */
@@ -6016 +6597 @@
                                         this.getRuntime().exec.call(this, 'Image', 'destroy');
                                         this.disconnectRuntime();
                                 }
+                                if (this.meta && this.meta.thumb) {
+                                        // thumb is blob, make sure we destroy it first
+                                        this.meta.thumb.data.destroy();
+                                }
                                 this.unbindAll();
                         }
                 });
@@ -6025 +6610 @@
                 this.handleEventProps(dispatches);
 
                 this.bind('Load Resize', function() {
-                        _updateInfo.call(this);
+                        return _updateInfo.call(this); // if operation fails (e.g. image is neither PNG nor JPEG) cancel all pending events
                 }, 999);
 
 
                 function _updateInfo(info) {
-                        if (!info) {
-                                info = this.exec('Image', 'getInfo');
-                        }
+                        try {
+                                if (!info) {
+                                        info = this.exec('Image', 'getInfo');
+                                }
 
-                        this.size = info.size;
-                        this.width = info.width;
-                        this.height = info.height;
-                        this.type = info.type;
-                        this.meta = info.meta;
+                                this.size = info.size;
+                                this.width = info.width;
+                                this.height = info.height;
+                                this.type = info.type;
+                                this.meta = info.meta;
 
-                        // update file name, only if empty
-                        if (this.name === '') {
-                                this.name = info.name;
+                                // update file name, only if empty
+                                if (this.name === '') {
+                                        this.name = info.name;
+                                }
+
+                                return true;
+                        } catch(ex) {
+                                this.trigger('error', ex.code);
+                                return false;
                         }
                 }
-                
 
+
                 function _load(src) {
                         var srcType = Basic.typeOf(src);
 
@@ -6167 +6759 @@
 
         // virtual world will crash on you if image has a resolution higher than this:
         Image.MAX_RESIZE_WIDTH = 8192;
-        Image.MAX_RESIZE_HEIGHT = 8192; 
+        Image.MAX_RESIZE_HEIGHT = 8192;
 
         Image.prototype = EventTarget.instance;
 
@@ -6214 +6806 @@
                                 access_image_binary: function() {
                                         return I.can('access_binary') && !!extensions.Image;
                                 },
-                                display_media: Test(Env.can('create_canvas') || Env.can('use_data_uri_over32kb')),
+                                display_media: Test(
+                                        (Env.can('create_canvas') || Env.can('use_data_uri_over32kb')) && 
+                                        defined('moxie/image/Image')
+                                ),
                                 do_cors: Test(window.XMLHttpRequest && 'withCredentials' in new XMLHttpRequest()),
                                 drag_and_drop: Test(function() {
                                         // this comes directly from Modernizr: http://www.modernizr.com/
@@ -6224 +6819 @@
                                                 (Env.browser !== 'IE' || Env.verComp(Env.version, 9, '>'));
                                 }()),
                                 filter_by_extension: Test(function() { // if you know how to feature-detect this, please suggest
-                                        return (Env.browser === 'Chrome' && Env.verComp(Env.version, 28, '>=')) || 
-                                                (Env.browser === 'IE' && Env.verComp(Env.version, 10, '>=')) || 
-                                                (Env.browser === 'Safari' && Env.verComp(Env.version, 7, '>='));
+                                        return !(
+                                                (Env.browser === 'Chrome' && Env.verComp(Env.version, 28, '<')) || 
+                                                (Env.browser === 'IE' && Env.verComp(Env.version, 10, '<')) || 
+                                                (Env.browser === 'Safari' && Env.verComp(Env.version, 7, '<')) ||
+                                                (Env.browser === 'Firefox' && Env.verComp(Env.version, 37, '<'))
+                                        );
                                 }()),
                                 return_response_headers: True,
                                 return_response_type: function(responseType) {
@@ -6244 +6842 @@
                                         return Env.can('use_fileinput') && window.File;
                                 },
                                 select_folder: function() {
-                                        return I.can('select_file') && Env.browser === 'Chrome' && Env.verComp(Env.version, 21, '>=');
+                                        return I.can('select_file') && (
+                                                Env.browser === 'Chrome' && Env.verComp(Env.version, 21, '>=') ||
+                                                Env.browser === 'Firefox' && Env.verComp(Env.version, 42, '>=') // https://developer.mozilla.org/en-US/Firefox/Releases/42
+                                        );
                                 },
                                 select_multiple: function() {
                                         // it is buggy on Safari Windows and iOS
@@ -6262 +6863 @@
                                         return I.can('slice_blob') && I.can('send_multipart');
                                 },
                                 summon_file_dialog: function() { // yeah... some dirty sniffing here...
-                                        return I.can('select_file') && (
-                                                (Env.browser === 'Firefox' && Env.verComp(Env.version, 4, '>=')) ||
-                                                (Env.browser === 'Opera' && Env.verComp(Env.version, 12, '>=')) ||
-                                                (Env.browser === 'IE' && Env.verComp(Env.version, 10, '>=')) ||
-                                                !!~Basic.inArray(Env.browser, ['Chrome', 'Safari'])
+                                        return I.can('select_file') && !(
+                                                (Env.browser === 'Firefox' && Env.verComp(Env.version, 4, '<')) ||
+                                                (Env.browser === 'Opera' && Env.verComp(Env.version, 12, '<')) ||
+                                                (Env.browser === 'IE' && Env.verComp(Env.version, 10, '<'))
                                         );
                                 },
-                                upload_filesize: True
+                                upload_filesize: True,
+                                use_http_method: True
                         }, 
                         arguments[2]
                 );
@@ -6299 +6900 @@
         return extensions;
 });
 
+// Included from: src/javascript/runtime/html5/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/html5/file/Blob
+@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
+                        }
+                }
+
+                this.slice = function() {
+                        return new Blob(this.getRuntime().uid, w3cBlobSlice.apply(this, arguments));
+                };
+
+                this.destroy = function() {
+                        this.getRuntime().getShim().removeInstance(this.uid);
+                };
+        }
+
+        return (extensions.Blob = HTML5Blob);
+});
+
 // Included from: src/javascript/core/utils/Events.js
 
 /**
@@ -6311 +6965 @@
  * Contributing: http://www.plupload.com/contributing
  */
 
+/**
+@class moxie/core/utils/Events
+@public
+@static
+*/
+
 define('moxie/core/utils/Events', [
         'moxie/core/utils/Basic'
 ], function(Basic) {
@@ -6330 +6990 @@
         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.
@@ -6499 +7158 @@
 ], function(extensions, File, Basic, Dom, Events, Mime, Env) {
         
         function FileInput() {
-                var _options;
+                var _options, _browseBtnZIndex; // save original z-index
 
                 Basic.extend(this, {
                         init: function(options) {
@@ -6508 +7167 @@
                                 _options = options;
 
                                 // figure out accept string
-                                mimes = _options.accept.mimes || Mime.extList2mimes(_options.accept, I.can('filter_by_extension'));
+                                mimes = Mime.extList2mimes(_options.accept, I.can('filter_by_extension'));
 
                                 shimContainer = I.getShimContainer();
 
@@ -6530 +7189 @@
 
 
                                 browseButton = Dom.get(_options.browse_button);
+                                _browseBtnZIndex = Dom.getStyle(browseButton, 'z-index') || 'auto';
 
                                 // Route click event to the input[type=file] element for browsers that support such behavior
                                 if (I.can('summon_file_dialog')) {
@@ -6537 +7197 @@
                                                 browseButton.style.position = 'relative';
                                         }
 
-                                        zIndex = parseInt(Dom.getStyle(browseButton, 'z-index'), 10) || 1;
-
-                                        browseButton.style.zIndex = zIndex;
-                                        shimContainer.style.zIndex = zIndex - 1;
-
                                         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]
@@ -6549 +7204 @@
                                                 }
                                                 e.preventDefault();
                                         }, comp.uid);
+
+                                        comp.bind('Refresh', function() {
+                                                zIndex = parseInt(_browseBtnZIndex, 10) || 1;
+
+                                                Dom.get(_options.browse_button).style.zIndex = zIndex;
+                                                this.getRuntime().getShimContainer().style.zIndex = zIndex - 1;
+                                        });
                                 }
 
                                 /* Since we have to place input[type=file] on top of the browse_button for some browsers,
@@ -6571 +7233 @@
                                         comp.trigger('mouseup');
                                 }, comp.uid);
 
+                                // it shouldn't be possible to tab into the hidden element
+                                (I.can('summon_file_dialog') ? input : browseButton).setAttribute('tabindex', -1);
 
-                                input.onchange = function onChange(e) { // there should be only one handler for this
+                                input.onchange = function onChange() { // there should be only one handler for this
                                         comp.files = [];
 
                                         Basic.each(this.files, function(file) {
@@ -6621 +7285 @@
                         },
 
 
+                        setOption: function(name, value) {
+                                var I = this.getRuntime();
+                                var input = Dom.get(I.uid);
+
+                                switch (name) {
+                                        case 'accept':
+                                                if (value) {
+                                                        var mimes = value.mimes || Mime.extList2mimes(value, I.can('filter_by_extension'));
+                                                        input.setAttribute('accept', mimes.join(','));
+                                                } else {
+                                                        input.removeAttribute('accept');
+                                                }
+                                                break;
+
+                                        case 'directory':
+                                                if (value && I.can('select_folder')) {
+                                                        input.setAttribute('directory', '');
+                                                        input.setAttribute('webkitdirectory', '');
+                                                } else {
+                                                        input.removeAttribute('directory');
+                                                        input.removeAttribute('webkitdirectory');
+                                                }
+                                                break;
+
+                                        case 'multiple':
+                                                if (value && I.can('select_multiple')) {
+                                                        input.setAttribute('multiple', '');
+                                                } else {
+                                                        input.removeAttribute('multiple');
+                                                }
+
+                                }
+                        },
+
+
                         disable: function(state) {
                                 var I = this.getRuntime(), input;
 
@@ -6633 +7332 @@
                                 var I = this.getRuntime()
                                 , shim = I.getShim()
                                 , shimContainer = I.getShimContainer()
+                                , container = _options && Dom.get(_options.container)
+                                , browseButton = _options && Dom.get(_options.browse_button)
                                 ;
                                 
-                                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 (container) {
+                                        Events.removeAllEvents(container, this.uid);
+                                }
                                 
+                                if (browseButton) {
+                                        Events.removeAllEvents(browseButton, this.uid);
+                                        browseButton.style.zIndex = _browseBtnZIndex; // reset to original value
+                                }
+                                
                                 if (shimContainer) {
+                                        Events.removeAllEvents(shimContainer, this.uid);
                                         shimContainer.innerHTML = '';
                                 }
 
                                 shim.removeInstance(this.uid);
 
-                                _options = shimContainer = shim = null;
+                                _options = shimContainer = container = browseButton = shim = null;
                         }
                 });
         }
@@ -6653 +7360 @@
         return (extensions.FileInput = FileInput);
 });
 
-// Included from: src/javascript/runtime/html5/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/html5/file/Blob
-@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
-                        }
-                }
-
-                this.slice = function() {
-                        return new Blob(this.getRuntime().uid, w3cBlobSlice.apply(this, arguments));
-                };
-        }
-
-        return (extensions.Blob = HTML5Blob);
-});
-
 // Included from: src/javascript/runtime/html5/file/FileDrop.js
 
 /**
@@ -6782 +7440 @@
                         destroy: function() {
                                 Events.removeAllEvents(_options && Dom.get(_options.container), this.uid);
                                 _ruid = _files = _allowedExts = _options = null;
+                                this.getRuntime().getShim().removeInstance(this.uid);
                         }
                 });
 
@@ -6974 +7633 @@
 
                         destroy: function() {
                                 _fr = null;
+                                this.getRuntime().getShim().removeInstance(this.uid);
                         }
                 });
 
@@ -7141 +7801 @@
                                                                 _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');
-                                                                }                                                       
+                                                                try {
+                                                                        if (_xhr.status >= 200 && _xhr.status < 400) {
+                                                                                target.trigger('load');
+                                                                                break;
+                                                                        }
+                                                                } catch(ex) {}
+
+                                                                target.trigger('error');
                                                                 break;
                                                 }
                                         };
@@ -7256 +7919 @@
 
                         destroy: function() {
                                 self = _filename = null;
+                                this.getRuntime().getShim().removeInstance(this.uid);
                         }
                 });
 
@@ -7388 +8052 @@
                         UTF16StringReader.apply(this, arguments);
                 }
         }
-         
 
         Basic.extend(BinaryReader.prototype, {
                 
@@ -8488 +9151 @@
  */
 
 /**
+Optional image investigation tool for HTML5 runtime. Provides the following features:
+- ability to distinguish image type (JPEG or PNG) by signature
+- ability to extract image width/height directly from it's internals, without preloading in memory (fast)
+- ability to extract APP headers from JPEGs (Exif, GPS, etc)
+- ability to replace width/height tags in extracted JPEG headers
+- ability to restore APP headers, that were for example stripped during image manipulation
+
 @class moxie/runtime/html5/image/ImageInfo
 @private
+@param {String} data Image source as binary string
 */
 define("moxie/runtime/html5/image/ImageInfo", [
         "moxie/core/utils/Basic",
@@ -8497 +9168 @@
         "moxie/runtime/html5/image/JPEG",
         "moxie/runtime/html5/image/PNG"
 ], function(Basic, x, JPEG, PNG) {
-        /**
-        Optional image investigation tool for HTML5 runtime. Provides the following features:
-        - ability to distinguish image type (JPEG or PNG) by signature
-        - ability to extract image width/height directly from it's internals, without preloading in memory (fast)
-        - ability to extract APP headers from JPEGs (Exif, GPS, etc)
-        - ability to replace width/height tags in extracted JPEG headers
-        - ability to restore APP headers, that were for example stripped during image manipulation
 
-        @class ImageInfo
-        @constructor
-        @param {String} data Image source as binary string
-        */
         return function(data) {
                 var _cs = [JPEG, PNG], _img;
 
@@ -8611 +9271 @@
         };
 });
 
-// Included from: src/javascript/runtime/html5/image/MegaPixel.js
+// Included from: src/javascript/runtime/html5/image/ResizerCanvas.js
 
 /**
-(The MIT License)
+ * ResizerCanvas.js
+ *
+ * Copyright 2013, Moxiecode Systems AB
+ * Released under GPL License.
+ *
+ * License: http://www.plupload.com/license
+ * Contributing: http://www.plupload.com/contributing
+ */
 
-Copyright (c) 2012 Shinichi Tomita <shinichi.tomita@gmail.com>;
+/**
+ * Resizes image/canvas using canvas
+ */
+define("moxie/runtime/html5/image/ResizerCanvas", [], function() {
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+    function scale(image, ratio, resample) {
+        var sD = image.width > image.height ? 'width' : 'height'; // take the largest side
+        var dD = Math.round(image[sD] * ratio);
+        var scaleCapped = false;
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+        if (resample !== 'nearest' && (ratio < 0.5 || ratio > 2)) {
+            ratio = ratio < 0.5 ? 0.5 : 2;
+            scaleCapped = true;
+        }
 
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+        var tCanvas = _scale(image, ratio);
 
-/**
- * Mega pixel image rendering library for iOS6 Safari
- *
- * Fixes iOS6 Safari's image file rendering issue for large size image (over mega-pixel),
- * which causes unexpected subsampling when drawing it in canvas.
- * By using this library, you can safely render the image with proper stretching.
- *
- * Copyright (c) 2012 Shinichi Tomita <shinichi.tomita@gmail.com>
- * Released under the MIT license
- */
+        if (scaleCapped) {
+            return scale(tCanvas, dD / tCanvas[sD], resample);
+        } else {
+            return tCanvas;
+        }
+    }
 
-/**
-@class moxie/runtime/html5/image/MegaPixel
-@private
-*/
-define("moxie/runtime/html5/image/MegaPixel", [], function() {
 
-        /**
-         * Rendering image element (with resizing) into the canvas element
-         */
-        function renderImageToCanvas(img, canvas, options) {
-                var iw = img.naturalWidth, ih = img.naturalHeight;
-                var width = options.width, height = options.height;
-                var x = options.x || 0, y = options.y || 0;
-                var ctx = canvas.getContext('2d');
-                if (detectSubsampling(img)) {
-                        iw /= 2;
-                        ih /= 2;
-                }
-                var d = 1024; // size of tiling canvas
-                var tmpCanvas = document.createElement('canvas');
-                tmpCanvas.width = tmpCanvas.height = d;
-                var tmpCtx = tmpCanvas.getContext('2d');
-                var vertSquashRatio = detectVerticalSquash(img, iw, ih);
-                var sy = 0;
-                while (sy < ih) {
-                        var sh = sy + d > ih ? ih - sy : d;
-                        var sx = 0;
-                        while (sx < iw) {
-                                var sw = sx + d > iw ? iw - sx : d;
-                                tmpCtx.clearRect(0, 0, d, d);
-                                tmpCtx.drawImage(img, -sx, -sy);
-                                var dx = (sx * width / iw + x) << 0;
-                                var dw = Math.ceil(sw * width / iw);
-                                var dy = (sy * height / ih / vertSquashRatio + y) << 0;
-                                var dh = Math.ceil(sh * height / ih / vertSquashRatio);
-                                ctx.drawImage(tmpCanvas, 0, 0, sw, sh, dx, dy, dw, dh);
-                                sx += d;
-                        }
-                        sy += d;
-                }
-                tmpCanvas = tmpCtx = null;
-        }
+    function _scale(image, ratio) {
+        var sW = image.width;
+        var sH = image.height;
+        var dW = Math.round(sW * ratio);
+        var dH = Math.round(sH * ratio);
 
-        /**
-         * Detect subsampling in loaded image.
-         * In iOS, larger images than 2M pixels may be subsampled in rendering.
-         */
-        function detectSubsampling(img) {
-                var iw = img.naturalWidth, ih = img.naturalHeight;
-                if (iw * ih > 1024 * 1024) { // subsampling may happen over megapixel image
-                        var canvas = document.createElement('canvas');
-                        canvas.width = canvas.height = 1;
-                        var ctx = canvas.getContext('2d');
-                        ctx.drawImage(img, -iw + 1, 0);
-                        // subsampled image becomes half smaller in rendering size.
-                        // check alpha channel value to confirm image is covering edge pixel or not.
-                        // if alpha value is 0 image is not covering, hence subsampled.
-                        return ctx.getImageData(0, 0, 1, 1).data[3] === 0;
-                } else {
-                        return false;
-                }
-        }
+        var canvas = document.createElement('canvas');
+        canvas.width = dW;
+        canvas.height = dH;
+        canvas.getContext("2d").drawImage(image, 0, 0, sW, sH, 0, 0, dW, dH);
 
+        image = null; // just in case
+        return canvas;
+    }
 
-        /**
-         * Detecting vertical squash in loaded image.
-         * Fixes a bug which squash image vertically while drawing into canvas for some images.
-         */
-        function detectVerticalSquash(img, iw, ih) {
-                var canvas = document.createElement('canvas');
-                canvas.width = 1;
-                canvas.height = ih;
-                var ctx = canvas.getContext('2d');
-                ctx.drawImage(img, 0, 0);
-                var data = ctx.getImageData(0, 0, 1, ih).data;
-                // search image edge pixel position in case it is squashed vertically.
-                var sy = 0;
-                var ey = ih;
-                var py = ih;
-                while (py > sy) {
-                        var alpha = data[(py - 1) * 4 + 3];
-                        if (alpha === 0) {
-                                ey = py;
-                        } else {
-                        sy = py;
-                        }
-                        py = (ey + sy) >> 1;
-                }
-                canvas = null;
-                var ratio = (py / ih);
-                return (ratio === 0) ? 1 : ratio;
-        }
+    return {
+        scale: scale
+    };
 
-        return {
-                isSubsampled: detectSubsampling,
-                renderTo: renderImageToCanvas
-        };
 });
 
 // Included from: src/javascript/runtime/html5/image/Image.js
@@ -8772 +9353 @@
         "moxie/file/Blob",
         "moxie/file/File",
         "moxie/runtime/html5/image/ImageInfo",
-        "moxie/runtime/html5/image/MegaPixel",
+        "moxie/runtime/html5/image/ResizerCanvas",
         "moxie/core/utils/Mime",
         "moxie/core/utils/Env"
-], function(extensions, Basic, x, Encode, Blob, File, ImageInfo, MegaPixel, Mime, Env) {
-        
+], function(extensions, Basic, x, Encode, Blob, File, ImageInfo, ResizerCanvas, Mime, Env) {
+
         function HTML5Image() {
                 var me = this
                 , _img, _imgInfo, _canvas, _binStr, _blob
@@ -8786 +9367 @@
 
                 Basic.extend(this, {
                         loadFromBlob: function(blob) {
-                                var comp = this, I = comp.getRuntime()
+                                var I = this.getRuntime()
                                 , asBinary = arguments.length > 1 ? arguments[1] : true
                                 ;
 
@@ -8805 +9386 @@
                                                 if (asBinary) {
                                                         _binStr = _toBinary(dataUrl);
                                                 }
-                                                _preload.call(comp, dataUrl);
+                                                _preload.call(this, dataUrl);
                                         });
                                 }
                         },
@@ -8829 +9410 @@
                                         _imgInfo = new ImageInfo(_binStr);
                                 }
 
+                                // this stuff below is definitely having fun with itself
                                 info = {
                                         width: _getImg().width || 0,
                                         height: _getImg().height || 0,
@@ -8835 +9417 @@
                                         type: _blob.type || Mime.getFileMime(_blob.name),
                                         size: _binStr && _binStr.length || _blob.size || 0,
                                         name: _blob.name || '',
-                                        meta: _imgInfo && _imgInfo.meta || this.meta || {}
+                                        meta: null
                                 };
 
-                                // store thumbnail data as blob
-                                if (info.meta && info.meta.thumb && !(info.meta.thumb.data instanceof Blob)) {
-                                        info.meta.thumb.data = new Blob(null, {
-                                                type: 'image/jpeg',
-                                                data: info.meta.thumb.data
-                                        });
+                                if (_preserveHeaders) {
+                                        info.meta = _imgInfo && _imgInfo.meta || this.meta || {};
+
+                                        // if data was taken from ImageInfo it will be a binary string, so we convert it to blob
+                                        if (info.meta && info.meta.thumb && !(info.meta.thumb.data instanceof Blob)) {
+                                                info.meta.thumb.data = new Blob(null, {
+                                                        type: 'image/jpeg',
+                                                        data: info.meta.thumb.data
+                                                });
+                                        }
                                 }
 
                                 return info;
                         },
 
-                        downsize: function() {
-                                _downsize.apply(this, arguments);
+
+                        resize: function(rect, ratio, options) {
+                                var canvas = document.createElement('canvas');
+                                canvas.width = rect.width;
+                                canvas.height = rect.height;
+
+                                canvas.getContext("2d").drawImage(_getImg(), rect.x, rect.y, rect.width, rect.height, 0, 0, canvas.width, canvas.height);
+
+                                _canvas = ResizerCanvas.scale(canvas, ratio);
+
+                                _preserveHeaders = options.preserveHeaders;
+
+                                // rotate if required, according to orientation tag
+                                if (!_preserveHeaders) {
+                                        var orientation = (this.meta && this.meta.tiff && this.meta.tiff.Orientation) || 1;
+                                        _canvas = _rotateToOrientaion(_canvas, orientation);
+                                }
+
+                                this.width = _canvas.width;
+                                this.height = _canvas.height;
+
+                                _modified = true;
+
+                                this.trigger('Resize');
                         },
 
                         getAsCanvas: function() {
-                                if (_canvas) {
-                                        _canvas.id = this.uid + '_canvas';
+                                if (!_canvas) {
+                                        _canvas = _getCanvas();
                                 }
+                                _canvas.id = this.uid + '_canvas';
                                 return _canvas;
                         },
 
                         getAsBlob: function(type, quality) {
                                 if (type !== this.type) {
-                                        // if different mime type requested prepare image for conversion
-                                        _downsize.call(this, this.width, this.height, false);
+                                        _modified = true; // reconsider the state
+                                        return new File(null, {
+                                                name: _blob.name || '',
+                                                type: type,
+                                                data: me.getAsDataURL(type, quality)
+                                        });
                                 }
                                 return new File(null, {
                                         name: _blob.name || '',
                                         type: type,
-                                        data: me.getAsBinaryString.call(this, type, quality)
+                                        data: me.getAsBinaryString(type, quality)
                                 });
                         },
 
@@ -8880 +9493 @@
                                         return _img.src;
                                 }
 
+                                // make sure we have a canvas to work with
+                                _getCanvas();
+
                                 if ('image/jpeg' !== type) {
                                         return _canvas.toDataURL('image/png');
                                 } else {
@@ -8912 +9528 @@
                                                 quality = 90;
                                         }
 
+                                        // make sure we have a canvas to work with
+                                        _getCanvas();
+
                                         try {
                                                 // older Geckos used to result in an exception on quality argument
                                                 dataUrl = _canvas.toDataURL('image/jpeg', quality/100);
@@ -8964 +9583 @@
                 }
 
 
+                function _getCanvas() {
+                        var canvas = _getImg();
+                        if (canvas.nodeName.toLowerCase() == 'canvas') {
+                                return canvas;
+                        }
+                        _canvas = document.createElement('canvas');
+                        _canvas.width = canvas.width;
+                        _canvas.height = canvas.height;
+                        _canvas.getContext("2d").drawImage(canvas, 0, 0);
+                        return _canvas;
+                }
+
+
                 function _toBinary(str) {
                         return Encode.atob(str.substring(str.indexOf('base64,') + 7));
                 }
@@ -8997 +9629 @@
                         if (window.FileReader) {
                                 fr = new FileReader();
                                 fr.onload = function() {
-                                        callback(this.result);
+                                        callback.call(comp, this.result);
                                 };
                                 fr.onerror = function() {
                                         comp.trigger('error', x.ImageError.WRONG_FORMAT);
@@ -9004 +9636 @@
                                 };
                                 fr.readAsDataURL(file);
                         } else {
-                                return callback(file.getAsDataURL());
+                                return callback.call(this, file.getAsDataURL());
                         }
                 }
 
-                function _downsize(width, height, crop, preserveHeaders) {
-                        var self = this
-                        , scale
-                        , mathFn
-                        , x = 0
-                        , y = 0
-                        , img
-                        , destWidth
-                        , destHeight
-                        , orientation
-                        ;
-
-                        _preserveHeaders = preserveHeaders; // we will need to check this on export (see getAsBinaryString())
-
-                        // take into account orientation tag
-                        orientation = (this.meta && this.meta.tiff && this.meta.tiff.Orientation) || 1;
-
-                        if (Basic.inArray(orientation, [5,6,7,8]) !== -1) { // values that require 90 degree rotation
-                                // swap dimensions
-                                var tmp = width;
-                                width = height;
-                                height = tmp;
-                        }
-
-                        img = _getImg();
-
-                        // unify dimensions
-                        if (!crop) {
-                                scale = Math.min(width/img.width, height/img.height);
-                        } else {
-                                // one of the dimensions may exceed the actual image dimensions - we need to take the smallest value
-                                width = Math.min(width, img.width);
-                                height = Math.min(height, img.height);
-
-                                scale = Math.max(width/img.width, height/img.height);
-                        }
-                
-                        // we only downsize here
-                        if (scale > 1 && !crop && preserveHeaders) {
-                                this.trigger('Resize');
-                                return;
-                        }
-
-                        // prepare canvas if necessary
-                        if (!_canvas) {
-                                _canvas = document.createElement("canvas");
-                        }
-
-                        // calculate dimensions of proportionally resized image
-                        destWidth = Math.round(img.width * scale);      
-                        destHeight = Math.round(img.height * scale);
-
-                        // scale image and canvas
-                        if (crop) {
-                                _canvas.width = width;
-                                _canvas.height = height;
-
-                                // if dimensions of the resulting image still larger than canvas, center it
-                                if (destWidth > width) {
-                                        x = Math.round((destWidth - width) / 2);
-                                }
-
-                                if (destHeight > height) {
-                                        y = Math.round((destHeight - height) / 2);
-                                }
-                        } else {
-                                _canvas.width = destWidth;
-                                _canvas.height = destHeight;
-                        }
-
-                        // rotate if required, according to orientation tag
-                        if (!_preserveHeaders) {
-                                _rotateToOrientaion(_canvas.width, _canvas.height, orientation);
-                        }
-
-                        _drawToCanvas.call(this, img, _canvas, -x, -y, destWidth, destHeight);
-
-                        this.width = _canvas.width;
-                        this.height = _canvas.height;
-
-                        _modified = true;
-                        self.trigger('Resize');
-                }
-
-
-                function _drawToCanvas(img, canvas, x, y, w, h) {
-                        if (Env.OS === 'iOS') { 
-                                // avoid squish bug in iOS6
-                                MegaPixel.renderTo(img, canvas, { width: w, height: h, x: x, y: y });
-                        } else {
-                                var ctx = canvas.getContext('2d');
-                                ctx.drawImage(img, x, y, w, h);
-                        }
-                }
-
-
                 /**
                 * Transform canvas coordination according to specified frame size and orientation
                 * Orientation value is from EXIF tag
                 * @author Shinichi Tomita <shinichi.tomita@gmail.com>
                 */
-                function _rotateToOrientaion(width, height, orientation) {
-                        switch (orientation) {
-                                case 5:
-                                case 6:
-                                case 7:
-                                case 8:
-                                        _canvas.width = height;
-                                        _canvas.height = width;
-                                        break;
-                                default:
-                                        _canvas.width = width;
-                                        _canvas.height = height;
+                function _rotateToOrientaion(img, orientation) {
+                        var RADIANS = Math.PI/180;
+                        var canvas = document.createElement('canvas');
+                        var ctx = canvas.getContext('2d');
+                        var width = img.width;
+                        var height = img.height;
+
+                        if (Basic.inArray(orientation, [5,6,7,8]) > -1) {
+                                canvas.width = height;
+                                canvas.height = width;
+                        } else {
+                                canvas.width = width;
+                                canvas.height = height;
                         }
 
                         /**
@@ -9133 +9670 @@
                         7 = The 0th row is the visual right-hand side of the image, and the 0th column is the visual bottom.
                         8 = The 0th row is the visual left-hand side of the image, and the 0th column is the visual bottom.
                         */
-
-                        var ctx = _canvas.getContext('2d');
                         switch (orientation) {
                                 case 2:
                                         // horizontal flip
@@ -9144 +9679 @@
                                 case 3:
                                         // 180 rotate left
                                         ctx.translate(width, height);
-                                        ctx.rotate(Math.PI);
+                                        ctx.rotate(180 * RADIANS);
                                         break;
                                 case 4:
                                         // vertical flip
@@ -9153 +9688 @@
                                         break;
                                 case 5:
                                         // vertical flip + 90 rotate right
-                                        ctx.rotate(0.5 * Math.PI);
+                                        ctx.rotate(90 * RADIANS);
                                         ctx.scale(1, -1);
                                         break;
                                 case 6:
                                         // 90 rotate right
-                                        ctx.rotate(0.5 * Math.PI);
+                                        ctx.rotate(90 * RADIANS);
                                         ctx.translate(0, -height);
                                         break;
                                 case 7:
                                         // horizontal flip + 90 rotate right
-                                        ctx.rotate(0.5 * Math.PI);
+                                        ctx.rotate(90 * RADIANS);
                                         ctx.translate(width, -height);
                                         ctx.scale(-1, 1);
                                         break;
                                 case 8:
                                         // 90 rotate left
-                                        ctx.rotate(-0.5 * Math.PI);
+                                        ctx.rotate(-90 * RADIANS);
                                         ctx.translate(-width, 0);
                                         break;
                         }
+
+                        ctx.drawImage(img, 0, 0, width, height);
+                        return canvas;
                 }
 
 
@@ -9181 +9719 @@
                                 _imgInfo.purge();
                                 _imgInfo = null;
                         }
+
                         _binStr = _img = _canvas = _blob = null;
                         _modified = false;
                 }
@@ -9189 +9728 @@
         return (extensions.Image = HTML5Image);
 });
 
+// Included from: src/javascript/runtime/flash/Runtime.js
+
 /**
- * Stub for moxie/runtime/flash/Runtime
- * @private
+ * 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", [
-], function() {
-        return {};
+        "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]);
+        }
+
+
+        /**
+        Cross-browser SWF removal
+        - Especially needed to safely and completely remove a SWF in Internet Explorer
+
+        Originated from SWFObject v2.2 <http://code.google.com/p/swfobject/> 
+        */
+        function removeSWF(id) {
+        var obj = Dom.get(id);
+        if (obj && obj.nodeName == "OBJECT") {
+            if (Env.browser === 'IE') {
+                obj.style.display = "none";
+                (function onInit(){
+                        // http://msdn.microsoft.com/en-us/library/ie/ms534360(v=vs.85).aspx
+                    if (obj.readyState == 4) {
+                        removeObjectInIE(id);
+                    }
+                    else {
+                        setTimeout(onInit, 10);
+                    }
+                })();
+            }
+            else {
+                obj.parentNode.removeChild(obj);
+            }
+        }
+    }
+
+
+        function removeObjectInIE(id) {
+        var obj = Dom.get(id);
+        if (obj) {
+            for (var i in obj) {
+                if (typeof obj[i] == "function") {
+                    obj[i] = null;
+                }
+            }
+            obj.parentNode.removeChild(obj);
+        }
+    }
+
+        /**
+        Constructor for the Flash 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.capTest(defined('moxie/image/Image')),
+                        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';
+                        },
+                        slice_blob: 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() < 11.3) {
+                        if (MXI_DEBUG && Env.debug.runtime) {
+                                Env.log("\tFlash didn't meet minimal version requirement (11.3).");     
+                        }
+
+                        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=' + Runtime.getGlobalEventTarget() + '" />' +
+                                        '<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));
+
+                                                if (MXI_DEBUG && Env.debug.runtime) {
+                                                        Env.log("\tFlash failed to initialize within a specified period of time (typically 5s).");      
+                                                }
+                                        }
+                                }, 5000);
+                        },
+
+                        destroy: (function(destroy) { // extend default destroy method
+                                return function() {
+                                        removeSWF(I.uid); // SWF removal requires special care in IE
+
+                                        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
+
 /**
- * Stub for moxie/runtime/silverlight/Runtime
- * @private
+ * 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",
+        "moxie/file/File",
+        "moxie/core/utils/Dom",
+        "moxie/core/utils/Basic"
+], function(extensions, File, Dom, Basic) {
+
+        var FileInput = {
+                init: function(options) {
+                        var comp = this, I = this.getRuntime();
+                        var browseButton = Dom.get(options.browse_button);
+
+                        if (browseButton) {
+                                browseButton.setAttribute('tabindex', -1);
+                                browseButton = null;
+                        }
+
+                        this.bind("Change", function() {
+                                var files = I.shimExec.call(comp, 'FileInput', 'getFiles');
+                                comp.files = [];
+                                Basic.each(files, function(file) {
+                                        comp.files.push(new File(I.uid, file));
+                                });
+                        }, 999);
+
+                        this.getRuntime().shimExec.call(this, 'FileInput', 'init', {
+                                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) {
+
+        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 comp = this;
+
+                        comp.result = '';
+
+                        // special prefix for DataURL read mode
+                        if (op === 'readAsDataURL') {
+                                comp.result = 'data:' + (blob.type || '') + ';base64,';
+                        }
+
+                        comp.bind('Progress', function(e, data) {
+                                if (data) {
+                                        comp.result += _formatData(data, op);
+                                }
+                        }, 999);
+
+                        return comp.getRuntime().shimExec.call(this, 'FileReader', 'readAsBase64', blob.uid);
+                }
+        };
+
+        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;
+                }
+                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);
+                }
+        };
+
+        return (extensions.FileReaderSync = FileReaderSync);
+});
+
+// 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;
+                }
+        };
+
+        return (extensions.Transporter = Transporter);
+});
+
+// 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/runtime/flash/file/FileReaderSync",
+        "moxie/xhr/FormData",
+        "moxie/runtime/Transporter",
+        "moxie/runtime/flash/runtime/Transporter"
+], function(extensions, Basic, Blob, File, FileReaderSync, FileReaderSyncFlash, FormData, Transporter, TransporterFlash) {
+        
+        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);
+                                        }
+                                }
+                        } 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();
+                        }
+                },
+
+                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();
+                                }
+                        }
+                        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/image/Image.js
+
+/**
+ * Image.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/image/Image
+@private
+*/
+define("moxie/runtime/flash/image/Image", [
+        "moxie/runtime/flash/Runtime",
+        "moxie/core/utils/Basic",
+        "moxie/runtime/Transporter",
+        "moxie/file/Blob",
+        "moxie/file/FileReaderSync"
+], function(extensions, Basic, Transporter, Blob, FileReaderSync) {
+        
+        var Image = {
+                loadFromBlob: function(blob) {
+                        var comp = this, self = comp.getRuntime();
+
+                        function exec(srcBlob) {
+                                self.shimExec.call(comp, 'Image', 'loadFromBlob', srcBlob.uid);
+                                comp = self = null;
+                        }
+
+                        if (blob.isDetached()) { // binary string
+                                var tr = new Transporter();
+                                tr.bind("TransportingComplete", function() {
+                                        exec(tr.result.getSource());
+                                });
+                                tr.transport(blob.getSource(), blob.type, { ruid: self.uid });
+                        } else {
+                                exec(blob.getSource());
+                        }
+                },
+
+                loadFromImage: function(img) {
+                        var self = this.getRuntime();
+                        return self.shimExec.call(this, 'Image', 'loadFromImage', img.uid);
+                },
+
+                getInfo: function() {
+                        var self = this.getRuntime()
+                        , info = self.shimExec.call(this, 'Image', 'getInfo')
+                        ;
+
+                        if (info.meta && info.meta.thumb && info.meta.thumb.data && !(self.meta.thumb.data instanceof Blob)) {
+                                info.meta.thumb.data = new Blob(self.uid, info.meta.thumb.data);
+                        }
+                        return info;
+                },
+
+                getAsBlob: function(type, quality) {
+                        var self = this.getRuntime()
+                        , blob = self.shimExec.call(this, 'Image', 'getAsBlob', type, quality)
+                        ;
+                        if (blob) {
+                                return new Blob(self.uid, blob);
+                        }
+                        return null;
+                },
+
+                getAsDataURL: function() {
+                        var self = this.getRuntime()
+                        , blob = self.Image.getAsBlob.apply(this, arguments)
+                        , frs
+                        ;
+                        if (!blob) {
+                                return null;
+                        }
+                        frs = new FileReaderSync();
+                        return frs.readAsDataURL(blob);
+                }
+        };
+
+        return (extensions.Image = Image);
+});
+
+// Included from: src/javascript/runtime/silverlight/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 Silverlight runtime.
+
+@class moxie/runtime/silverlight/Runtime
+@private
+*/
 define("moxie/runtime/silverlight/Runtime", [
-], function() {
-        return {};
+        "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 = "silverlight", extensions = {};
+
+        function isInstalled(version) {
+                var isVersionSupported = false, control = null, actualVer,
+                        actualVerArray, reqVerArray, requiredVersionPart, actualVersionPart, index = 0;
+
+                try {
+                        try {
+                                control = new ActiveXObject('AgControl.AgControl');
+
+                                if (control.IsVersionSupported(version)) {
+                                        isVersionSupported = true;
+                                }
+
+                                control = null;
+                        } catch (e) {
+                                var plugin = navigator.plugins["Silverlight Plug-In"];
+
+                                if (plugin) {
+                                        actualVer = plugin.description;
+
+                                        if (actualVer === "1.0.30226.2") {
+                                                actualVer = "2.0.30226.2";
+                                        }
+
+                                        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;
+                                        }
+                                }
+                        }
+                } catch (e2) {
+                        isVersionSupported = false;
+                }
+
+                return isVersionSupported;
+        }
+
+        /**
+        Constructor for the Silverlight 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.capTest(defined('moxie/image/Image')),
+                        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'];
+                        }
+                });
+
+
+                // minimal requirement
+                if (!isInstalled('2.0.31005.0') || Env.browser === 'Opera') {
+                        if (MXI_DEBUG && Env.debug.runtime) {
+                                Env.log("\tSilverlight is not installed or minimal version (2.0.31005.0) requirement not met (not likely).");   
+                        }
+
+                        this.mode = false;
+                }
+
+
+                Basic.extend(this, {
+                        getShim: function() {
+                                return Dom.get(this.uid).content.Moxie;
+                        },
+
+                        shimExec: function(component, action) {
+                                var args = [].slice.call(arguments, 2);
+                                return I.getShim().exec(this.uid, component, action, args);
+                        },
+
+                        init : function() {
+                                var container;
+
+                                container = this.getShimContainer();
+
+                                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=' + Runtime.getGlobalEventTarget() + '"/>' +
+                                '</object>';
+
+                                // 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));
+
+                                                if (MXI_DEBUG && Env.debug.runtime) {
+                                                        Env.log("\Silverlight failed to initialize within a specified period of time (5-10s).");        
+                                                }
+                                        }
+                                }, 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))
+
+                }, extensions);
+        }
+
+        Runtime.addConstructor(type, SilverlightRuntime); 
+
+        return extensions;
 });
 
+// Included from: src/javascript/runtime/silverlight/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/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));
+});
+
+// Included from: src/javascript/runtime/silverlight/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/silverlight/file/FileInput
+@private
+*/
+define("moxie/runtime/silverlight/file/FileInput", [
+        "moxie/runtime/silverlight/Runtime",
+        "moxie/file/File",
+        "moxie/core/utils/Dom",
+        "moxie/core/utils/Basic"
+], function(extensions, File, Dom, Basic) {
+
+        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;
+        }
+
+        
+        var FileInput = {
+                init: function(options) {
+                        var comp = this, I = this.getRuntime();
+                        var browseButton = Dom.get(options.browse_button);
+
+                        if (browseButton) {
+                                browseButton.setAttribute('tabindex', -1);
+                                browseButton = null;
+                        }
+
+                        this.bind("Change", function() {
+                                var files = I.shimExec.call(comp, 'FileInput', 'getFiles');
+                                comp.files = [];
+                                Basic.each(files, function(file) {
+                                        comp.files.push(new File(I.uid, file));
+                                });
+                        }, 999);
+                        
+                        I.shimExec.call(this, 'FileInput', 'init', toFilters(options.accept), options.multiple);
+                        this.trigger('ready');
+                },
+
+                setOption: function(name, value) {
+                        if (name == 'accept') {
+                                value = toFilters(value);
+                        }
+                        this.getRuntime().shimExec.call(this, 'FileInput', 'setOption', name, value);
+                }
+        };
+
+        return (extensions.FileInput = FileInput);
+});
+
+// Included from: src/javascript/runtime/silverlight/file/FileDrop.js
+
+/**
+ * FileDrop.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/file/FileDrop
+@private
+*/
+define("moxie/runtime/silverlight/file/FileDrop", [
+        "moxie/runtime/silverlight/Runtime",
+        "moxie/core/utils/Dom", 
+        "moxie/core/utils/Events"
+], function(extensions, Dom, Events) {
+
+        // not exactly useful, since works only in safari (...crickets...)
+        var FileDrop = {
+                init: function() {
+                        var comp = this, self = comp.getRuntime(), dropZone;
+
+                        dropZone = self.getShimContainer();
+
+                        Events.addEvent(dropZone, 'dragover', function(e) {
+                                e.preventDefault();
+                                e.stopPropagation();
+                                e.dataTransfer.dropEffect = 'copy';
+                        }, comp.uid);
+
+                        Events.addEvent(dropZone, 'dragenter', function(e) {
+                                e.preventDefault();
+                                var flag = Dom.get(self.uid).dragEnter(e);
+                                // If handled, then stop propagation of event in DOM
+                                if (flag) {
+                                        e.stopPropagation();
+                                }
+                        }, comp.uid);
+
+                        Events.addEvent(dropZone, 'drop', function(e) {
+                                e.preventDefault();
+                                var flag = Dom.get(self.uid).dragDrop(e);
+                                // If handled, then stop propagation of event in DOM
+                                if (flag) {
+                                        e.stopPropagation();
+                                }
+                        }, comp.uid);
+
+                        return self.shimExec.call(this, 'FileDrop', 'init');
+                }
+        };
+
+        return (extensions.FileDrop = FileDrop);
+});
+
+// Included from: src/javascript/runtime/silverlight/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/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));
+});
+
+// Included from: src/javascript/runtime/silverlight/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/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));
+});
+
+// Included from: src/javascript/runtime/silverlight/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/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));
+});
+
+// Included from: src/javascript/runtime/silverlight/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/silverlight/xhr/XMLHttpRequest
+@private
+*/
+define("moxie/runtime/silverlight/xhr/XMLHttpRequest", [
+        "moxie/runtime/silverlight/Runtime",
+        "moxie/core/utils/Basic",
+        "moxie/runtime/flash/xhr/XMLHttpRequest",
+        "moxie/runtime/silverlight/file/FileReaderSync",
+        "moxie/runtime/silverlight/runtime/Transporter"
+], function(extensions, Basic, XMLHttpRequest, FileReaderSyncSilverlight, TransporterSilverlight) {
+        return (extensions.XMLHttpRequest = Basic.extend({}, XMLHttpRequest));
+});
+
+// Included from: src/javascript/runtime/silverlight/image/Image.js
+
+/**
+ * Image.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/image/Image
+@private
+*/
+define("moxie/runtime/silverlight/image/Image", [
+        "moxie/runtime/silverlight/Runtime",
+        "moxie/core/utils/Basic",
+        "moxie/file/Blob",
+        "moxie/runtime/flash/image/Image"
+], function(extensions, Basic, Blob, Image) {
+        return (extensions.Image = Basic.extend({}, Image, {
+
+                getInfo: function() {
+                        var self = this.getRuntime()
+                        , grps = ['tiff', 'exif', 'gps', 'thumb']
+                        , info = { meta: {} }
+                        , rawInfo = self.shimExec.call(this, 'Image', 'getInfo')
+                        ;
+
+                        if (rawInfo.meta) {
+                                Basic.each(grps, function(grp) {
+                                        var meta = rawInfo.meta[grp]
+                                        , tag
+                                        , i
+                                        , length
+                                        , value
+                                        ;
+                                        if (meta && meta.keys) {
+                                                info.meta[grp] = {};
+                                                for (i = 0, length = meta.keys.length; i < length; i++) {
+                                                        tag = meta.keys[i];
+                                                        value = meta[tag];
+                                                        if (value) {
+                                                                // convert numbers
+                                                                if (/^(\d|[1-9]\d+)$/.test(value)) { // integer (make sure doesn't start with zero)
+                                                                        value = parseInt(value, 10);
+                                                                } else if (/^\d*\.\d+$/.test(value)) { // double
+                                                                        value = parseFloat(value);
+                                                                }
+                                                                info.meta[grp][tag] = value;
+                                                        }
+                                                }
+                                        }
+                                });
+
+                                // save thumb data as blob
+                                if (info.meta && info.meta.thumb && info.meta.thumb.data && !(self.meta.thumb.data instanceof Blob)) {
+                                        info.meta.thumb.data = new Blob(self.uid, info.meta.thumb.data);
+                                }
+                        }
+
+                        info.width = parseInt(rawInfo.width, 10);
+                        info.height = parseInt(rawInfo.height, 10);
+                        info.size = parseInt(rawInfo.size, 10);
+                        info.type = rawInfo.type;
+                        info.name = rawInfo.name;
+
+                        return info;
+                },
+
+                resize: function(rect, ratio, opts) {
+                        this.getRuntime().shimExec.call(this, 'Image', 'resize', rect.x, rect.y, rect.width, rect.height, ratio, opts.preserveHeaders, opts.resample);
+                }
+        }));
+});
+
 // Included from: src/javascript/runtime/html4/Runtime.js
 
 /**
@@ -9245 +11070 @@
                 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'))),
+                        display_media: Test(
+                                (Env.can('create_canvas') || Env.can('use_data_uri_over32kb')) && 
+                                defined('moxie/image/Image')
+                        ),
                         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.verComp(Env.version, 28, '>=')) || 
-                                        (Env.browser === 'IE' && Env.verComp(Env.version, 10, '>=')) || 
-                                        (Env.browser === 'Safari' && Env.verComp(Env.version, 7, '>='));
+                                return !(
+                                        (Env.browser === 'Chrome' && Env.verComp(Env.version, 28, '<')) || 
+                                        (Env.browser === 'IE' && Env.verComp(Env.version, 10, '<')) || 
+                                        (Env.browser === 'Safari' && Env.verComp(Env.version, 7, '<')) ||
+                                        (Env.browser === 'Firefox' && Env.verComp(Env.version, 37, '<'))
+                                );
                         }()),
                         resize_image: function() {
                                 return extensions.Image && I.can('access_binary') && Env.can('create_canvas');
@@ -9279 +11110 @@
                                 return I.can('select_file');
                         },
                         summon_file_dialog: function() { // yeah... some dirty sniffing here...
-                                return I.can('select_file') && (
-                                        (Env.browser === 'Firefox' && Env.verComp(Env.version, 4, '>=')) ||
-                                        (Env.browser === 'Opera' && Env.verComp(Env.version, 12, '>=')) ||
-                                        (Env.browser === 'IE' && Env.verComp(Env.version, 10, '>=')) ||
-                                        !!~Basic.inArray(Env.browser, ['Chrome', 'Safari'])
+                                return I.can('select_file') && !(
+                                        (Env.browser === 'Firefox' && Env.verComp(Env.version, 4, '<')) ||
+                                        (Env.browser === 'Opera' && Env.verComp(Env.version, 12, '<')) ||
+                                        (Env.browser === 'IE' && Env.verComp(Env.version, 10, '<'))
                                 );
                         },
                         upload_filesize: True,
@@ -9341 +11171 @@
 ], function(extensions, File, Basic, Dom, Events, Mime, Env) {
         
         function FileInput() {
-                var _uid, _mimes = [], _options;
+                var _uid, _mimes = [], _options, _browseBtnZIndex; // save original z-index;
 
                 function addInput() {
                         var comp = this, I = comp.getRuntime(), shimContainer, browseButton, currForm, form, input, uid;
@@ -9348 +11178 @@
 
                         uid = Basic.guid('uid_');
 
-                        shimContainer = I.getShimContainer(); // we get new ref everytime to avoid memory leaks in IE
+                        shimContainer = I.getShimContainer(); // we get new ref every time to avoid memory leaks in IE
 
                         if (_uid) { // move previous form out of the view
                                 currForm = Dom.get(_uid + '_form');
                                 if (currForm) {
                                         Basic.extend(currForm.style, { top: '100%' });
+                                        // it shouldn't be possible to tab into the hidden element
+                                        currForm.firstChild.setAttribute('tabindex', -1);
                                 }
                         }
 
@@ -9376 +11208 @@
                         input = document.createElement('input');
                         input.setAttribute('id', uid);
                         input.setAttribute('type', 'file');
-                        input.setAttribute('name', _options.name || 'Filedata');
                         input.setAttribute('accept', _mimes.join(','));
 
+                        if (I.can('summon_file_dialog')) {
+                                input.setAttribute('tabindex', -1);
+                        }
+
                         Basic.extend(input.style, {
                                 fontSize: '999px',
                                 opacity: 0
@@ -9411 +11246 @@
 
                                 if (this.files) { // check if browser is fresh enough
                                         file = this.files[0];
-
-                                        // ignore empty files (IE10 for example hangs if you try to send them via XHR)
-                                        if (file.size === 0) {
-                                                form.parentNode.removeChild(form);
-                                                return;
-                                        }
                                 } else {
                                         file = {
                                                 name: this.value
@@ -9464 +11293 @@
 
                                 // figure out accept string
                                 _options = options;
-                                _mimes = options.accept.mimes || Mime.extList2mimes(options.accept, I.can('filter_by_extension'));
+                                _mimes = Mime.extList2mimes(options.accept, I.can('filter_by_extension'));
 
                                 shimContainer = I.getShimContainer();
 
@@ -9472 +11301 @@
                                         var browseButton, zIndex, top;
 
                                         browseButton = Dom.get(options.browse_button);
+                                        _browseBtnZIndex = Dom.getStyle(browseButton, 'z-index') || 'auto';
 
                                         // 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';
-                                                }
+                                                }                                               
 
-                                                zIndex = parseInt(Dom.getStyle(browseButton, 'z-index'), 10) || 1;
+                                                comp.bind('Refresh', function() {
+                                                        zIndex = parseInt(_browseBtnZIndex, 10) || 1;
 
-                                                browseButton.style.zIndex = zIndex;
-                                                shimContainer.style.zIndex = zIndex - 1;
+                                                        Dom.get(_options.browse_button).style.zIndex = zIndex;
+                                                        this.getRuntime().getShimContainer().style.zIndex = zIndex - 1;
+                                                });
+                                        } else {
+                                                // it shouldn't be possible to tab into the hidden element
+                                                browseButton.setAttribute('tabindex', -1);
                                         }
 
                                         /* Since we have to place input[type=file] on top of the browse_button for some browsers,
@@ -9519 +11354 @@
                                 });
                         },
 
+                        setOption: function(name, value) {
+                                var I = this.getRuntime();
+                                var input;
 
+                                if (name == 'accept') {
+                                        _mimes = value.mimes || Mime.extList2mimes(value, I.can('filter_by_extension'));
+                                }
+
+                                // update current input
+                                input = Dom.get(_uid)
+                                if (input) {
+                                        input.setAttribute('accept', _mimes.join(','));
+                                }
+                        },
+
+
                         disable: function(state) {
                                 var input;
 
@@ -9532 +11382 @@
                                 var I = this.getRuntime()
                                 , shim = I.getShim()
                                 , shimContainer = I.getShimContainer()
+                                , container = _options && Dom.get(_options.container)
+                                , browseButton = _options && Dom.get(_options.browse_button)
                                 ;
                                 
-                                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 (container) {
+                                        Events.removeAllEvents(container, this.uid);
+                                }
                                 
+                                if (browseButton) {
+                                        Events.removeAllEvents(browseButton, this.uid);
+                                        browseButton.style.zIndex = _browseBtnZIndex; // reset to original value
+                                }
+                                
                                 if (shimContainer) {
+                                        Events.removeAllEvents(shimContainer, this.uid);
                                         shimContainer.innerHTML = '';
                                 }
 
                                 shim.removeInstance(this.uid);
 
-                                _uid = _mimes = _options = shimContainer = shim = null;
+                                _uid = _mimes = _options = shimContainer = container = browseButton = shim = null;
                         }
                 });
         }
@@ -9817 +11675 @@
                                         // target.dispatchEvent('readystatechange');
                                         target.dispatchEvent('abort');
                                 });
+                        },
+
+                        destroy: function() {
+                                this.getRuntime().getShim().removeInstance(this.uid);
                         }
                 });
         }
@@ -9847 +11709 @@
         return (extensions.Image = Image);
 });
 
-expose(["moxie/core/utils/Basic","moxie/core/utils/Env","moxie/core/I18n","moxie/core/utils/Mime","moxie/core/utils/Dom","moxie/core/Exceptions","moxie/core/EventTarget","moxie/runtime/Runtime","moxie/runtime/RuntimeClient","moxie/file/FileInput","moxie/core/utils/Encode","moxie/file/Blob","moxie/file/File","moxie/file/FileDrop","moxie/file/FileReader","moxie/core/utils/Url","moxie/runtime/RuntimeTarget","moxie/file/FileReaderSync","moxie/xhr/FormData","moxie/xhr/XMLHttpRequest","moxie/runtime/Transporter","moxie/image/Image","moxie/core/utils/Events"]);
+expose(["moxie/core/utils/Basic","moxie/core/utils/Encode","moxie/core/utils/Env","moxie/core/Exceptions","moxie/core/utils/Dom","moxie/core/EventTarget","moxie/runtime/Runtime","moxie/runtime/RuntimeClient","moxie/file/Blob","moxie/core/I18n","moxie/core/utils/Mime","moxie/file/FileInput","moxie/file/File","moxie/file/FileDrop","moxie/file/FileReader","moxie/core/utils/Url","moxie/runtime/RuntimeTarget","moxie/xhr/FormData","moxie/xhr/XMLHttpRequest","moxie/image/Image","moxie/core/utils/Events","moxie/runtime/html5/image/ResizerCanvas"]);
 })(this);
-/**
- * o.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
-
-/*global moxie:true */
-
-/**
-Globally exposed namespace with the most frequently used public classes and handy methods.
-
-@class o
-@static
-@private
-*/
-(function(exports) {
-        "use strict";
-
-        var o = {}, inArray = exports.moxie.core.utils.Basic.inArray;
-
-        // directly add some public classes
-        // (we do it dynamically here, since for custom builds we cannot know beforehand what modules were included)
-        (function addAlias(ns) {
-                var name, itemType;
-                for (name in ns) {
-                        itemType = typeof(ns[name]);
-                        if (itemType === 'object' && !~inArray(name, ['Exceptions', 'Env', 'Mime'])) {
-                                addAlias(ns[name]);
-                        } else if (itemType === 'function') {
-                                o[name] = ns[name];
-                        }
-                }
-        })(exports.moxie);
-
-        // add some manually
-        o.Env = exports.moxie.core.utils.Env;
-        o.Mime = exports.moxie.core.utils.Mime;
-        o.Exceptions = exports.moxie.core.Exceptions;
-
-        // expose globally
-        exports.mOxie = o;
-        if (!exports.o) {
-                exports.o = o;
-        }
-        return o;
-})(this);
+}));
+ No newline at end of file

src/js/_enqueues/vendor/plupload/plupload.js

@@ -1 +1 @@
 /**
  * Plupload - multi-runtime File Uploader
- * v2.1.9
+ * v2.3.6
  *
  * Copyright 2013, Moxiecode Systems AB
  * Released under GPL License.
@@ -8 +8 @@
  * License: http://www.plupload.com/license
  * Contributing: http://www.plupload.com/contributing
  *
- * Date: 2016-05-15
+ * Date: 2017-11-03
  */
-/**
- * Plupload.js
- *
- * Copyright 2013, Moxiecode Systems AB
- * Released under GPL License.
- *
- * License: http://www.plupload.com/license
- * Contributing: http://www.plupload.com/contributing
- */
+;
+(function(global, factory) {
+        var extract = function() {
+                var ctx = {};
+                factory.apply(ctx, arguments);
+                return ctx.plupload;
+        };
 
-/**
- * Modified for WordPress, Silverlight and Flash runtimes support was removed.
- * See https://core.trac.wordpress.org/ticket/41755.
- */
+        if (typeof define === "function" && define.amd) {
+                define("plupload", ['./moxie'], extract);
+        } else if (typeof module === "object" && module.exports) {
+                module.exports = extract(require('./moxie'));
+        } else {
+                global.plupload = extract(global.moxie);
+        }
+}(this || window, function(moxie) {
+        /**
+         * Plupload.js
+         *
+         * Copyright 2013, Moxiecode Systems AB
+         * Released under GPL License.
+         *
+         * License: http://www.plupload.com/license
+         * Contributing: http://www.plupload.com/contributing
+         */
 
-/*global mOxie:true */
+        ;
+        (function(exports, o, undef) {
 
-;(function(window, o, undef) {
+                var delay = window.setTimeout;
+                var fileFilters = {};
+                var u = o.core.utils;
+                var Runtime = o.runtime.Runtime;
 
-var delay = window.setTimeout
-, fileFilters = {}
-;
+                // convert plupload features to caps acceptable by mOxie
+                function normalizeCaps(settings) {
+                        var features = settings.required_features,
+                                caps = {};
 
-// convert plupload features to caps acceptable by mOxie
-function normalizeCaps(settings) {              
-        var features = settings.required_features, caps = {};
+                        function resolve(feature, value, strict) {
+                                // Feature notation is deprecated, use caps (this thing here is required for backward compatibility)
+                                var map = {
+                                        chunks: 'slice_blob',
+                                        jpgresize: 'send_binary_string',
+                                        pngresize: 'send_binary_string',
+                                        progress: 'report_upload_progress',
+                                        multi_selection: 'select_multiple',
+                                        dragdrop: 'drag_and_drop',
+                                        drop_element: 'drag_and_drop',
+                                        headers: 'send_custom_headers',
+                                        urlstream_upload: 'send_binary_string',
+                                        canSendBinary: 'send_binary',
+                                        triggerDialog: 'summon_file_dialog'
+                                };
 
-        function resolve(feature, value, strict) {
-                // Feature notation is deprecated, use caps (this thing here is required for backward compatibility)
-                var map = { 
-                        chunks: 'slice_blob',
-                        jpgresize: 'send_binary_string',
-                        pngresize: 'send_binary_string',
-                        progress: 'report_upload_progress',
-                        multi_selection: 'select_multiple',
-                        dragdrop: 'drag_and_drop',
-                        drop_element: 'drag_and_drop',
-                        headers: 'send_custom_headers',
-                        urlstream_upload: 'send_binary_string',
-                        canSendBinary: 'send_binary',
-                        triggerDialog: 'summon_file_dialog'
-                };
+                                if (map[feature]) {
+                                        caps[map[feature]] = value;
+                                } else if (!strict) {
+                                        caps[feature] = value;
+                                }
+                        }
 
-                if (map[feature]) {
-                        caps[map[feature]] = value;
-                } else if (!strict) {
-                        caps[feature] = value;
-                }
-        }
+                        if (typeof(features) === 'string') {
+                                plupload.each(features.split(/\s*,\s*/), function(feature) {
+                                        resolve(feature, true);
+                                });
+                        } else if (typeof(features) === 'object') {
+                                plupload.each(features, function(value, feature) {
+                                        resolve(feature, value);
+                                });
+                        } else if (features === true) {
+                                // check settings for required features
+                                if (settings.chunk_size && settings.chunk_size > 0) {
+                                        caps.slice_blob = true;
+                                }
 
-        if (typeof(features) === 'string') {
-                plupload.each(features.split(/\s*,\s*/), function(feature) {
-                        resolve(feature, true);
-                });
-        } else if (typeof(features) === 'object') {
-                plupload.each(features, function(value, feature) {
-                        resolve(feature, value);
-                });
-        } else if (features === true) {
-                // check settings for required features
-                if (settings.chunk_size > 0) {
-                        caps.slice_blob = true;
-                }
+                                if (!plupload.isEmptyObj(settings.resize) || settings.multipart === false) {
+                                        caps.send_binary_string = true;
+                                }
 
-                if (settings.resize.enabled || !settings.multipart) {
-                        caps.send_binary_string = true;
+                                if (settings.http_method) {
+                                        caps.use_http_method = settings.http_method;
+                                }
+
+                                plupload.each(settings, function(value, feature) {
+                                        resolve(feature, !!value, true); // strict check
+                                });
+                        }
+
+                        return caps;
                 }
-                
-                plupload.each(settings, function(value, feature) {
-                        resolve(feature, !!value, true); // strict check
-                });
-        }
 
-        // WP: only html runtimes.
-        settings.runtimes = 'html5,html4';
+                /**
+                 * @module plupload
+                 * @static
+                 */
+                var plupload = {
+                        /**
+                         * Plupload version will be replaced on build.
+                         *
+                         * @property VERSION
+                         * @for Plupload
+                         * @static
+                         * @final
+                         */
+                        VERSION: '2.3.6',
 
-        return caps;
-}
+                        /**
+                         * The state of the queue before it has started and after it has finished
+                         *
+                         * @property STOPPED
+                         * @static
+                         * @final
+                         */
+                        STOPPED: 1,
 
-/** 
- * @module plupload     
- * @static
- */
-var plupload = {
-        /**
-         * Plupload version will be replaced on build.
-         *
-         * @property VERSION
-         * @for Plupload
-         * @static
-         * @final
-         */
-        VERSION : '2.1.9',
+                        /**
+                         * Upload process is running
+                         *
+                         * @property STARTED
+                         * @static
+                         * @final
+                         */
+                        STARTED: 2,
 
-        /**
-         * The state of the queue before it has started and after it has finished
-         *
-         * @property STOPPED
-         * @static
-         * @final
-         */
-        STOPPED : 1,
+                        /**
+                         * File is queued for upload
+                         *
+                         * @property QUEUED
+                         * @static
+                         * @final
+                         */
+                        QUEUED: 1,
 
-        /**
-         * Upload process is running
-         *
-         * @property STARTED
-         * @static
-         * @final
-         */
-        STARTED : 2,
+                        /**
+                         * File is being uploaded
+                         *
+                         * @property UPLOADING
+                         * @static
+                         * @final
+                         */
+                        UPLOADING: 2,
 
-        /**
-         * File is queued for upload
-         *
-         * @property QUEUED
-         * @static
-         * @final
-         */
-        QUEUED : 1,
+                        /**
+                         * File has failed to be uploaded
+                         *
+                         * @property FAILED
+                         * @static
+                         * @final
+                         */
+                        FAILED: 4,
 
-        /**
-         * File is being uploaded
-         *
-         * @property UPLOADING
-         * @static
-         * @final
-         */
-        UPLOADING : 2,
+                        /**
+                         * File has been uploaded successfully
+                         *
+                         * @property DONE
+                         * @static
+                         * @final
+                         */
+                        DONE: 5,
 
-        /**
-         * File has failed to be uploaded
-         *
-         * @property FAILED
-         * @static
-         * @final
-         */
-        FAILED : 4,
+                        // Error constants used by the Error event
 
-        /**
-         * File has been uploaded successfully
-         *
-         * @property DONE
-         * @static
-         * @final
-         */
-        DONE : 5,
+                        /**
+                         * Generic error for example if an exception is thrown inside Silverlight.
+                         *
+                         * @property GENERIC_ERROR
+                         * @static
+                         * @final
+                         */
+                        GENERIC_ERROR: -100,
 
-        // Error constants used by the Error event
+                        /**
+                         * HTTP transport error. For example if the server produces a HTTP status other than 200.
+                         *
+                         * @property HTTP_ERROR
+                         * @static
+                         * @final
+                         */
+                        HTTP_ERROR: -200,
 
-        /**
-         * Generic error for example if an exception is thrown inside Silverlight.
-         *
-         * @property GENERIC_ERROR
-         * @static
-         * @final
-         */
-        GENERIC_ERROR : -100,
+                        /**
+                         * Generic I/O error. For example if it wasn't possible to open the file stream on local machine.
+                         *
+                         * @property IO_ERROR
+                         * @static
+                         * @final
+                         */
+                        IO_ERROR: -300,
 
-        /**
-         * HTTP transport error. For example if the server produces a HTTP status other than 200.
-         *
-         * @property HTTP_ERROR
-         * @static
-         * @final
-         */
-        HTTP_ERROR : -200,
+                        /**
+                         * @property SECURITY_ERROR
+                         * @static
+                         * @final
+                         */
+                        SECURITY_ERROR: -400,
 
-        /**
-         * Generic I/O error. For example if it wasn't possible to open the file stream on local machine.
-         *
-         * @property IO_ERROR
-         * @static
-         * @final
-         */
-        IO_ERROR : -300,
+                        /**
+                         * Initialization error. Will be triggered if no runtime was initialized.
+                         *
+                         * @property INIT_ERROR
+                         * @static
+                         * @final
+                         */
+                        INIT_ERROR: -500,
 
-        /**
-         * @property SECURITY_ERROR
-         * @static
-         * @final
-         */
-        SECURITY_ERROR : -400,
+                        /**
+                         * File size error. If the user selects a file that is too large or is empty it will be blocked and
+                         * an error of this type will be triggered.
+                         *
+                         * @property FILE_SIZE_ERROR
+                         * @static
+                         * @final
+                         */
+                        FILE_SIZE_ERROR: -600,
 
-        /**
-         * Initialization error. Will be triggered if no runtime was initialized.
-         *
-         * @property INIT_ERROR
-         * @static
-         * @final
-         */
-        INIT_ERROR : -500,
+                        /**
+                         * File extension error. If the user selects a file that isn't valid according to the filters setting.
+                         *
+                         * @property FILE_EXTENSION_ERROR
+                         * @static
+                         * @final
+                         */
+                        FILE_EXTENSION_ERROR: -601,
 
-        /**
-         * File size error. If the user selects a file that is too large it will be blocked and an error of this type will be triggered.
-         *
-         * @property FILE_SIZE_ERROR
-         * @static
-         * @final
-         */
-        FILE_SIZE_ERROR : -600,
+                        /**
+                         * Duplicate file error. If prevent_duplicates is set to true and user selects the same file again.
+                         *
+                         * @property FILE_DUPLICATE_ERROR
+                         * @static
+                         * @final
+                         */
+                        FILE_DUPLICATE_ERROR: -602,
 
-        /**
-         * File extension error. If the user selects a file that isn't valid according to the filters setting.
-         *
-         * @property FILE_EXTENSION_ERROR
-         * @static
-         * @final
-         */
-        FILE_EXTENSION_ERROR : -601,
+                        /**
+                         * Runtime will try to detect if image is proper one. Otherwise will throw this error.
+                         *
+                         * @property IMAGE_FORMAT_ERROR
+                         * @static
+                         * @final
+                         */
+                        IMAGE_FORMAT_ERROR: -700,
 
-        /**
-         * Duplicate file error. If prevent_duplicates is set to true and user selects the same file again.
-         *
-         * @property FILE_DUPLICATE_ERROR
-         * @static
-         * @final
-         */
-        FILE_DUPLICATE_ERROR : -602,
+                        /**
+                         * While working on files runtime may run out of memory and will throw this error.
+                         *
+                         * @since 2.1.2
+                         * @property MEMORY_ERROR
+                         * @static
+                         * @final
+                         */
+                        MEMORY_ERROR: -701,
 
-        /**
-         * Runtime will try to detect if image is proper one. Otherwise will throw this error.
-         *
-         * @property IMAGE_FORMAT_ERROR
-         * @static
-         * @final
-         */
-        IMAGE_FORMAT_ERROR : -700,
+                        /**
+                         * Each runtime has an upper limit on a dimension of the image it can handle. If bigger, will throw this error.
+                         *
+                         * @property IMAGE_DIMENSIONS_ERROR
+                         * @static
+                         * @final
+                         */
+                        IMAGE_DIMENSIONS_ERROR: -702,
 
-        /**
-         * While working on files runtime may run out of memory and will throw this error.
-         *
-         * @since 2.1.2
-         * @property MEMORY_ERROR
-         * @static
-         * @final
-         */
-        MEMORY_ERROR : -701,
+                        /**
+                         * Expose whole moxie (#1469).
+                         *
+                         * @property moxie
+                         * @type Object
+                         * @final
+                         */
+                        moxie: o,
 
-        /**
-         * Each runtime has an upper limit on a dimension of the image it can handle. If bigger, will throw this error.
-         *
-         * @property IMAGE_DIMENSIONS_ERROR
-         * @static
-         * @final
-         */
-        IMAGE_DIMENSIONS_ERROR : -702,
+                        /**
+                         * Mime type lookup table.
+                         *
+                         * @property mimeTypes
+                         * @type Object
+                         * @final
+                         */
+                        mimeTypes: u.Mime.mimes,
 
-        /**
-         * Mime type lookup table.
-         *
-         * @property mimeTypes
-         * @type Object
-         * @final
-         */
-        mimeTypes : o.mimes,
+                        /**
+                         * In some cases sniffing is the only way around :(
+                         */
+                        ua: u.Env,
 
-        /**
-         * In some cases sniffing is the only way around :(
-         */
-        ua: o.ua,
+                        /**
+                         * Gets the true type of the built-in object (better version of typeof).
+                         * @credits Angus Croll (http://javascriptweblog.wordpress.com/)
+                         *
+                         * @method typeOf
+                         * @static
+                         * @param {Object} o Object to check.
+                         * @return {String} Object [[Class]]
+                         */
+                        typeOf: u.Basic.typeOf,
 
-        /**
-         * Gets the true type of the built-in object (better version of typeof).
-         * @credits Angus Croll (http://javascriptweblog.wordpress.com/)
-         *
-         * @method typeOf
-         * @static
-         * @param {Object} o Object to check.
-         * @return {String} Object [[Class]]
-         */
-        typeOf: o.typeOf,
+                        /**
+                         * Extends the specified object with another object.
+                         *
+                         * @method extend
+                         * @static
+                         * @param {Object} target Object to extend.
+                         * @param {Object..} obj Multiple objects to extend with.
+                         * @return {Object} Same as target, the extended object.
+                         */
+                        extend: u.Basic.extend,
 
-        /**
-         * Extends the specified object with another object.
-         *
-         * @method extend
-         * @static
-         * @param {Object} target Object to extend.
-         * @param {Object..} obj Multiple objects to extend with.
-         * @return {Object} Same as target, the extended object.
-         */
-        extend : o.extend,
+                        /**
+                         * Generates an unique ID. This is 99.99% unique since it takes the current time and 5 random numbers.
+                         * The only way a user would be able to get the same ID is if the two persons at the same exact millisecond manages
+                         * to get 5 the same random numbers between 0-65535 it also uses a counter so each call will be guaranteed to be page unique.
+                         * It's more probable for the earth to be hit with an asteriod. You can also if you want to be 100% sure set the plupload.guidPrefix property
+                         * to an user unique key.
+                         *
+                         * @method guid
+                         * @static
+                         * @return {String} Virtually unique id.
+                         */
+                        guid: u.Basic.guid,
 
-        /**
-         * Generates an unique ID. This is 99.99% unique since it takes the current time and 5 random numbers.
-         * The only way a user would be able to get the same ID is if the two persons at the same exact millisecond manages
-         * to get 5 the same random numbers between 0-65535 it also uses a counter so each call will be guaranteed to be page unique.
-         * It's more probable for the earth to be hit with an asteriod. You can also if you want to be 100% sure set the plupload.guidPrefix property
-         * to an user unique key.
-         *
-         * @method guid
-         * @static
-         * @return {String} Virtually unique id.
-         */
-        guid : o.guid,
+                        /**
+                         * Get array of DOM Elements by their ids.
+                         *
+                         * @method get
+                         * @param {String} id Identifier of the DOM Element
+                         * @return {Array}
+                         */
+                        getAll: function get(ids) {
+                                var els = [],
+                                        el;
 
-        /**
-         * Get array of DOM Elements by their ids.
-         * 
-         * @method get
-         * @param {String} id Identifier of the DOM Element
-         * @return {Array}
-        */
-        getAll : function get(ids) {
-                var els = [], el;
+                                if (plupload.typeOf(ids) !== 'array') {
+                                        ids = [ids];
+                                }
 
-                if (plupload.typeOf(ids) !== 'array') {
-                        ids = [ids];
-                }
+                                var i = ids.length;
+                                while (i--) {
+                                        el = plupload.get(ids[i]);
+                                        if (el) {
+                                                els.push(el);
+                                        }
+                                }
 
-                var i = ids.length;
-                while (i--) {
-                        el = plupload.get(ids[i]);
-                        if (el) {
-                                els.push(el);
-                        }
-                }
+                                return els.length ? els : null;
+                        },
 
-                return els.length ? els : null;
-        },
+                        /**
+                        Get DOM element by id
 
-        /**
-        Get DOM element by id
+                        @method get
+                        @param {String} id Identifier of the DOM Element
+                        @return {Node}
+                        */
+                        get: u.Dom.get,
 
-        @method get
-        @param {String} id Identifier of the DOM Element
-        @return {Node}
-        */
-        get: o.get,
+                        /**
+                         * Executes the callback function for each item in array/object. If you return false in the
+                         * callback it will break the loop.
+                         *
+                         * @method each
+                         * @static
+                         * @param {Object} obj Object to iterate.
+                         * @param {function} callback Callback function to execute for each item.
+                         */
+                        each: u.Basic.each,
 
-        /**
-         * Executes the callback function for each item in array/object. If you return false in the
-         * callback it will break the loop.
-         *
-         * @method each
-         * @static
-         * @param {Object} obj Object to iterate.
-         * @param {function} callback Callback function to execute for each item.
-         */
-        each : o.each,
+                        /**
+                         * Returns the absolute x, y position of an Element. The position will be returned in a object with x, y fields.
+                         *
+                         * @method getPos
+                         * @static
+                         * @param {Element} node HTML element or element id to get x, y position from.
+                         * @param {Element} root Optional root element to stop calculations at.
+                         * @return {object} Absolute position of the specified element object with x, y fields.
+                         */
+                        getPos: u.Dom.getPos,
 
-        /**
-         * Returns the absolute x, y position of an Element. The position will be returned in a object with x, y fields.
-         *
-         * @method getPos
-         * @static
-         * @param {Element} node HTML element or element id to get x, y position from.
-         * @param {Element} root Optional root element to stop calculations at.
-         * @return {object} Absolute position of the specified element object with x, y fields.
-         */
-        getPos : o.getPos,
+                        /**
+                         * Returns the size of the specified node in pixels.
+                         *
+                         * @method getSize
+                         * @static
+                         * @param {Node} node Node to get the size of.
+                         * @return {Object} Object with a w and h property.
+                         */
+                        getSize: u.Dom.getSize,
 
-        /**
-         * Returns the size of the specified node in pixels.
-         *
-         * @method getSize
-         * @static
-         * @param {Node} node Node to get the size of.
-         * @return {Object} Object with a w and h property.
-         */
-        getSize : o.getSize,
+                        /**
+                         * Encodes the specified string.
+                         *
+                         * @method xmlEncode
+                         * @static
+                         * @param {String} s String to encode.
+                         * @return {String} Encoded string.
+                         */
+                        xmlEncode: function(str) {
+                                var xmlEncodeChars = {
+                                                '<': 'lt',
+                                                '>': 'gt',
+                                                '&': 'amp',
+                                                '"': 'quot',
+                                                '\'': '#39'
+                                        },
+                                        xmlEncodeRegExp = /[<>&\"\']/g;
 
-        /**
-         * Encodes the specified string.
-         *
-         * @method xmlEncode
-         * @static
-         * @param {String} s String to encode.
-         * @return {String} Encoded string.
-         */
-        xmlEncode : function(str) {
-                var xmlEncodeChars = {'<' : 'lt', '>' : 'gt', '&' : 'amp', '"' : 'quot', '\'' : '#39'}, xmlEncodeRegExp = /[<>&\"\']/g;
+                                return str ? ('' + str).replace(xmlEncodeRegExp, function(chr) {
+                                        return xmlEncodeChars[chr] ? '&' + xmlEncodeChars[chr] + ';' : chr;
+                                }) : str;
+                        },
 
-                return str ? ('' + str).replace(xmlEncodeRegExp, function(chr) {
-                        return xmlEncodeChars[chr] ? '&' + xmlEncodeChars[chr] + ';' : chr;
-                }) : str;
-        },
+                        /**
+                         * Forces anything into an array.
+                         *
+                         * @method toArray
+                         * @static
+                         * @param {Object} obj Object with length field.
+                         * @return {Array} Array object containing all items.
+                         */
+                        toArray: u.Basic.toArray,
 
-        /**
-         * Forces anything into an array.
-         *
-         * @method toArray
-         * @static
-         * @param {Object} obj Object with length field.
-         * @return {Array} Array object containing all items.
-         */
-        toArray : o.toArray,
+                        /**
+                         * Find an element in array and return its index if present, otherwise return -1.
+                         *
+                         * @method inArray
+                         * @static
+                         * @param {mixed} needle Element to find
+                         * @param {Array} array
+                         * @return {Int} Index of the element, or -1 if not found
+                         */
+                        inArray: u.Basic.inArray,
 
-        /**
-         * Find an element in array and return its index if present, otherwise return -1.
-         *
-         * @method inArray
-         * @static
-         * @param {mixed} needle Element to find
-         * @param {Array} array
-         * @return {Int} Index of the element, or -1 if not found
-         */
-        inArray : o.inArray,
+                        /**
+                        Recieve an array of functions (usually async) to call in sequence, each  function
+                        receives a callback as first argument that it should call, when it completes. Finally,
+                        after everything is complete, main callback is called. Passing truthy value to the
+                        callback as a first argument will interrupt the sequence and invoke main callback
+                        immediately.
 
-        /**
-         * Extends the language pack object with new items.
-         *
-         * @method addI18n
-         * @static
-         * @param {Object} pack Language pack items to add.
-         * @return {Object} Extended language pack object.
-         */
-        addI18n : o.addI18n,
+                        @method inSeries
+                        @static
+                        @param {Array} queue Array of functions to call in sequence
+                        @param {Function} cb Main callback that is called in the end, or in case of error
+                        */
+                        inSeries: u.Basic.inSeries,
 
-        /**
-         * Translates the specified string by checking for the english string in the language pack lookup.
-         *
-         * @method translate
-         * @static
-         * @param {String} str String to look for.
-         * @return {String} Translated string or the input string if it wasn't found.
-         */
-        translate : o.translate,
+                        /**
+                         * Extends the language pack object with new items.
+                         *
+                         * @method addI18n
+                         * @static
+                         * @param {Object} pack Language pack items to add.
+                         * @return {Object} Extended language pack object.
+                         */
+                        addI18n: o.core.I18n.addI18n,
 
-        /**
-         * Checks if object is empty.
-         *
-         * @method isEmptyObj
-         * @static
-         * @param {Object} obj Object to check.
-         * @return {Boolean}
-         */
-        isEmptyObj : o.isEmptyObj,
+                        /**
+                         * Translates the specified string by checking for the english string in the language pack lookup.
+                         *
+                         * @method translate
+                         * @static
+                         * @param {String} str String to look for.
+                         * @return {String} Translated string or the input string if it wasn't found.
+                         */
+                        translate: o.core.I18n.translate,
 
-        /**
-         * Checks if specified DOM element has specified class.
-         *
-         * @method hasClass
-         * @static
-         * @param {Object} obj DOM element like object to add handler to.
-         * @param {String} name Class name
-         */
-        hasClass : o.hasClass,
+                        /**
+                         * Pseudo sprintf implementation - simple way to replace tokens with specified values.
+                         *
+                         * @param {String} str String with tokens
+                         * @return {String} String with replaced tokens
+                         */
+                        sprintf: u.Basic.sprintf,
 
-        /**
-         * Adds specified className to specified DOM element.
-         *
-         * @method addClass
-         * @static
-         * @param {Object} obj DOM element like object to add handler to.
-         * @param {String} name Class name
-         */
-        addClass : o.addClass,
+                        /**
+                         * Checks if object is empty.
+                         *
+                         * @method isEmptyObj
+                         * @static
+                         * @param {Object} obj Object to check.
+                         * @return {Boolean}
+                         */
+                        isEmptyObj: u.Basic.isEmptyObj,
 
-        /**
-         * Removes specified className from specified DOM element.
-         *
-         * @method removeClass
-         * @static
-         * @param {Object} obj DOM element like object to add handler to.
-         * @param {String} name Class name
-         */
-        removeClass : o.removeClass,
+                        /**
+                         * Checks if specified DOM element has specified class.
+                         *
+                         * @method hasClass
+                         * @static
+                         * @param {Object} obj DOM element like object to add handler to.
+                         * @param {String} name Class name
+                         */
+                        hasClass: u.Dom.hasClass,
 
-        /**
-         * Returns a given computed style of a DOM element.
-         *
-         * @method getStyle
-         * @static
-         * @param {Object} obj DOM element like object.
-         * @param {String} name Style you want to get from the DOM element
-         */
-        getStyle : o.getStyle,
+                        /**
+                         * Adds specified className to specified DOM element.
+                         *
+                         * @method addClass
+                         * @static
+                         * @param {Object} obj DOM element like object to add handler to.
+                         * @param {String} name Class name
+                         */
+                        addClass: u.Dom.addClass,
 
-        /**
-         * Adds an event handler to the specified object and store reference to the handler
-         * in objects internal Plupload registry (@see removeEvent).
-         *
-         * @method addEvent
-         * @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} (optional) key that might be used to add specifity to the event record.
-         */
-        addEvent : o.addEvent,
+                        /**
+                         * Removes specified className from specified DOM element.
+                         *
+                         * @method removeClass
+                         * @static
+                         * @param {Object} obj DOM element like object to add handler to.
+                         * @param {String} name Class name
+                         */
+                        removeClass: u.Dom.removeClass,
 
-        /**
-         * 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} (optional) might be a callback or unique key to match.
-         */
-        removeEvent: o.removeEvent,
+                        /**
+                         * Returns a given computed style of a DOM element.
+                         *
+                         * @method getStyle
+                         * @static
+                         * @param {Object} obj DOM element like object.
+                         * @param {String} name Style you want to get from the DOM element
+                         */
+                        getStyle: u.Dom.getStyle,
 
-        /**
-         * Remove all kind of events from the specified object
-         *
-         * @method removeAllEvents
-         * @static
-         * @param {Object} obj DOM element to remove event listeners from.
-         * @param {String} (optional) unique key to match, when removing events.
-         */
-        removeAllEvents: o.removeAllEvents,
+                        /**
+                         * Adds an event handler to the specified object and store reference to the handler
+                         * in objects internal Plupload registry (@see removeEvent).
+                         *
+                         * @method addEvent
+                         * @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} (optional) key that might be used to add specifity to the event record.
+                         */
+                        addEvent: u.Events.addEvent,
 
-        /**
-         * Cleans the specified name from national characters (diacritics). The result will be a name with only a-z, 0-9 and _.
-         *
-         * @method cleanName
-         * @static
-         * @param {String} s String to clean up.
-         * @return {String} Cleaned string.
-         */
-        cleanName : function(name) {
-                var i, lookup;
+                        /**
+                         * 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} (optional) might be a callback or unique key to match.
+                         */
+                        removeEvent: u.Events.removeEvent,
 
-                // Replace diacritics
-                lookup = [
-                        /[\300-\306]/g, 'A', /[\340-\346]/g, 'a',
-                        /\307/g, 'C', /\347/g, 'c',
-                        /[\310-\313]/g, 'E', /[\350-\353]/g, 'e',
-                        /[\314-\317]/g, 'I', /[\354-\357]/g, 'i',
-                        /\321/g, 'N', /\361/g, 'n',
-                        /[\322-\330]/g, 'O', /[\362-\370]/g, 'o',
-                        /[\331-\334]/g, 'U', /[\371-\374]/g, 'u'
-                ];
+                        /**
+                         * Remove all kind of events from the specified object
+                         *
+                         * @method removeAllEvents
+                         * @static
+                         * @param {Object} obj DOM element to remove event listeners from.
+                         * @param {String} (optional) unique key to match, when removing events.
+                         */
+                        removeAllEvents: u.Events.removeAllEvents,
 
-                for (i = 0; i < lookup.length; i += 2) {
-                        name = name.replace(lookup[i], lookup[i + 1]);
-                }
+                        /**
+                         * Cleans the specified name from national characters (diacritics). The result will be a name with only a-z, 0-9 and _.
+                         *
+                         * @method cleanName
+                         * @static
+                         * @param {String} s String to clean up.
+                         * @return {String} Cleaned string.
+                         */
+                        cleanName: function(name) {
+                                var i, lookup;
 
-                // Replace whitespace
-                name = name.replace(/\s+/g, '_');
+                                // Replace diacritics
+                                lookup = [
+                                        /[\300-\306]/g, 'A', /[\340-\346]/g, 'a',
+                                        /\307/g, 'C', /\347/g, 'c',
+                                        /[\310-\313]/g, 'E', /[\350-\353]/g, 'e',
+                                        /[\314-\317]/g, 'I', /[\354-\357]/g, 'i',
+                                        /\321/g, 'N', /\361/g, 'n',
+                                        /[\322-\330]/g, 'O', /[\362-\370]/g, 'o',
+                                        /[\331-\334]/g, 'U', /[\371-\374]/g, 'u'
+                                ];
 
-                // Remove anything else
-                name = name.replace(/[^a-z0-9_\-\.]+/gi, '');
+                                for (i = 0; i < lookup.length; i += 2) {
+                                        name = name.replace(lookup[i], lookup[i + 1]);
+                                }
 
-                return name;
-        },
+                                // Replace whitespace
+                                name = name.replace(/\s+/g, '_');
 
-        /**
-         * Builds a full url out of a base URL and an object with items to append as query string items.
-         *
-         * @method buildUrl
-         * @static
-         * @param {String} url Base URL to append query string items to.
-         * @param {Object} items Name/value object to serialize as a querystring.
-         * @return {String} String with url + serialized query string items.
-         */
-        buildUrl : function(url, items) {
-                var query = '';
+                                // Remove anything else
+                                name = name.replace(/[^a-z0-9_\-\.]+/gi, '');
 
-                plupload.each(items, function(value, name) {
-                        query += (query ? '&' : '') + encodeURIComponent(name) + '=' + encodeURIComponent(value);
-                });
+                                return name;
+                        },
 
-                if (query) {
-                        url += (url.indexOf('?') > 0 ? '&' : '?') + query;
-                }
+                        /**
+                         * Builds a full url out of a base URL and an object with items to append as query string items.
+                         *
+                         * @method buildUrl
+                         * @static
+                         * @param {String} url Base URL to append query string items to.
+                         * @param {Object} items Name/value object to serialize as a querystring.
+                         * @return {String} String with url + serialized query string items.
+                         */
+                        buildUrl: function(url, items) {
+                                var query = '';
 
-                return url;
-        },
+                                plupload.each(items, function(value, name) {
+                                        query += (query ? '&' : '') + encodeURIComponent(name) + '=' + encodeURIComponent(value);
+                                });
 
-        /**
-         * Formats the specified number as a size string for example 1024 becomes 1 KB.
-         *
-         * @method formatSize
-         * @static
-         * @param {Number} size Size to format as string.
-         * @return {String} Formatted size string.
-         */
-        formatSize : function(size) {
+                                if (query) {
+                                        url += (url.indexOf('?') > 0 ? '&' : '?') + query;
+                                }
 
-                if (size === undef || /\D/.test(size)) {
-                        return plupload.translate('N/A');
-                }
+                                return url;
+                        },
 
-                function round(num, precision) {
-                        return Math.round(num * Math.pow(10, precision)) / Math.pow(10, precision);
-                }
+                        /**
+                         * Formats the specified number as a size string for example 1024 becomes 1 KB.
+                         *
+                         * @method formatSize
+                         * @static
+                         * @param {Number} size Size to format as string.
+                         * @return {String} Formatted size string.
+                         */
+                        formatSize: function(size) {
 
-                var boundary = Math.pow(1024, 4);
+                                if (size === undef || /\D/.test(size)) {
+                                        return plupload.translate('N/A');
+                                }
 
-                // TB
-                if (size > boundary) {
-                        return round(size / boundary, 1) + " " + plupload.translate('tb');
-                }
+                                function round(num, precision) {
+                                        return Math.round(num * Math.pow(10, precision)) / Math.pow(10, precision);
+                                }
 
-                // GB
-                if (size > (boundary/=1024)) {
-                        return round(size / boundary, 1) + " " + plupload.translate('gb');
-                }
+                                var boundary = Math.pow(1024, 4);
 
-                // MB
-                if (size > (boundary/=1024)) {
-                        return round(size / boundary, 1) + " " + plupload.translate('mb');
-                }
+                                // TB
+                                if (size > boundary) {
+                                        return round(size / boundary, 1) + " " + plupload.translate('tb');
+                                }
 
-                // KB
-                if (size > 1024) {
-                        return Math.round(size / 1024) + " " + plupload.translate('kb');
-                }
+                                // GB
+                                if (size > (boundary /= 1024)) {
+                                        return round(size / boundary, 1) + " " + plupload.translate('gb');
+                                }
 
-                return size + " " + plupload.translate('b');
-        },
+                                // MB
+                                if (size > (boundary /= 1024)) {
+                                        return round(size / boundary, 1) + " " + plupload.translate('mb');
+                                }
 
+                                // KB
+                                if (size > 1024) {
+                                        return Math.round(size / 1024) + " " + plupload.translate('kb');
+                                }
 
-        /**
-         * Parses the specified size string into a byte value. For example 10kb becomes 10240.
-         *
-         * @method parseSize
-         * @static
-         * @param {String|Number} size String to parse or number to just pass through.
-         * @return {Number} Size in bytes.
-         */
-        parseSize : o.parseSizeStr,
+                                return size + " " + plupload.translate('b');
+                        },
 
 
-        /**
-         * A way to predict what runtime will be choosen in the current environment with the
-         * specified settings.
-         *
-         * @method predictRuntime
-         * @static
-         * @param {Object|String} config Plupload settings to check
-         * @param {String} [runtimes] Comma-separated list of runtimes to check against
-         * @return {String} Type of compatible runtime
-         */
-        predictRuntime : function(config, runtimes) {
-                var up, runtime;
+                        /**
+                         * Parses the specified size string into a byte value. For example 10kb becomes 10240.
+                         *
+                         * @method parseSize
+                         * @static
+                         * @param {String|Number} size String to parse or number to just pass through.
+                         * @return {Number} Size in bytes.
+                         */
+                        parseSize: u.Basic.parseSizeStr,
 
-                up = new plupload.Uploader(config);
-                runtime = o.Runtime.thatCan(up.getOption().required_features, runtimes || config.runtimes);
-                up.destroy();
-                return runtime;
-        },
 
-        /**
-         * Registers a filter that will be executed for each file added to the queue.
-         * If callback returns false, file will not be added.
-         *
-         * Callback receives two arguments: a value for the filter as it was specified in settings.filters
-         * and a file to be filtered. Callback is executed in the context of uploader instance.
-         *
-         * @method addFileFilter
-         * @static
-         * @param {String} name Name of the filter by which it can be referenced in settings.filters
-         * @param {String} cb Callback - the actual routine that every added file must pass
-         */
-        addFileFilter: function(name, cb) {
-                fileFilters[name] = cb;
-        }
-};
+                        /**
+                         * A way to predict what runtime will be choosen in the current environment with the
+                         * specified settings.
+                         *
+                         * @method predictRuntime
+                         * @static
+                         * @param {Object|String} config Plupload settings to check
+                         * @param {String} [runtimes] Comma-separated list of runtimes to check against
+                         * @return {String} Type of compatible runtime
+                         */
+                        predictRuntime: function(config, runtimes) {
+                                var up, runtime;
 
+                                up = new plupload.Uploader(config);
+                                runtime = Runtime.thatCan(up.getOption().required_features, runtimes || config.runtimes);
+                                up.destroy();
+                                return runtime;
+                        },
 
-plupload.addFileFilter('mime_types', function(filters, file, cb) {
-        if (filters.length && !filters.regexp.test(file.name)) {
-                this.trigger('Error', {
-                        code : plupload.FILE_EXTENSION_ERROR,
-                        message : plupload.translate('File extension error.'),
-                        file : file
+                        /**
+                         * Registers a filter that will be executed for each file added to the queue.
+                         * If callback returns false, file will not be added.
+                         *
+                         * Callback receives two arguments: a value for the filter as it was specified in settings.filters
+                         * and a file to be filtered. Callback is executed in the context of uploader instance.
+                         *
+                         * @method addFileFilter
+                         * @static
+                         * @param {String} name Name of the filter by which it can be referenced in settings.filters
+                         * @param {String} cb Callback - the actual routine that every added file must pass
+                         */
+                        addFileFilter: function(name, cb) {
+                                fileFilters[name] = cb;
+                        }
+                };
+
+
+                plupload.addFileFilter('mime_types', function(filters, file, cb) {
+                        if (filters.length && !filters.regexp.test(file.name)) {
+                                this.trigger('Error', {
+                                        code: plupload.FILE_EXTENSION_ERROR,
+                                        message: plupload.translate('File extension error.'),
+                                        file: file
+                                });
+                                cb(false);
+                        } else {
+                                cb(true);
+                        }
                 });
-                cb(false);
-        } else {
-                cb(true);
-        }
-});
 
 
-plupload.addFileFilter('max_file_size', function(maxSize, file, cb) {
-        var undef;
+                plupload.addFileFilter('max_file_size', function(maxSize, file, cb) {
+                        var undef;
 
-        maxSize = plupload.parseSize(maxSize);
+                        maxSize = plupload.parseSize(maxSize);
 
-        // Invalid file size
-        if (file.size !== undef && maxSize && file.size > maxSize) {
-                this.trigger('Error', {
-                        code : plupload.FILE_SIZE_ERROR,
-                        message : plupload.translate('File size error.'),
-                        file : file
+                        // Invalid file size
+                        if (file.size !== undef && maxSize && file.size > maxSize) {
+                                this.trigger('Error', {
+                                        code: plupload.FILE_SIZE_ERROR,
+                                        message: plupload.translate('File size error.'),
+                                        file: file
+                                });
+                                cb(false);
+                        } else {
+                                cb(true);
+                        }
                 });
-                cb(false);
-        } else {
-                cb(true);
-        }
-});
 
 
-plupload.addFileFilter('prevent_duplicates', function(value, file, cb) {
-        if (value) {
-                var ii = this.files.length;
-                while (ii--) {
-                        // Compare by name and size (size might be 0 or undefined, but still equivalent for both)
-                        if (file.name === this.files[ii].name && file.size === this.files[ii].size) {
+                plupload.addFileFilter('prevent_duplicates', function(value, file, cb) {
+                        if (value) {
+                                var ii = this.files.length;
+                                while (ii--) {
+                                        // Compare by name and size (size might be 0 or undefined, but still equivalent for both)
+                                        if (file.name === this.files[ii].name && file.size === this.files[ii].size) {
+                                                this.trigger('Error', {
+                                                        code: plupload.FILE_DUPLICATE_ERROR,
+                                                        message: plupload.translate('Duplicate file error.'),
+                                                        file: file
+                                                });
+                                                cb(false);
+                                                return;
+                                        }
+                                }
+                        }
+                        cb(true);
+                });
+
+                plupload.addFileFilter('prevent_empty', function(value, file, cb) {
+                        if (value && !file.size && file.size !== undef) {
                                 this.trigger('Error', {
-                                        code : plupload.FILE_DUPLICATE_ERROR,
-                                        message : plupload.translate('Duplicate file error.'),
-                                        file : file
+                                        code: plupload.FILE_SIZE_ERROR,
+                                        message: plupload.translate('File size error.'),
+                                        file: file
                                 });
                                 cb(false);
-                                return;
+                        } else {
+                                cb(true);
                         }
-                }
-        }
-        cb(true);
-});
+                });
 
 
-/**
-@class Uploader
-@constructor
+                /**
+                @class Uploader
+                @constructor
 
-@param {Object} settings For detailed information about each option check documentation.
-        @param {String|DOMElement} settings.browse_button id of the DOM element or DOM element itself to use as file dialog trigger.
-        @param {String} settings.url URL of the server-side upload handler.
-        @param {Number|String} [settings.chunk_size=0] Chunk size in bytes to slice the file into. Shorcuts with b, kb, mb, gb, tb suffixes also supported. `e.g. 204800 or "204800b" or "200kb"`. By default - disabled.
-        @param {Boolean} [settings.send_chunk_number=true] Whether to send chunks and chunk numbers, or total and offset bytes.
-        @param {String|DOMElement} [settings.container] id of the DOM element or DOM element itself that will be used to wrap uploader structures. Defaults to immediate parent of the `browse_button` element.
-        @param {String|DOMElement} [settings.drop_element] id of the DOM element or DOM element itself to use as a drop zone for Drag-n-Drop.
-        @param {String} [settings.file_data_name="file"] Name for the file field in Multipart formated message.
-        @param {Object} [settings.filters={}] Set of file type filters.
-                @param {Array} [settings.filters.mime_types=[]] List of file types to accept, each one defined by title and list of extensions. `e.g. {title : "Image files", extensions : "jpg,jpeg,gif,png"}`. Dispatches `plupload.FILE_EXTENSION_ERROR`
-                @param {String|Number} [settings.filters.max_file_size=0] Maximum file size that the user can pick, in bytes. Optionally supports b, kb, mb, gb, tb suffixes. `e.g. "10mb" or "1gb"`. By default - not set. Dispatches `plupload.FILE_SIZE_ERROR`.
-                @param {Boolean} [settings.filters.prevent_duplicates=false] Do not let duplicates into the queue. Dispatches `plupload.FILE_DUPLICATE_ERROR`.
-        @param {String} [settings.flash_swf_url] URL of the Flash swf. (Not used in WordPress)
-        @param {Object} [settings.headers] Custom headers to send with the upload. Hash of name/value pairs.
-        @param {Number} [settings.max_retries=0] How many times to retry the chunk or file, before triggering Error event.
-        @param {Boolean} [settings.multipart=true] Whether to send file and additional parameters as Multipart formated message.
-        @param {Object} [settings.multipart_params] Hash of key/value pairs to send with every file upload.
-        @param {Boolean} [settings.multi_selection=true] Enable ability to select multiple files at once in file dialog.
-        @param {String|Object} [settings.required_features] Either comma-separated list or hash of required features that chosen runtime should absolutely possess.
-        @param {Object} [settings.resize] Enable resizng of images on client-side. Applies to `image/jpeg` and `image/png` only. `e.g. {width : 200, height : 200, quality : 90, crop: true}`
-                @param {Number} [settings.resize.width] If image is bigger, it will be resized.
-                @param {Number} [settings.resize.height] If image is bigger, it will be resized.
-                @param {Number} [settings.resize.quality=90] Compression quality for jpegs (1-100).
-                @param {Boolean} [settings.resize.crop=false] Whether to crop images to exact dimensions. By default they will be resized proportionally.
-        @param {String} [settings.runtimes="html5,html4"] Comma separated list of runtimes, that Plupload will try in turn, moving to the next if previous fails.
-        @param {String} [settings.silverlight_xap_url] URL of the Silverlight xap. (Not used in WordPress)
-        @param {Boolean} [settings.unique_names=false] If true will generate unique filenames for uploaded files.
-        @param {Boolean} [settings.send_file_name=true] Whether to send file name as additional argument - 'name' (required for chunked uploads and some other cases where file name cannot be sent via normal ways).
-*/
-plupload.Uploader = function(options) {
-        /**
-        Fires when the current RunTime has been initialized.
-        
-        @event Init
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-         */
+                @param {Object} settings For detailed information about each option check documentation.
+                        @param {String|DOMElement} settings.browse_button id of the DOM element or DOM element itself to use as file dialog trigger.
+                        @param {Number|String} [settings.chunk_size=0] Chunk size in bytes to slice the file into. Shorcuts with b, kb, mb, gb, tb suffixes also supported. `e.g. 204800 or "204800b" or "200kb"`. By default - disabled.
+                        @param {String|DOMElement} [settings.container] id of the DOM element or DOM element itself that will be used to wrap uploader structures. Defaults to immediate parent of the `browse_button` element.
+                        @param {String|DOMElement} [settings.drop_element] id of the DOM element or DOM element itself to use as a drop zone for Drag-n-Drop.
+                        @param {String} [settings.file_data_name="file"] Name for the file field in Multipart formated message.
+                        @param {Object} [settings.filters={}] Set of file type filters.
+                                @param {String|Number} [settings.filters.max_file_size=0] Maximum file size that the user can pick, in bytes. Optionally supports b, kb, mb, gb, tb suffixes. `e.g. "10mb" or "1gb"`. By default - not set. Dispatches `plupload.FILE_SIZE_ERROR`.
+                                @param {Array} [settings.filters.mime_types=[]] List of file types to accept, each one defined by title and list of extensions. `e.g. {title : "Image files", extensions : "jpg,jpeg,gif,png"}`. Dispatches `plupload.FILE_EXTENSION_ERROR`
+                                @param {Boolean} [settings.filters.prevent_duplicates=false] Do not let duplicates into the queue. Dispatches `plupload.FILE_DUPLICATE_ERROR`.
+                                @param {Boolean} [settings.filters.prevent_empty=true] Do not let empty files into the queue (IE10 is known to hang for example when trying to upload such). Dispatches `plupload.FILE_SIZE_ERROR`.
+                        @param {String} [settings.flash_swf_url] URL of the Flash swf.
+                        @param {Object} [settings.headers] Custom headers to send with the upload. Hash of name/value pairs.
+                        @param {String} [settings.http_method="POST"] HTTP method to use during upload (only PUT or POST allowed).
+                        @param {Number} [settings.max_retries=0] How many times to retry the chunk or file, before triggering Error event.
+                        @param {Boolean} [settings.multipart=true] Whether to send file and additional parameters as Multipart formated message.
+                        @param {Object} [settings.multipart_params] Hash of key/value pairs to send with every file upload.
+                        @param {Boolean} [settings.multi_selection=true] Enable ability to select multiple files at once in file dialog.
+                        @param {String|Object} [settings.required_features] Either comma-separated list or hash of required features that chosen runtime should absolutely possess.
+                        @param {Object} [settings.resize] Enable resizng of images on client-side. Applies to `image/jpeg` and `image/png` only. `e.g. {width : 200, height : 200, quality : 90, crop: true}`
+                                @param {Number} [settings.resize.width] If image is bigger, it will be resized.
+                                @param {Number} [settings.resize.height] If image is bigger, it will be resized.
+                                @param {Number} [settings.resize.quality=90] Compression quality for jpegs (1-100).
+                                @param {Boolean} [settings.resize.crop=false] Whether to crop images to exact dimensions. By default they will be resized proportionally.
+                        @param {String} [settings.runtimes="html5,flash,silverlight,html4"] Comma separated list of runtimes, that Plupload will try in turn, moving to the next if previous fails.
+                        @param {String} [settings.silverlight_xap_url] URL of the Silverlight xap.
+                        @param {Boolean} [settings.send_chunk_number=true] Whether to send chunks and chunk numbers, or total and offset bytes.
+                        @param {Boolean} [settings.send_file_name=true] Whether to send file name as additional argument - 'name' (required for chunked uploads and some other cases where file name cannot be sent via normal ways).
+                        @param {String} settings.url URL of the server-side upload handler.
+                        @param {Boolean} [settings.unique_names=false] If true will generate unique filenames for uploaded files.
 
-        /**
-        Fires after the init event incase you need to perform actions there.
-        
-        @event PostInit
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-         */
+                */
+                plupload.Uploader = function(options) {
+                        /**
+                        Fires when the current RunTime has been initialized.
 
-        /**
-        Fires when the option is changed in via uploader.setOption().
-        
-        @event OptionChanged
-        @since 2.1
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-        @param {String} name Name of the option that was changed
-        @param {Mixed} value New value for the specified option
-        @param {Mixed} oldValue Previous value of the option
-         */
+                        @event Init
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                         */
 
-        /**
-        Fires when the silverlight/flash or other shim needs to move.
-        
-        @event Refresh
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-         */
+                        /**
+                        Fires after the init event incase you need to perform actions there.
 
-        /**
-        Fires when the overall state is being changed for the upload queue.
-        
-        @event StateChanged
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-         */
+                        @event PostInit
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                         */
 
-        /**
-        Fires when browse_button is clicked and browse dialog shows.
-        
-        @event Browse
-        @since 2.1.2
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-         */     
+                        /**
+                        Fires when the option is changed in via uploader.setOption().
 
-        /**
-        Fires for every filtered file before it is added to the queue.
-        
-        @event FileFiltered
-        @since 2.1
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-        @param {plupload.File} file Another file that has to be added to the queue.
-         */
+                        @event OptionChanged
+                        @since 2.1
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                        @param {String} name Name of the option that was changed
+                        @param {Mixed} value New value for the specified option
+                        @param {Mixed} oldValue Previous value of the option
+                         */
 
-        /**
-        Fires when the file queue is changed. In other words when files are added/removed to the files array of the uploader instance.
-        
-        @event QueueChanged
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-         */ 
+                        /**
+                        Fires when the silverlight/flash or other shim needs to move.
 
-        /**
-        Fires after files were filtered and added to the queue.
-        
-        @event FilesAdded
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-        @param {Array} files Array of file objects that were added to queue by the user.
-         */
+                        @event Refresh
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                         */
 
-        /**
-        Fires when file is removed from the queue.
-        
-        @event FilesRemoved
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-        @param {Array} files Array of files that got removed.
-         */
+                        /**
+                        Fires when the overall state is being changed for the upload queue.
 
-        /**
-        Fires just before a file is uploaded. Can be used to cancel the upload for the specified file
-        by returning false from the handler.
-        
-        @event BeforeUpload
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-        @param {plupload.File} file File to be uploaded.
-         */
+                        @event StateChanged
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                         */
 
-        /**
-        Fires when a file is to be uploaded by the runtime.
-        
-        @event UploadFile
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-        @param {plupload.File} file File to be uploaded.
-         */
+                        /**
+                        Fires when browse_button is clicked and browse dialog shows.
 
-        /**
-        Fires while a file is being uploaded. Use this event to update the current file upload progress.
-        
-        @event UploadProgress
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-        @param {plupload.File} file File that is currently being uploaded.
-         */     
+                        @event Browse
+                        @since 2.1.2
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                         */
 
-        /**
-        Fires when file chunk is uploaded.
-        
-        @event ChunkUploaded
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-        @param {plupload.File} file File that the chunk was uploaded for.
-        @param {Object} result Object with response properties.
-                @param {Number} result.offset The amount of bytes the server has received so far, including this chunk.
-                @param {Number} result.total The size of the file.
-                @param {String} result.response The response body sent by the server.
-                @param {Number} result.status The HTTP status code sent by the server.
-                @param {String} result.responseHeaders All the response headers as a single string.
-         */
+                        /**
+                        Fires for every filtered file before it is added to the queue.
 
-        /**
-        Fires when a file is successfully uploaded.
-        
-        @event FileUploaded
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-        @param {plupload.File} file File that was uploaded.
-        @param {Object} result Object with response properties.
-                @param {String} result.response The response body sent by the server.
-                @param {Number} result.status The HTTP status code sent by the server.
-                @param {String} result.responseHeaders All the response headers as a single string.
-         */
+                        @event FileFiltered
+                        @since 2.1
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                        @param {plupload.File} file Another file that has to be added to the queue.
+                         */
 
-        /**
-        Fires when all files in a queue are uploaded.
-        
-        @event UploadComplete
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-        @param {Array} files Array of file objects that was added to queue/selected by the user.
-         */
+                        /**
+                        Fires when the file queue is changed. In other words when files are added/removed to the files array of the uploader instance.
 
-        /**
-        Fires when a error occurs.
-        
-        @event Error
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-        @param {Object} error Contains code, message and sometimes file and other details.
-                @param {Number} error.code The plupload error code.
-                @param {String} error.message Description of the error (uses i18n).
-         */
+                        @event QueueChanged
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                         */
 
-        /**
-        Fires when destroy method is called.
-        
-        @event Destroy
-        @param {plupload.Uploader} uploader Uploader instance sending the event.
-         */
-        var uid = plupload.guid()
-        , settings
-        , files = []
-        , preferred_caps = {}
-        , fileInputs = []
-        , fileDrops = []
-        , startTime
-        , total
-        , disabled = false
-        , xhr
-        ;
+                        /**
+                        Fires after files were filtered and added to the queue.
 
+                        @event FilesAdded
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                        @param {Array} files Array of file objects that were added to queue by the user.
+                         */
 
-        // Private methods
-        function uploadNext() {
-                var file, count = 0, i;
+                        /**
+                        Fires when file is removed from the queue.
 
-                if (this.state == plupload.STARTED) {
-                        // Find first QUEUED file
-                        for (i = 0; i < files.length; i++) {
-                                if (!file && files[i].status == plupload.QUEUED) {
-                                        file = files[i];
-                                        if (this.trigger("BeforeUpload", file)) {
-                                                file.status = plupload.UPLOADING;
-                                                this.trigger("UploadFile", file);
+                        @event FilesRemoved
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                        @param {Array} files Array of files that got removed.
+                         */
+
+                        /**
+                        Fires just before a file is uploaded. Can be used to cancel the upload for the specified file
+                        by returning false from the handler.
+
+                        @event BeforeUpload
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                        @param {plupload.File} file File to be uploaded.
+                         */
+
+                        /**
+                        Fires when a file is to be uploaded by the runtime.
+
+                        @event UploadFile
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                        @param {plupload.File} file File to be uploaded.
+                         */
+
+                        /**
+                        Fires while a file is being uploaded. Use this event to update the current file upload progress.
+
+                        @event UploadProgress
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                        @param {plupload.File} file File that is currently being uploaded.
+                         */
+
+                        /**
+                         * Fires just before a chunk is uploaded. This event enables you to override settings
+                         * on the uploader instance before the chunk is uploaded.
+                         *
+                         * @event BeforeChunkUpload
+                         * @param {plupload.Uploader} uploader Uploader instance sending the event.
+                         * @param {plupload.File} file File to be uploaded.
+                         * @param {Object} args POST params to be sent.
+                         * @param {Blob} chunkBlob Current blob.
+                         * @param {offset} offset Current offset.
+                         */
+
+                        /**
+                        Fires when file chunk is uploaded.
+
+                        @event ChunkUploaded
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                        @param {plupload.File} file File that the chunk was uploaded for.
+                        @param {Object} result Object with response properties.
+                                @param {Number} result.offset The amount of bytes the server has received so far, including this chunk.
+                                @param {Number} result.total The size of the file.
+                                @param {String} result.response The response body sent by the server.
+                                @param {Number} result.status The HTTP status code sent by the server.
+                                @param {String} result.responseHeaders All the response headers as a single string.
+                         */
+
+                        /**
+                        Fires when a file is successfully uploaded.
+
+                        @event FileUploaded
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                        @param {plupload.File} file File that was uploaded.
+                        @param {Object} result Object with response properties.
+                                @param {String} result.response The response body sent by the server.
+                                @param {Number} result.status The HTTP status code sent by the server.
+                                @param {String} result.responseHeaders All the response headers as a single string.
+                         */
+
+                        /**
+                        Fires when all files in a queue are uploaded.
+
+                        @event UploadComplete
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                        @param {Array} files Array of file objects that was added to queue/selected by the user.
+                         */
+
+                        /**
+                        Fires when a error occurs.
+
+                        @event Error
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                        @param {Object} error Contains code, message and sometimes file and other details.
+                                @param {Number} error.code The plupload error code.
+                                @param {String} error.message Description of the error (uses i18n).
+                         */
+
+                        /**
+                        Fires when destroy method is called.
+
+                        @event Destroy
+                        @param {plupload.Uploader} uploader Uploader instance sending the event.
+                         */
+                        var uid = plupload.guid(),
+                                settings, files = [],
+                                preferred_caps = {},
+                                fileInputs = [],
+                                fileDrops = [],
+                                startTime, total, disabled = false,
+                                xhr;
+
+
+                        // Private methods
+                        function uploadNext() {
+                                var file, count = 0,
+                                        i;
+
+                                if (this.state == plupload.STARTED) {
+                                        // Find first QUEUED file
+                                        for (i = 0; i < files.length; i++) {
+                                                if (!file && files[i].status == plupload.QUEUED) {
+                                                        file = files[i];
+                                                        if (this.trigger("BeforeUpload", file)) {
+                                                                file.status = plupload.UPLOADING;
+                                                                this.trigger("UploadFile", file);
+                                                        }
+                                                } else {
+                                                        count++;
+                                                }
                                         }
-                                } else {
-                                        count++;
+
+                                        // All files are DONE or FAILED
+                                        if (count == files.length) {
+                                                if (this.state !== plupload.STOPPED) {
+                                                        this.state = plupload.STOPPED;
+                                                        this.trigger("StateChanged");
+                                                }
+                                                this.trigger("UploadComplete", files);
+                                        }
                                 }
                         }
 
-                        // All files are DONE or FAILED
-                        if (count == files.length) {
-                                if (this.state !== plupload.STOPPED) {
-                                        this.state = plupload.STOPPED;
-                                        this.trigger("StateChanged");
-                                }
-                                this.trigger("UploadComplete", files);
+
+                        function calcFile(file) {
+                                file.percent = file.size > 0 ? Math.ceil(file.loaded / file.size * 100) : 100;
+                                calc();
                         }
-                }
-        }
 
 
-        function calcFile(file) {
-                file.percent = file.size > 0 ? Math.ceil(file.loaded / file.size * 100) : 100;
-                calc();
-        }
+                        function calc() {
+                                var i, file;
+                                var loaded;
+                                var loadedDuringCurrentSession = 0;
 
+                                // Reset stats
+                                total.reset();
 
-        function calc() {
-                var i, file;
+                                // Check status, size, loaded etc on all files
+                                for (i = 0; i < files.length; i++) {
+                                        file = files[i];
 
-                // Reset stats
-                total.reset();
+                                        if (file.size !== undef) {
+                                                // We calculate totals based on original file size
+                                                total.size += file.origSize;
 
-                // Check status, size, loaded etc on all files
-                for (i = 0; i < files.length; i++) {
-                        file = files[i];
+                                                // Since we cannot predict file size after resize, we do opposite and
+                                                // interpolate loaded amount to match magnitude of total
+                                                loaded = file.loaded * file.origSize / file.size;
 
-                        if (file.size !== undef) {
-                                // We calculate totals based on original file size
-                                total.size += file.origSize;
+                                                if (!file.completeTimestamp || file.completeTimestamp > startTime) {
+                                                        loadedDuringCurrentSession += loaded;
+                                                }
 
-                                // Since we cannot predict file size after resize, we do opposite and
-                                // interpolate loaded amount to match magnitude of total
-                                total.loaded += file.loaded * file.origSize / file.size;
-                        } else {
-                                total.size = undef;
+                                                total.loaded += loaded;
+                                        } else {
+                                                total.size = undef;
+                                        }
+
+                                        if (file.status == plupload.DONE) {
+                                                total.uploaded++;
+                                        } else if (file.status == plupload.FAILED) {
+                                                total.failed++;
+                                        } else {
+                                                total.queued++;
+                                        }
+                                }
+
+                                // If we couldn't calculate a total file size then use the number of files to calc percent
+                                if (total.size === undef) {
+                                        total.percent = files.length > 0 ? Math.ceil(total.uploaded / files.length * 100) : 0;
+                                } else {
+                                        total.bytesPerSec = Math.ceil(loadedDuringCurrentSession / ((+new Date() - startTime || 1) / 1000.0));
+                                        total.percent = total.size > 0 ? Math.ceil(total.loaded / total.size * 100) : 0;
+                                }
                         }
 
-                        if (file.status == plupload.DONE) {
-                                total.uploaded++;
-                        } else if (file.status == plupload.FAILED) {
-                                total.failed++;
-                        } else {
-                                total.queued++;
+
+                        function getRUID() {
+                                var ctrl = fileInputs[0] || fileDrops[0];
+                                if (ctrl) {
+                                        return ctrl.getRuntime().uid;
+                                }
+                                return false;
                         }
-                }
 
-                // If we couldn't calculate a total file size then use the number of files to calc percent
-                if (total.size === undef) {
-                        total.percent = files.length > 0 ? Math.ceil(total.uploaded / files.length * 100) : 0;
-                } else {
-                        total.bytesPerSec = Math.ceil(total.loaded / ((+new Date() - startTime || 1) / 1000.0));
-                        total.percent = total.size > 0 ? Math.ceil(total.loaded / total.size * 100) : 0;
-                }
-        }
 
+                        function bindEventListeners() {
+                                this.bind('FilesAdded FilesRemoved', function(up) {
+                                        up.trigger('QueueChanged');
+                                        up.refresh();
+                                });
 
-        function getRUID() {
-                var ctrl = fileInputs[0] || fileDrops[0];
-                if (ctrl) {
-                        return ctrl.getRuntime().uid;
-                }
-                return false;
-        }
+                                this.bind('CancelUpload', onCancelUpload);
 
+                                this.bind('BeforeUpload', onBeforeUpload);
 
-        function runtimeCan(file, cap) {
-                if (file.ruid) {
-                        var info = o.Runtime.getInfo(file.ruid);
-                        if (info) {
-                                return info.can(cap);
-                        }
-                }
-                return false;
-        }
+                                this.bind('UploadFile', onUploadFile);
 
+                                this.bind('UploadProgress', onUploadProgress);
 
-        function bindEventListeners() {
-                this.bind('FilesAdded FilesRemoved', function(up) {
-                        up.trigger('QueueChanged');
-                        up.refresh();
-                });
+                                this.bind('StateChanged', onStateChanged);
 
-                this.bind('CancelUpload', onCancelUpload);
-                
-                this.bind('BeforeUpload', onBeforeUpload);
+                                this.bind('QueueChanged', calc);
 
-                this.bind('UploadFile', onUploadFile);
+                                this.bind('Error', onError);
 
-                this.bind('UploadProgress', onUploadProgress);
+                                this.bind('FileUploaded', onFileUploaded);
 
-                this.bind('StateChanged', onStateChanged);
+                                this.bind('Destroy', onDestroy);
+                        }
 
-                this.bind('QueueChanged', calc);
 
-                this.bind('Error', onError);
+                        function initControls(settings, cb) {
+                                var self = this,
+                                        inited = 0,
+                                        queue = [];
 
-                this.bind('FileUploaded', onFileUploaded);
+                                // common settings
+                                var options = {
+                                        runtime_order: settings.runtimes,
+                                        required_caps: settings.required_features,
+                                        preferred_caps: preferred_caps,
+                                        swf_url: settings.flash_swf_url,
+                                        xap_url: settings.silverlight_xap_url
+                                };
 
-                this.bind('Destroy', onDestroy);
-        }
+                                // add runtime specific options if any
+                                plupload.each(settings.runtimes.split(/\s*,\s*/), function(runtime) {
+                                        if (settings[runtime]) {
+                                                options[runtime] = settings[runtime];
+                                        }
+                                });
 
+                                // initialize file pickers - there can be many
+                                if (settings.browse_button) {
+                                        plupload.each(settings.browse_button, function(el) {
+                                                queue.push(function(cb) {
+                                                        var fileInput = new o.file.FileInput(plupload.extend({}, options, {
+                                                                accept: settings.filters.mime_types,
+                                                                name: settings.file_data_name,
+                                                                multiple: settings.multi_selection,
+                                                                container: settings.container,
+                                                                browse_button: el
+                                                        }));
 
-        function initControls(settings, cb) {
-                var self = this, inited = 0, queue = [];
+                                                        fileInput.onready = function() {
+                                                                var info = Runtime.getInfo(this.ruid);
 
-                // common settings
-                var options = {
-                        runtime_order: settings.runtimes,
-                        required_caps: settings.required_features,
-                        preferred_caps: preferred_caps
-                };
+                                                                // for backward compatibility
+                                                                plupload.extend(self.features, {
+                                                                        chunks: info.can('slice_blob'),
+                                                                        multipart: info.can('send_multipart'),
+                                                                        multi_selection: info.can('select_multiple')
+                                                                });
 
-                // add runtime specific options if any
-                plupload.each(settings.runtimes.split(/\s*,\s*/), function(runtime) {
-                        if (settings[runtime]) {
-                                options[runtime] = settings[runtime];
-                        }
-                });
+                                                                inited++;
+                                                                fileInputs.push(this);
+                                                                cb();
+                                                        };
 
-                // initialize file pickers - there can be many
-                if (settings.browse_button) {
-                        plupload.each(settings.browse_button, function(el) {
-                                queue.push(function(cb) {
-                                        var fileInput = new o.FileInput(plupload.extend({}, options, {
-                                                accept: settings.filters.mime_types,
-                                                name: settings.file_data_name,
-                                                multiple: settings.multi_selection,
-                                                container: settings.container,
-                                                browse_button: el
-                                        }));
+                                                        fileInput.onchange = function() {
+                                                                self.addFile(this.files);
+                                                        };
 
-                                        fileInput.onready = function() {
-                                                var info = o.Runtime.getInfo(this.ruid);
+                                                        fileInput.bind('mouseenter mouseleave mousedown mouseup', function(e) {
+                                                                if (!disabled) {
+                                                                        if (settings.browse_button_hover) {
+                                                                                if ('mouseenter' === e.type) {
+                                                                                        plupload.addClass(el, settings.browse_button_hover);
+                                                                                } else if ('mouseleave' === e.type) {
+                                                                                        plupload.removeClass(el, settings.browse_button_hover);
+                                                                                }
+                                                                        }
 
-                                                // for backward compatibility
-                                                o.extend(self.features, {
-                                                        chunks: info.can('slice_blob'),
-                                                        multipart: info.can('send_multipart'),
-                                                        multi_selection: info.can('select_multiple')
+                                                                        if (settings.browse_button_active) {
+                                                                                if ('mousedown' === e.type) {
+                                                                                        plupload.addClass(el, settings.browse_button_active);
+                                                                                } else if ('mouseup' === e.type) {
+                                                                                        plupload.removeClass(el, settings.browse_button_active);
+                                                                                }
+                                                                        }
+                                                                }
+                                                        });
+
+                                                        fileInput.bind('mousedown', function() {
+                                                                self.trigger('Browse');
+                                                        });
+
+                                                        fileInput.bind('error runtimeerror', function() {
+                                                                fileInput = null;
+                                                                cb();
+                                                        });
+
+                                                        fileInput.init();
                                                 });
+                                        });
+                                }
 
-                                                inited++;
-                                                fileInputs.push(this);
-                                                cb();
-                                        };
+                                // initialize drop zones
+                                if (settings.drop_element) {
+                                        plupload.each(settings.drop_element, function(el) {
+                                                queue.push(function(cb) {
+                                                        var fileDrop = new o.file.FileDrop(plupload.extend({}, options, {
+                                                                drop_zone: el
+                                                        }));
 
-                                        fileInput.onchange = function() {
-                                                self.addFile(this.files);
-                                        };
+                                                        fileDrop.onready = function() {
+                                                                var info = Runtime.getInfo(this.ruid);
 
-                                        fileInput.bind('mouseenter mouseleave mousedown mouseup', function(e) {
-                                                if (!disabled) {
-                                                        if (settings.browse_button_hover) {
-                                                                if ('mouseenter' === e.type) {
-                                                                        o.addClass(el, settings.browse_button_hover);
-                                                                } else if ('mouseleave' === e.type) {
-                                                                        o.removeClass(el, settings.browse_button_hover);
-                                                                }
-                                                        }
+                                                                // for backward compatibility
+                                                                plupload.extend(self.features, {
+                                                                        chunks: info.can('slice_blob'),
+                                                                        multipart: info.can('send_multipart'),
+                                                                        dragdrop: info.can('drag_and_drop')
+                                                                });
 
-                                                        if (settings.browse_button_active) {
-                                                                if ('mousedown' === e.type) {
-                                                                        o.addClass(el, settings.browse_button_active);
-                                                                } else if ('mouseup' === e.type) {
-                                                                        o.removeClass(el, settings.browse_button_active);
-                                                                }
-                                                        }
-                                                }
-                                        });
+                                                                inited++;
+                                                                fileDrops.push(this);
+                                                                cb();
+                                                        };
 
-                                        fileInput.bind('mousedown', function() {
-                                                self.trigger('Browse');
-                                        });
+                                                        fileDrop.ondrop = function() {
+                                                                self.addFile(this.files);
+                                                        };
 
-                                        fileInput.bind('error runtimeerror', function() {
-                                                fileInput = null;
-                                                cb();
+                                                        fileDrop.bind('error runtimeerror', function() {
+                                                                fileDrop = null;
+                                                                cb();
+                                                        });
+
+                                                        fileDrop.init();
+                                                });
                                         });
+                                }
 
-                                        fileInput.init();
+
+                                plupload.inSeries(queue, function() {
+                                        if (typeof(cb) === 'function') {
+                                                cb(inited);
+                                        }
                                 });
-                        });
-                }
+                        }
 
-                // initialize drop zones
-                if (settings.drop_element) {
-                        plupload.each(settings.drop_element, function(el) {
-                                queue.push(function(cb) {
-                                        var fileDrop = new o.FileDrop(plupload.extend({}, options, {
-                                                drop_zone: el
-                                        }));
 
-                                        fileDrop.onready = function() {
-                                                var info = o.Runtime.getInfo(this.ruid);
+                        function resizeImage(blob, params, runtimeOptions, cb) {
+                                var img = new o.image.Image();
 
-                                                // for backward compatibility
-                                                o.extend(self.features, {
-                                                        chunks: info.can('slice_blob'),
-                                                        multipart: info.can('send_multipart'),
-                                                        dragdrop: info.can('drag_and_drop')
-                                                });
-
-                                                inited++;
-                                                fileDrops.push(this);
-                                                cb();
+                                try {
+                                        img.onload = function() {
+                                                // no manipulation required if...
+                                                if (params.width > this.width &&
+                                                        params.height > this.height &&
+                                                        params.quality === undef &&
+                                                        params.preserve_headers &&
+                                                        !params.crop
+                                                ) {
+                                                        this.destroy();
+                                                        cb(blob);
+                                                } else {
+                                                        // otherwise downsize
+                                                        img.downsize(params.width, params.height, params.crop, params.preserve_headers);
+                                                }
                                         };
 
-                                        fileDrop.ondrop = function() {
-                                                self.addFile(this.files);
+                                        img.onresize = function() {
+                                                var resizedBlob = this.getAsBlob(blob.type, params.quality);
+                                                this.destroy();
+                                                cb(resizedBlob);
                                         };
 
-                                        fileDrop.bind('error runtimeerror', function() {
-                                                fileDrop = null;
-                                                cb();
+                                        img.bind('error runtimeerror', function() {
+                                                this.destroy();
+                                                cb(blob);
                                         });
 
-                                        fileDrop.init();
-                                });
-                        });
-                }
+                                        img.load(blob, runtimeOptions);
+                                } catch (ex) {
+                                        cb(blob);
+                                }
+                        }
 
 
-                o.inSeries(queue, function() {
-                        if (typeof(cb) === 'function') {
-                                cb(inited);
-                        }
-                });
-        }
+                        function setOption(option, value, init) {
+                                var self = this,
+                                        reinitRequired = false;
 
+                                function _setOption(option, value, init) {
+                                        var oldValue = settings[option];
 
-        function resizeImage(blob, params, cb) {
-                var img = new o.Image();
+                                        switch (option) {
+                                                case 'max_file_size':
+                                                        if (option === 'max_file_size') {
+                                                                settings.max_file_size = settings.filters.max_file_size = value;
+                                                        }
+                                                        break;
 
-                try {
-                        img.onload = function() {
-                                // no manipulation required if...
-                                if (params.width > this.width &&
-                                        params.height > this.height &&
-                                        params.quality === undef &&
-                                        params.preserve_headers &&
-                                        !params.crop
-                                ) {
-                                        this.destroy();
-                                        return cb(blob);
-                                }
-                                // otherwise downsize
-                                img.downsize(params.width, params.height, params.crop, params.preserve_headers);
-                        };
+                                                case 'chunk_size':
+                                                        if (value = plupload.parseSize(value)) {
+                                                                settings[option] = value;
+                                                                settings.send_file_name = true;
+                                                        }
+                                                        break;
 
-                        img.onresize = function() {
-                                cb(this.getAsBlob(blob.type, params.quality));
-                                this.destroy();
-                        };
+                                                case 'multipart':
+                                                        settings[option] = value;
+                                                        if (!value) {
+                                                                settings.send_file_name = true;
+                                                        }
+                                                        break;
 
-                        img.onerror = function() {
-                                cb(blob);
-                        };
+                                                case 'http_method':
+                                                        settings[option] = value.toUpperCase() === 'PUT' ? 'PUT' : 'POST';
+                                                        break;
 
-                        img.load(blob);
-                } catch(ex) {
-                        cb(blob);
-                }
-        }
+                                                case 'unique_names':
+                                                        settings[option] = value;
+                                                        if (value) {
+                                                                settings.send_file_name = true;
+                                                        }
+                                                        break;
 
+                                                case 'filters':
+                                                        // for sake of backward compatibility
+                                                        if (plupload.typeOf(value) === 'array') {
+                                                                value = {
+                                                                        mime_types: value
+                                                                };
+                                                        }
 
-        function setOption(option, value, init) {
-                var self = this, reinitRequired = false;
+                                                        if (init) {
+                                                                plupload.extend(settings.filters, value);
+                                                        } else {
+                                                                settings.filters = value;
+                                                        }
 
-                function _setOption(option, value, init) {
-                        var oldValue = settings[option];
+                                                        // if file format filters are being updated, regenerate the matching expressions
+                                                        if (value.mime_types) {
+                                                                if (plupload.typeOf(value.mime_types) === 'string') {
+                                                                        value.mime_types = o.core.utils.Mime.mimes2extList(value.mime_types);
+                                                                }
 
-                        switch (option) {
-                                case 'max_file_size':
-                                        if (option === 'max_file_size') {
-                                                settings.max_file_size = settings.filters.max_file_size = value;
-                                        }
-                                        break;
+                                                                value.mime_types.regexp = (function(filters) {
+                                                                        var extensionsRegExp = [];
 
-                                case 'chunk_size':
-                                        if (value = plupload.parseSize(value)) {
-                                                settings[option] = value;
-                                                settings.send_file_name = true;
-                                        }
-                                        break;
+                                                                        plupload.each(filters, function(filter) {
+                                                                                plupload.each(filter.extensions.split(/,/), function(ext) {
+                                                                                        if (/^\s*\*\s*$/.test(ext)) {
+                                                                                                extensionsRegExp.push('\\.*');
+                                                                                        } else {
+                                                                                                extensionsRegExp.push('\\.' + ext.replace(new RegExp('[' + ('/^$.*+?|()[]{}\\'.replace(/./g, '\\$&')) + ']', 'g'), '\\$&'));
+                                                                                        }
+                                                                                });
+                                                                        });
 
-                                case 'multipart':
-                                        settings[option] = value;
-                                        if (!value) {
-                                                settings.send_file_name = true;
-                                        }
-                                        break;
+                                                                        return new RegExp('(' + extensionsRegExp.join('|') + ')$', 'i');
+                                                                }(value.mime_types));
 
-                                case 'unique_names':
-                                        settings[option] = value;
-                                        if (value) {
-                                                settings.send_file_name = true;
-                                        }
-                                        break;
+                                                                settings.filters.mime_types = value.mime_types;
+                                                        }
+                                                        break;
 
-                                case 'filters':
-                                        // for sake of backward compatibility
-                                        if (plupload.typeOf(value) === 'array') {
-                                                value = {
-                                                        mime_types: value
-                                                };
-                                        }
+                                                case 'resize':
+                                                        if (value) {
+                                                                settings.resize = plupload.extend({
+                                                                        preserve_headers: true,
+                                                                        crop: false
+                                                                }, value);
+                                                        } else {
+                                                                settings.resize = false;
+                                                        }
+                                                        break;
 
-                                        if (init) {
-                                                plupload.extend(settings.filters, value);
-                                        } else {
-                                                settings.filters = value;
-                                        }
+                                                case 'prevent_duplicates':
+                                                        settings.prevent_duplicates = settings.filters.prevent_duplicates = !!value;
+                                                        break;
 
-                                        // if file format filters are being updated, regenerate the matching expressions
-                                        if (value.mime_types) {
-                                                settings.filters.mime_types.regexp = (function(filters) {
-                                                        var extensionsRegExp = [];
+                                                        // options that require reinitialisation
+                                                case 'container':
+                                                case 'browse_button':
+                                                case 'drop_element':
+                                                        value = 'container' === option ?
+                                                                plupload.get(value) :
+                                                                plupload.getAll(value);
 
-                                                        plupload.each(filters, function(filter) {
-                                                                plupload.each(filter.extensions.split(/,/), function(ext) {
-                                                                        if (/^\s*\*\s*$/.test(ext)) {
-                                                                                extensionsRegExp.push('\\.*');
-                                                                        } else {
-                                                                                extensionsRegExp.push('\\.' + ext.replace(new RegExp('[' + ('/^$.*+?|()[]{}\\'.replace(/./g, '\\$&')) + ']', 'g'), '\\$&'));
-                                                                        }
-                                                                });
-                                                        });
+                                                case 'runtimes':
+                                                case 'multi_selection':
+                                                case 'flash_swf_url':
+                                                case 'silverlight_xap_url':
+                                                        settings[option] = value;
+                                                        if (!init) {
+                                                                reinitRequired = true;
+                                                        }
+                                                        break;
 
-                                                        return new RegExp('(' + extensionsRegExp.join('|') + ')$', 'i');
-                                                }(settings.filters.mime_types));
+                                                default:
+                                                        settings[option] = value;
                                         }
-                                        break;
-        
-                                case 'resize':
-                                        if (init) {
-                                                plupload.extend(settings.resize, value, {
-                                                        enabled: true
-                                                });
-                                        } else {
-                                                settings.resize = value;
-                                        }
-                                        break;
 
-                                case 'prevent_duplicates':
-                                        settings.prevent_duplicates = settings.filters.prevent_duplicates = !!value;
-                                        break;
-
-                                // options that require reinitialisation
-                                case 'container':
-                                case 'browse_button':
-                                case 'drop_element':
-                                                value = 'container' === option
-                                                        ? plupload.get(value)
-                                                        : plupload.getAll(value)
-                                                        ; 
-                                
-                                case 'runtimes':
-                                case 'multi_selection':
-                                        settings[option] = value;
                                         if (!init) {
-                                                reinitRequired = true;
+                                                self.trigger('OptionChanged', option, value, oldValue);
                                         }
-                                        break;
+                                }
 
-                                default:
-                                        settings[option] = value;
-                        }
+                                if (typeof(option) === 'object') {
+                                        plupload.each(option, function(value, option) {
+                                                _setOption(option, value, init);
+                                        });
+                                } else {
+                                        _setOption(option, value, init);
+                                }
 
-                        if (!init) {
-                                self.trigger('OptionChanged', option, value, oldValue);
-                        }
-                }
+                                if (init) {
+                                        // Normalize the list of required capabilities
+                                        settings.required_features = normalizeCaps(plupload.extend({}, settings));
 
-                if (typeof(option) === 'object') {
-                        plupload.each(option, function(value, option) {
-                                _setOption(option, value, init);
-                        });
-                } else {
-                        _setOption(option, value, init);
-                }
+                                        // Come up with the list of capabilities that can affect default mode in a multi-mode runtimes
+                                        preferred_caps = normalizeCaps(plupload.extend({}, settings, {
+                                                required_features: true
+                                        }));
+                                } else if (reinitRequired) {
+                                        self.trigger('Destroy');
 
-                if (init) {
-                        // Normalize the list of required capabilities
-                        settings.required_features = normalizeCaps(plupload.extend({}, settings));
-
-                        // Come up with the list of capabilities that can affect default mode in a multi-mode runtimes
-                        preferred_caps = normalizeCaps(plupload.extend({}, settings, {
-                                required_features: true
-                        }));
-                } else if (reinitRequired) {
-                        self.trigger('Destroy');
-                        
-                        initControls.call(self, settings, function(inited) {
-                                if (inited) {
-                                        self.runtime = o.Runtime.getInfo(getRUID()).type;
-                                        self.trigger('Init', { runtime: self.runtime });
-                                        self.trigger('PostInit');
-                                } else {
-                                        self.trigger('Error', {
-                                                code : plupload.INIT_ERROR,
-                                                message : plupload.translate('Init error.')
+                                        initControls.call(self, settings, function(inited) {
+                                                if (inited) {
+                                                        self.runtime = Runtime.getInfo(getRUID()).type;
+                                                        self.trigger('Init', {
+                                                                runtime: self.runtime
+                                                        });
+                                                        self.trigger('PostInit');
+                                                } else {
+                                                        self.trigger('Error', {
+                                                                code: plupload.INIT_ERROR,
+                                                                message: plupload.translate('Init error.')
+                                                        });
+                                                }
                                         });
                                 }
-                        });
-                }
-        }
+                        }
 
 
-        // Internal event handlers
-        function onBeforeUpload(up, file) {
-                // Generate unique target filenames
-                if (up.settings.unique_names) {
-                        var matches = file.name.match(/\.([^.]+)$/), ext = "part";
-                        if (matches) {
-                                ext = matches[1];
+                        // Internal event handlers
+                        function onBeforeUpload(up, file) {
+                                // Generate unique target filenames
+                                if (up.settings.unique_names) {
+                                        var matches = file.name.match(/\.([^.]+)$/),
+                                                ext = "part";
+                                        if (matches) {
+                                                ext = matches[1];
+                                        }
+                                        file.target_name = file.id + '.' + ext;
+                                }
                         }
-                        file.target_name = file.id + '.' + ext;
-                }
-        }
 
 
-        function onUploadFile(up, file) {
-                var url = up.settings.url
-                , chunkSize = up.settings.chunk_size
-                , retries = up.settings.max_retries
-                , features = up.features
-                , offset = 0
-                , blob
-                ;
+                        function onUploadFile(up, file) {
+                                var url = up.settings.url;
+                                var chunkSize = up.settings.chunk_size;
+                                var retries = up.settings.max_retries;
+                                var features = up.features;
+                                var offset = 0;
+                                var blob;
 
-                // make sure we start at a predictable offset
-                if (file.loaded) {
-                        offset = file.loaded = chunkSize ? chunkSize * Math.floor(file.loaded / chunkSize) : 0;
-                }
+                                var runtimeOptions = {
+                                        runtime_order: up.settings.runtimes,
+                                        required_caps: up.settings.required_features,
+                                        preferred_caps: preferred_caps,
+                                        swf_url: up.settings.flash_swf_url,
+                                        xap_url: up.settings.silverlight_xap_url
+                                };
 
-                function handleError() {
-                        if (retries-- > 0) {
-                                delay(uploadNextChunk, 1000);
-                        } else {
-                                file.loaded = offset; // reset all progress
+                                // make sure we start at a predictable offset
+                                if (file.loaded) {
+                                        offset = file.loaded = chunkSize ? chunkSize * Math.floor(file.loaded / chunkSize) : 0;
+                                }
 
-                                up.trigger('Error', {
-                                        code : plupload.HTTP_ERROR,
-                                        message : plupload.translate('HTTP Error.'),
-                                        file : file,
-                                        response : xhr.responseText,
-                                        status : xhr.status,
-                                        responseHeaders: xhr.getAllResponseHeaders()
-                                });
-                        }
-                }
+                                function handleError() {
+                                        if (retries-- > 0) {
+                                                delay(uploadNextChunk, 1000);
+                                        } else {
+                                                file.loaded = offset; // reset all progress
 
-                function uploadNextChunk() {
-                        var chunkBlob, formData, args = {}, curChunkSize;
+                                                up.trigger('Error', {
+                                                        code: plupload.HTTP_ERROR,
+                                                        message: plupload.translate('HTTP Error.'),
+                                                        file: file,
+                                                        response: xhr.responseText,
+                                                        status: xhr.status,
+                                                        responseHeaders: xhr.getAllResponseHeaders()
+                                                });
+                                        }
+                                }
 
-                        // make sure that file wasn't cancelled and upload is not stopped in general
-                        if (file.status !== plupload.UPLOADING || up.state === plupload.STOPPED) {
-                                return;
-                        }
+                                function uploadNextChunk() {
+                                        var chunkBlob, args = {},
+                                                curChunkSize;
 
-                        // send additional 'name' parameter only if required
-                        if (up.settings.send_file_name) {
-                                args.name = file.target_name || file.name;
-                        }
+                                        // make sure that file wasn't cancelled and upload is not stopped in general
+                                        if (file.status !== plupload.UPLOADING || up.state === plupload.STOPPED) {
+                                                return;
+                                        }
 
-                        if (chunkSize && features.chunks && blob.size > chunkSize) { // blob will be of type string if it was loaded in memory 
-                                curChunkSize = Math.min(chunkSize, blob.size - offset);
-                                chunkBlob = blob.slice(offset, offset + curChunkSize);
-                        } else {
-                                curChunkSize = blob.size;
-                                chunkBlob = blob;
-                        }
+                                        // send additional 'name' parameter only if required
+                                        if (up.settings.send_file_name) {
+                                                args.name = file.target_name || file.name;
+                                        }
 
-                        // If chunking is enabled add corresponding args, no matter if file is bigger than chunk or smaller
-                        if (chunkSize && features.chunks) {
-                                // Setup query string arguments
-                                if (up.settings.send_chunk_number) {
-                                        args.chunk = Math.ceil(offset / chunkSize);
-                                        args.chunks = Math.ceil(blob.size / chunkSize);
-                                } else { // keep support for experimental chunk format, just in case
-                                        args.offset = offset;
-                                        args.total = blob.size;
-                                }
-                        }
+                                        if (chunkSize && features.chunks && blob.size > chunkSize) { // blob will be of type string if it was loaded in memory
+                                                curChunkSize = Math.min(chunkSize, blob.size - offset);
+                                                chunkBlob = blob.slice(offset, offset + curChunkSize);
+                                        } else {
+                                                curChunkSize = blob.size;
+                                                chunkBlob = blob;
+                                        }
 
-                        xhr = new o.XMLHttpRequest();
+                                        // If chunking is enabled add corresponding args, no matter if file is bigger than chunk or smaller
+                                        if (chunkSize && features.chunks) {
+                                                // Setup query string arguments
+                                                if (up.settings.send_chunk_number) {
+                                                        args.chunk = Math.ceil(offset / chunkSize);
+                                                        args.chunks = Math.ceil(blob.size / chunkSize);
+                                                } else { // keep support for experimental chunk format, just in case
+                                                        args.offset = offset;
+                                                        args.total = blob.size;
+                                                }
+                                        }
 
-                        // Do we have upload progress support
-                        if (xhr.upload) {
-                                xhr.upload.onprogress = function(e) {
-                                        file.loaded = Math.min(file.size, offset + e.loaded);
-                                        up.trigger('UploadProgress', file);
-                                };
-                        }
-
-                        xhr.onload = function() {
-                                // check if upload made itself through
-                                if (xhr.status >= 400) {
-                                        handleError();
-                                        return;
+                                        if (up.trigger('BeforeChunkUpload', file, args, chunkBlob, offset)) {
+                                                uploadChunk(args, chunkBlob, curChunkSize);
+                                        }
                                 }
 
-                                retries = up.settings.max_retries; // reset the counter
+                                function uploadChunk(args, chunkBlob, curChunkSize) {
+                                        var formData;
 
-                                // Handle chunk response
-                                if (curChunkSize < blob.size) {
-                                        chunkBlob.destroy();
+                                        xhr = new o.xhr.XMLHttpRequest();
 
-                                        offset += curChunkSize;
-                                        file.loaded = Math.min(offset, blob.size);
+                                        // Do we have upload progress support
+                                        if (xhr.upload) {
+                                                xhr.upload.onprogress = function(e) {
+                                                        file.loaded = Math.min(file.size, offset + e.loaded);
+                                                        up.trigger('UploadProgress', file);
+                                                };
+                                        }
 
-                                        up.trigger('ChunkUploaded', file, {
-                                                offset : file.loaded,
-                                                total : blob.size,
-                                                response : xhr.responseText,
-                                                status : xhr.status,
-                                                responseHeaders: xhr.getAllResponseHeaders()
-                                        });
+                                        xhr.onload = function() {
+                                                // check if upload made itself through
+                                                if (xhr.status < 200 || xhr.status >= 400) {
+                                                        handleError();
+                                                        return;
+                                                }
 
-                                        // stock Android browser doesn't fire upload progress events, but in chunking mode we can fake them
-                                        if (o.Env.browser === 'Android Browser') {
-                                                // doesn't harm in general, but is not required anywhere else
-                                                up.trigger('UploadProgress', file);
-                                        } 
-                                } else {
-                                        file.loaded = file.size;
-                                }
+                                                retries = up.settings.max_retries; // reset the counter
 
-                                chunkBlob = formData = null; // Free memory
+                                                // Handle chunk response
+                                                if (curChunkSize < blob.size) {
+                                                        chunkBlob.destroy();
 
-                                // Check if file is uploaded
-                                if (!offset || offset >= blob.size) {
-                                        // If file was modified, destory the copy
-                                        if (file.size != file.origSize) {
-                                                blob.destroy();
-                                                blob = null;
-                                        }
+                                                        offset += curChunkSize;
+                                                        file.loaded = Math.min(offset, blob.size);
 
-                                        up.trigger('UploadProgress', file);
+                                                        up.trigger('ChunkUploaded', file, {
+                                                                offset: file.loaded,
+                                                                total: blob.size,
+                                                                response: xhr.responseText,
+                                                                status: xhr.status,
+                                                                responseHeaders: xhr.getAllResponseHeaders()
+                                                        });
 
-                                        file.status = plupload.DONE;
+                                                        // stock Android browser doesn't fire upload progress events, but in chunking mode we can fake them
+                                                        if (plupload.ua.browser === 'Android Browser') {
+                                                                // doesn't harm in general, but is not required anywhere else
+                                                                up.trigger('UploadProgress', file);
+                                                        }
+                                                } else {
+                                                        file.loaded = file.size;
+                                                }
 
-                                        up.trigger('FileUploaded', file, {
-                                                response : xhr.responseText,
-                                                status : xhr.status,
-                                                responseHeaders: xhr.getAllResponseHeaders()
-                                        });
-                                } else {
-                                        // Still chunks left
-                                        delay(uploadNextChunk, 1); // run detached, otherwise event handlers interfere
-                                }
-                        };
+                                                chunkBlob = formData = null; // Free memory
 
-                        xhr.onerror = function() {
-                                handleError();
-                        };
+                                                // Check if file is uploaded
+                                                if (!offset || offset >= blob.size) {
+                                                        // If file was modified, destory the copy
+                                                        if (file.size != file.origSize) {
+                                                                blob.destroy();
+                                                                blob = null;
+                                                        }
 
-                        xhr.onloadend = function() {
-                                this.destroy();
-                                xhr = null;
-                        };
+                                                        up.trigger('UploadProgress', file);
 
-                        // Build multipart request
-                        if (up.settings.multipart && features.multipart) {
-                                xhr.open("post", url, true);
+                                                        file.status = plupload.DONE;
+                                                        file.completeTimestamp = +new Date();
 
-                                // Set custom headers
-                                plupload.each(up.settings.headers, function(value, name) {
-                                        xhr.setRequestHeader(name, value);
-                                });
+                                                        up.trigger('FileUploaded', file, {
+                                                                response: xhr.responseText,
+                                                                status: xhr.status,
+                                                                responseHeaders: xhr.getAllResponseHeaders()
+                                                        });
+                                                } else {
+                                                        // Still chunks left
+                                                        delay(uploadNextChunk, 1); // run detached, otherwise event handlers interfere
+                                                }
+                                        };
 
-                                formData = new o.FormData();
+                                        xhr.onerror = function() {
+                                                handleError();
+                                        };
 
-                                // Add multipart params
-                                plupload.each(plupload.extend(args, up.settings.multipart_params), function(value, name) {
-                                        formData.append(name, value);
-                                });
+                                        xhr.onloadend = function() {
+                                                this.destroy();
+                                        };
 
-                                // Add file and send it
-                                formData.append(up.settings.file_data_name, chunkBlob);
-                                xhr.send(formData, {
-                                        runtime_order: up.settings.runtimes,
-                                        required_caps: up.settings.required_features,
-                                        preferred_caps: preferred_caps
-                                });
-                        } else {
-                                // if no multipart, send as binary stream
-                                url = plupload.buildUrl(up.settings.url, plupload.extend(args, up.settings.multipart_params));
+                                        // Build multipart request
+                                        if (up.settings.multipart && features.multipart) {
+                                                xhr.open(up.settings.http_method, url, true);
 
-                                xhr.open("post", url, true);
+                                                // Set custom headers
+                                                plupload.each(up.settings.headers, function(value, name) {
+                                                        xhr.setRequestHeader(name, value);
+                                                });
 
-                                xhr.setRequestHeader('Content-Type', 'application/octet-stream'); // Binary stream header
+                                                formData = new o.xhr.FormData();
 
-                                // Set custom headers
-                                plupload.each(up.settings.headers, function(value, name) {
-                                        xhr.setRequestHeader(name, value);
-                                });
+                                                // Add multipart params
+                                                plupload.each(plupload.extend(args, up.settings.multipart_params), function(value, name) {
+                                                        formData.append(name, value);
+                                                });
 
-                                xhr.send(chunkBlob, {
-                                        runtime_order: up.settings.runtimes,
-                                        required_caps: up.settings.required_features,
-                                        preferred_caps: preferred_caps
-                                });
-                        }
-                }
+                                                // Add file and send it
+                                                formData.append(up.settings.file_data_name, chunkBlob);
+                                                xhr.send(formData, runtimeOptions);
+                                        } else {
+                                                // if no multipart, send as binary stream
+                                                url = plupload.buildUrl(up.settings.url, plupload.extend(args, up.settings.multipart_params));
 
-                blob = file.getSource();
+                                                xhr.open(up.settings.http_method, url, true);
 
-                // Start uploading chunks
-                if (up.settings.resize.enabled && runtimeCan(blob, 'send_binary_string') && !!~o.inArray(blob.type, ['image/jpeg', 'image/png'])) {
-                        // Resize if required
-                        resizeImage.call(this, blob, up.settings.resize, function(resizedBlob) {
-                                blob = resizedBlob;
-                                file.size = resizedBlob.size;
-                                uploadNextChunk();
-                        });
-                } else {
-                        uploadNextChunk();
-                }
-        }
+                                                // Set custom headers
+                                                plupload.each(up.settings.headers, function(value, name) {
+                                                        xhr.setRequestHeader(name, value);
+                                                });
 
+                                                // do not set Content-Type, if it was defined previously (see #1203)
+                                                if (!xhr.hasRequestHeader('Content-Type')) {
+                                                        xhr.setRequestHeader('Content-Type', 'application/octet-stream'); // Binary stream header
+                                                }
 
-        function onUploadProgress(up, file) {
-                calcFile(file);
-        }
+                                                xhr.send(chunkBlob, runtimeOptions);
+                                        }
+                                }
 
 
-        function onStateChanged(up) {
-                if (up.state == plupload.STARTED) {
-                        // Get start time to calculate bps
-                        startTime = (+new Date());
-                } else if (up.state == plupload.STOPPED) {
-                        // Reset currently uploading files
-                        for (var i = up.files.length - 1; i >= 0; i--) {
-                                if (up.files[i].status == plupload.UPLOADING) {
-                                        up.files[i].status = plupload.QUEUED;
-                                        calc();
+                                blob = file.getSource();
+
+                                // Start uploading chunks
+                                if (!plupload.isEmptyObj(up.settings.resize) && plupload.inArray(blob.type, ['image/jpeg', 'image/png']) !== -1) {
+                                        // Resize if required
+                                        resizeImage(blob, up.settings.resize, runtimeOptions, function(resizedBlob) {
+                                                blob = resizedBlob;
+                                                file.size = resizedBlob.size;
+                                                uploadNextChunk();
+                                        });
+                                } else {
+                                        uploadNextChunk();
                                 }
                         }
-                }
-        }
 
 
-        function onCancelUpload() {
-                if (xhr) {
-                        xhr.abort();
-                }
-        }
+                        function onUploadProgress(up, file) {
+                                calcFile(file);
+                        }
 
 
-        function onFileUploaded(up) {
-                calc();
+                        function onStateChanged(up) {
+                                if (up.state == plupload.STARTED) {
+                                        // Get start time to calculate bps
+                                        startTime = (+new Date());
+                                } else if (up.state == plupload.STOPPED) {
+                                        // Reset currently uploading files
+                                        for (var i = up.files.length - 1; i >= 0; i--) {
+                                                if (up.files[i].status == plupload.UPLOADING) {
+                                                        up.files[i].status = plupload.QUEUED;
+                                                        calc();
+                                                }
+                                        }
+                                }
+                        }
 
-                // Upload next file but detach it from the error event
-                // since other custom listeners might want to stop the queue
-                delay(function() {
-                        uploadNext.call(up);
-                }, 1);
-        }
 
+                        function onCancelUpload() {
+                                if (xhr) {
+                                        xhr.abort();
+                                }
+                        }
 
-        function onError(up, err) {
-                if (err.code === plupload.INIT_ERROR) {
-                        up.destroy();
-                }
-                // Set failed status if an error occured on a file
-                else if (err.code === plupload.HTTP_ERROR) {
-                        err.file.status = plupload.FAILED;
-                        calcFile(err.file);
 
-                        // Upload next file but detach it from the error event
-                        // since other custom listeners might want to stop the queue
-                        if (up.state == plupload.STARTED) { // upload in progress
-                                up.trigger('CancelUpload');
+                        function onFileUploaded(up) {
+                                calc();
+
+                                // Upload next file but detach it from the error event
+                                // since other custom listeners might want to stop the queue
                                 delay(function() {
                                         uploadNext.call(up);
                                 }, 1);
                         }
-                }
-        }
 
 
-        function onDestroy(up) {
-                up.stop();
+                        function onError(up, err) {
+                                if (err.code === plupload.INIT_ERROR) {
+                                        up.destroy();
+                                }
+                                // Set failed status if an error occured on a file
+                                else if (err.code === plupload.HTTP_ERROR) {
+                                        err.file.status = plupload.FAILED;
+                                        err.file.completeTimestamp = +new Date();
+                                        calcFile(err.file);
 
-                // Purge the queue
-                plupload.each(files, function(file) {
-                        file.destroy();
-                });
-                files = [];
+                                        // Upload next file but detach it from the error event
+                                        // since other custom listeners might want to stop the queue
+                                        if (up.state == plupload.STARTED) { // upload in progress
+                                                up.trigger('CancelUpload');
+                                                delay(function() {
+                                                        uploadNext.call(up);
+                                                }, 1);
+                                        }
+                                }
+                        }
 
-                if (fileInputs.length) {
-                        plupload.each(fileInputs, function(fileInput) {
-                                fileInput.destroy();
-                        });
-                        fileInputs = [];
-                }
 
-                if (fileDrops.length) {
-                        plupload.each(fileDrops, function(fileDrop) {
-                                fileDrop.destroy();
-                        });
-                        fileDrops = [];
-                }
+                        function onDestroy(up) {
+                                up.stop();
 
-                preferred_caps = {};
-                disabled = false;
-                startTime = xhr = null;
-                total.reset();
-        }
+                                // Purge the queue
+                                plupload.each(files, function(file) {
+                                        file.destroy();
+                                });
+                                files = [];
 
+                                if (fileInputs.length) {
+                                        plupload.each(fileInputs, function(fileInput) {
+                                                fileInput.destroy();
+                                        });
+                                        fileInputs = [];
+                                }
 
-        // Default settings
-        settings = {
-                runtimes: o.Runtime.order,
-                max_retries: 0,
-                chunk_size: 0,
-                multipart: true,
-                multi_selection: true,
-                file_data_name: 'file',
-                filters: {
-                        mime_types: [],
-                        prevent_duplicates: false,
-                        max_file_size: 0
-                },
-                resize: {
-                        enabled: false,
-                        preserve_headers: true,
-                        crop: false
-                },
-                send_file_name: true,
-                send_chunk_number: true
-        };
+                                if (fileDrops.length) {
+                                        plupload.each(fileDrops, function(fileDrop) {
+                                                fileDrop.destroy();
+                                        });
+                                        fileDrops = [];
+                                }
 
-        
-        setOption.call(this, options, null, true);
+                                preferred_caps = {};
+                                disabled = false;
+                                startTime = xhr = null;
+                                total.reset();
+                        }
 
-        // Inital total state
-        total = new plupload.QueueProgress(); 
 
-        // Add public methods
-        plupload.extend(this, {
+                        // Default settings
+                        settings = {
+                                chunk_size: 0,
+                                file_data_name: 'file',
+                                filters: {
+                                        mime_types: [],
+                                        max_file_size: 0,
+                                        prevent_duplicates: false,
+                                        prevent_empty: true
+                                },
+                                flash_swf_url: 'js/Moxie.swf',
+                                http_method: 'POST',
+                                max_retries: 0,
+                                multipart: true,
+                                multi_selection: true,
+                                resize: false,
+                                runtimes: Runtime.order,
+                                send_file_name: true,
+                                send_chunk_number: true,
+                                silverlight_xap_url: 'js/Moxie.xap'
+                        };
 
-                /**
-                 * Unique id for the Uploader instance.
-                 *
-                 * @property id
-                 * @type String
-                 */
-                id : uid,
-                uid : uid, // mOxie uses this to differentiate between event targets
 
-                /**
-                 * Current state of the total uploading progress. This one can either be plupload.STARTED or plupload.STOPPED.
-                 * These states are controlled by the stop/start methods. The default value is STOPPED.
-                 *
-                 * @property state
-                 * @type Number
-                 */
-                state : plupload.STOPPED,
+                        setOption.call(this, options, null, true);
 
-                /**
-                 * Map of features that are available for the uploader runtime. Features will be filled
-                 * before the init event is called, these features can then be used to alter the UI for the end user.
-                 * Some of the current features that might be in this map is: dragdrop, chunks, jpgresize, pngresize.
-                 *
-                 * @property features
-                 * @type Object
-                 */
-                features : {},
+                        // Inital total state
+                        total = new plupload.QueueProgress();
 
-                /**
-                 * Current runtime name.
-                 *
-                 * @property runtime
-                 * @type String
-                 */
-                runtime : null,
+                        // Add public methods
+                        plupload.extend(this, {
 
-                /**
-                 * Current upload queue, an array of File instances.
-                 *
-                 * @property files
-                 * @type Array
-                 * @see plupload.File
-                 */
-                files : files,
+                                /**
+                                 * Unique id for the Uploader instance.
+                                 *
+                                 * @property id
+                                 * @type String
+                                 */
+                                id: uid,
+                                uid: uid, // mOxie uses this to differentiate between event targets
 
-                /**
-                 * Object with name/value settings.
-                 *
-                 * @property settings
-                 * @type Object
-                 */
-                settings : settings,
+                                /**
+                                 * Current state of the total uploading progress. This one can either be plupload.STARTED or plupload.STOPPED.
+                                 * These states are controlled by the stop/start methods. The default value is STOPPED.
+                                 *
+                                 * @property state
+                                 * @type Number
+                                 */
+                                state: plupload.STOPPED,
 
-                /**
-                 * Total progess information. How many files has been uploaded, total percent etc.
-                 *
-                 * @property total
-                 * @type plupload.QueueProgress
-                 */
-                total : total,
+                                /**
+                                 * Map of features that are available for the uploader runtime. Features will be filled
+                                 * before the init event is called, these features can then be used to alter the UI for the end user.
+                                 * Some of the current features that might be in this map is: dragdrop, chunks, jpgresize, pngresize.
+                                 *
+                                 * @property features
+                                 * @type Object
+                                 */
+                                features: {},
 
+                                /**
+                                 * Current runtime name.
+                                 *
+                                 * @property runtime
+                                 * @type String
+                                 */
+                                runtime: null,
 
-                /**
-                 * Initializes the Uploader instance and adds internal event listeners.
-                 *
-                 * @method init
-                 */
-                init : function() {
-                        var self = this, opt, preinitOpt, err;
-                        
-                        preinitOpt = self.getOption('preinit');
-                        if (typeof(preinitOpt) == "function") {
-                                preinitOpt(self);
-                        } else {
-                                plupload.each(preinitOpt, function(func, name) {
-                                        self.bind(name, func);
-                                });
-                        }
+                                /**
+                                 * Current upload queue, an array of File instances.
+                                 *
+                                 * @property files
+                                 * @type Array
+                                 * @see plupload.File
+                                 */
+                                files: files,
 
-                        bindEventListeners.call(self);
+                                /**
+                                 * Object with name/value settings.
+                                 *
+                                 * @property settings
+                                 * @type Object
+                                 */
+                                settings: settings,
 
-                        // Check for required options
-                        plupload.each(['container', 'browse_button', 'drop_element'], function(el) {
-                                if (self.getOption(el) === null) {
-                                        err = {
-                                                code : plupload.INIT_ERROR,
-                                                message : plupload.translate("'%' specified, but cannot be found.")
-                                        }
-                                        return false;
-                                }
-                        });
+                                /**
+                                 * Total progess information. How many files has been uploaded, total percent etc.
+                                 *
+                                 * @property total
+                                 * @type plupload.QueueProgress
+                                 */
+                                total: total,
 
-                        if (err) {
-                                return self.trigger('Error', err);
-                        }
 
+                                /**
+                                 * Initializes the Uploader instance and adds internal event listeners.
+                                 *
+                                 * @method init
+                                 */
+                                init: function() {
+                                        var self = this,
+                                                opt, preinitOpt, err;
 
-                        if (!settings.browse_button && !settings.drop_element) {
-                                return self.trigger('Error', {
-                                        code : plupload.INIT_ERROR,
-                                        message : plupload.translate("You must specify either 'browse_button' or 'drop_element'.")
-                                });
-                        }
+                                        preinitOpt = self.getOption('preinit');
+                                        if (typeof(preinitOpt) == "function") {
+                                                preinitOpt(self);
+                                        } else {
+                                                plupload.each(preinitOpt, function(func, name) {
+                                                        self.bind(name, func);
+                                                });
+                                        }
 
+                                        bindEventListeners.call(self);
 
-                        initControls.call(self, settings, function(inited) {
-                                var initOpt = self.getOption('init');
-                                if (typeof(initOpt) == "function") {
-                                        initOpt(self);
-                                } else {
-                                        plupload.each(initOpt, function(func, name) {
-                                                self.bind(name, func);
+                                        // Check for required options
+                                        plupload.each(['container', 'browse_button', 'drop_element'], function(el) {
+                                                if (self.getOption(el) === null) {
+                                                        err = {
+                                                                code: plupload.INIT_ERROR,
+                                                                message: plupload.sprintf(plupload.translate("%s specified, but cannot be found."), el)
+                                                        }
+                                                        return false;
+                                                }
                                         });
-                                }
 
-                                if (inited) {
-                                        self.runtime = o.Runtime.getInfo(getRUID()).type;
-                                        self.trigger('Init', { runtime: self.runtime });
-                                        self.trigger('PostInit');
-                                } else {
-                                        self.trigger('Error', {
-                                                code : plupload.INIT_ERROR,
-                                                message : plupload.translate('Init error.')
-                                        });
-                                }
-                        });
-                },
+                                        if (err) {
+                                                return self.trigger('Error', err);
+                                        }
 
-                /**
-                 * Set the value for the specified option(s).
-                 *
-                 * @method setOption
-                 * @since 2.1
-                 * @param {String|Object} option Name of the option to change or the set of key/value pairs
-                 * @param {Mixed} [value] Value for the option (is ignored, if first argument is object)
-                 */
-                setOption: function(option, value) {
-                        setOption.call(this, option, value, !this.runtime); // until runtime not set we do not need to reinitialize
-                },
 
-                /**
-                 * Get the value for the specified option or the whole configuration, if not specified.
-                 * 
-                 * @method getOption
-                 * @since 2.1
-                 * @param {String} [option] Name of the option to get
-                 * @return {Mixed} Value for the option or the whole set
-                 */
-                getOption: function(option) {
-                        if (!option) {
-                                return settings;
-                        }
-                        return settings[option];
-                },
+                                        if (!settings.browse_button && !settings.drop_element) {
+                                                return self.trigger('Error', {
+                                                        code: plupload.INIT_ERROR,
+                                                        message: plupload.translate("You must specify either browse_button or drop_element.")
+                                                });
+                                        }
 
-                /**
-                 * Refreshes the upload instance by dispatching out a refresh event to all runtimes.
-                 * This would for example reposition flash/silverlight shims on the page.
-                 *
-                 * @method refresh
-                 */
-                refresh : function() {
-                        if (fileInputs.length) {
-                                plupload.each(fileInputs, function(fileInput) {
-                                        fileInput.trigger('Refresh');
-                                });
-                        }
-                        this.trigger('Refresh');
-                },
 
-                /**
-                 * Starts uploading the queued files.
-                 *
-                 * @method start
-                 */
-                start : function() {
-                        if (this.state != plupload.STARTED) {
-                                this.state = plupload.STARTED;
-                                this.trigger('StateChanged');
+                                        initControls.call(self, settings, function(inited) {
+                                                var initOpt = self.getOption('init');
+                                                if (typeof(initOpt) == "function") {
+                                                        initOpt(self);
+                                                } else {
+                                                        plupload.each(initOpt, function(func, name) {
+                                                                self.bind(name, func);
+                                                        });
+                                                }
 
-                                uploadNext.call(this);
-                        }
-                },
+                                                if (inited) {
+                                                        self.runtime = Runtime.getInfo(getRUID()).type;
+                                                        self.trigger('Init', {
+                                                                runtime: self.runtime
+                                                        });
+                                                        self.trigger('PostInit');
+                                                } else {
+                                                        self.trigger('Error', {
+                                                                code: plupload.INIT_ERROR,
+                                                                message: plupload.translate('Init error.')
+                                                        });
+                                                }
+                                        });
+                                },
 
-                /**
-                 * Stops the upload of the queued files.
-                 *
-                 * @method stop
-                 */
-                stop : function() {
-                        if (this.state != plupload.STOPPED) {
-                                this.state = plupload.STOPPED;
-                                this.trigger('StateChanged');
-                                this.trigger('CancelUpload');
-                        }
-                },
+                                /**
+                                 * Set the value for the specified option(s).
+                                 *
+                                 * @method setOption
+                                 * @since 2.1
+                                 * @param {String|Object} option Name of the option to change or the set of key/value pairs
+                                 * @param {Mixed} [value] Value for the option (is ignored, if first argument is object)
+                                 */
+                                setOption: function(option, value) {
+                                        setOption.call(this, option, value, !this.runtime); // until runtime not set we do not need to reinitialize
+                                },
 
+                                /**
+                                 * Get the value for the specified option or the whole configuration, if not specified.
+                                 *
+                                 * @method getOption
+                                 * @since 2.1
+                                 * @param {String} [option] Name of the option to get
+                                 * @return {Mixed} Value for the option or the whole set
+                                 */
+                                getOption: function(option) {
+                                        if (!option) {
+                                                return settings;
+                                        }
+                                        return settings[option];
+                                },
 
-                /**
-                 * Disables/enables browse button on request.
-                 *
-                 * @method disableBrowse
-                 * @param {Boolean} disable Whether to disable or enable (default: true)
-                 */
-                disableBrowse : function() {
-                        disabled = arguments[0] !== undef ? arguments[0] : true;
+                                /**
+                                 * Refreshes the upload instance by dispatching out a refresh event to all runtimes.
+                                 * This would for example reposition flash/silverlight shims on the page.
+                                 *
+                                 * @method refresh
+                                 */
+                                refresh: function() {
+                                        if (fileInputs.length) {
+                                                plupload.each(fileInputs, function(fileInput) {
+                                                        fileInput.trigger('Refresh');
+                                                });
+                                        }
+                                        this.trigger('Refresh');
+                                },
 
-                        if (fileInputs.length) {
-                                plupload.each(fileInputs, function(fileInput) {
-                                        fileInput.disable(disabled);
-                                });
-                        }
+                                /**
+                                 * Starts uploading the queued files.
+                                 *
+                                 * @method start
+                                 */
+                                start: function() {
+                                        if (this.state != plupload.STARTED) {
+                                                this.state = plupload.STARTED;
+                                                this.trigger('StateChanged');
 
-                        this.trigger('DisableBrowse', disabled);
-                },
+                                                uploadNext.call(this);
+                                        }
+                                },
 
-                /**
-                 * Returns the specified file object by id.
-                 *
-                 * @method getFile
-                 * @param {String} id File id to look for.
-                 * @return {plupload.File} File object or undefined if it wasn't found;
-                 */
-                getFile : function(id) {
-                        var i;
-                        for (i = files.length - 1; i >= 0; i--) {
-                                if (files[i].id === id) {
-                                        return files[i];
-                                }
-                        }
-                },
+                                /**
+                                 * Stops the upload of the queued files.
+                                 *
+                                 * @method stop
+                                 */
+                                stop: function() {
+                                        if (this.state != plupload.STOPPED) {
+                                                this.state = plupload.STOPPED;
+                                                this.trigger('StateChanged');
+                                                this.trigger('CancelUpload');
+                                        }
+                                },
 
-                /**
-                 * Adds file to the queue programmatically. Can be native file, instance of Plupload.File,
-                 * instance of mOxie.File, input[type="file"] element, or array of these. Fires FilesAdded, 
-                 * if any files were added to the queue. Otherwise nothing happens.
-                 *
-                 * @method addFile
-                 * @since 2.0
-                 * @param {plupload.File|mOxie.File|File|Node|Array} file File or files to add to the queue.
-                 * @param {String} [fileName] If specified, will be used as a name for the file
-                 */
-                addFile : function(file, fileName) {
-                        var self = this
-                        , queue = [] 
-                        , filesAdded = []
-                        , ruid
-                        ;
 
-                        function filterFile(file, cb) {
-                                var queue = [];
-                                o.each(self.settings.filters, function(rule, name) {
-                                        if (fileFilters[name]) {
-                                                queue.push(function(cb) {
-                                                        fileFilters[name].call(self, rule, file, function(res) {
-                                                                cb(!res);
-                                                        });
+                                /**
+                                 * Disables/enables browse button on request.
+                                 *
+                                 * @method disableBrowse
+                                 * @param {Boolean} disable Whether to disable or enable (default: true)
+                                 */
+                                disableBrowse: function() {
+                                        disabled = arguments[0] !== undef ? arguments[0] : true;
+
+                                        if (fileInputs.length) {
+                                                plupload.each(fileInputs, function(fileInput) {
+                                                        fileInput.disable(disabled);
                                                 });
                                         }
-                                });
-                                o.inSeries(queue, cb);
-                        }
 
-                        /**
-                         * @method resolveFile
-                         * @private
-                         * @param {o.File|o.Blob|plupload.File|File|Blob|input[type="file"]} file
-                         */
-                        function resolveFile(file) {
-                                var type = o.typeOf(file);
+                                        this.trigger('DisableBrowse', disabled);
+                                },
 
-                                // o.File
-                                if (file instanceof o.File) { 
-                                        if (!file.ruid && !file.isDetached()) {
-                                                if (!ruid) { // weird case
-                                                        return false;
+                                /**
+                                 * Returns the specified file object by id.
+                                 *
+                                 * @method getFile
+                                 * @param {String} id File id to look for.
+                                 * @return {plupload.File} File object or undefined if it wasn't found;
+                                 */
+                                getFile: function(id) {
+                                        var i;
+                                        for (i = files.length - 1; i >= 0; i--) {
+                                                if (files[i].id === id) {
+                                                        return files[i];
                                                 }
-                                                file.ruid = ruid;
-                                                file.connectRuntime(ruid);
                                         }
-                                        resolveFile(new plupload.File(file));
-                                }
-                                // o.Blob 
-                                else if (file instanceof o.Blob) {
-                                        resolveFile(file.getSource());
-                                        file.destroy();
-                                } 
-                                // plupload.File - final step for other branches
-                                else if (file instanceof plupload.File) {
-                                        if (fileName) {
-                                                file.name = fileName;
+                                },
+
+                                /**
+                                 * Adds file to the queue programmatically. Can be native file, instance of Plupload.File,
+                                 * instance of mOxie.File, input[type="file"] element, or array of these. Fires FilesAdded,
+                                 * if any files were added to the queue. Otherwise nothing happens.
+                                 *
+                                 * @method addFile
+                                 * @since 2.0
+                                 * @param {plupload.File|mOxie.File|File|Node|Array} file File or files to add to the queue.
+                                 * @param {String} [fileName] If specified, will be used as a name for the file
+                                 */
+                                addFile: function(file, fileName) {
+                                        var self = this,
+                                                queue = [],
+                                                filesAdded = [],
+                                                ruid;
+
+                                        function filterFile(file, cb) {
+                                                var queue = [];
+                                                plupload.each(self.settings.filters, function(rule, name) {
+                                                        if (fileFilters[name]) {
+                                                                queue.push(function(cb) {
+                                                                        fileFilters[name].call(self, rule, file, function(res) {
+                                                                                cb(!res);
+                                                                        });
+                                                                });
+                                                        }
+                                                });
+                                                plupload.inSeries(queue, cb);
                                         }
-                                        
-                                        queue.push(function(cb) {
-                                                // run through the internal and user-defined filters, if any
-                                                filterFile(file, function(err) {
-                                                        if (!err) {
-                                                                // make files available for the filters by updating the main queue directly
-                                                                files.push(file);
-                                                                // collect the files that will be passed to FilesAdded event
-                                                                filesAdded.push(file); 
 
-                                                                self.trigger("FileFiltered", file);
+                                        /**
+                                         * @method resolveFile
+                                         * @private
+                                         * @param {moxie.file.File|moxie.file.Blob|plupload.File|File|Blob|input[type="file"]} file
+                                         */
+                                        function resolveFile(file) {
+                                                var type = plupload.typeOf(file);
+
+                                                // moxie.file.File
+                                                if (file instanceof o.file.File) {
+                                                        if (!file.ruid && !file.isDetached()) {
+                                                                if (!ruid) { // weird case
+                                                                        return false;
+                                                                }
+                                                                file.ruid = ruid;
+                                                                file.connectRuntime(ruid);
                                                         }
-                                                        delay(cb, 1); // do not build up recursions or eventually we might hit the limits
+                                                        resolveFile(new plupload.File(file));
+                                                }
+                                                // moxie.file.Blob
+                                                else if (file instanceof o.file.Blob) {
+                                                        resolveFile(file.getSource());
+                                                        file.destroy();
+                                                }
+                                                // plupload.File - final step for other branches
+                                                else if (file instanceof plupload.File) {
+                                                        if (fileName) {
+                                                                file.name = fileName;
+                                                        }
+
+                                                        queue.push(function(cb) {
+                                                                // run through the internal and user-defined filters, if any
+                                                                filterFile(file, function(err) {
+                                                                        if (!err) {
+                                                                                // make files available for the filters by updating the main queue directly
+                                                                                files.push(file);
+                                                                                // collect the files that will be passed to FilesAdded event
+                                                                                filesAdded.push(file);
+
+                                                                                self.trigger("FileFiltered", file);
+                                                                        }
+                                                                        delay(cb, 1); // do not build up recursions or eventually we might hit the limits
+                                                                });
+                                                        });
+                                                }
+                                                // native File or blob
+                                                else if (plupload.inArray(type, ['file', 'blob']) !== -1) {
+                                                        resolveFile(new o.file.File(null, file));
+                                                }
+                                                // input[type="file"]
+                                                else if (type === 'node' && plupload.typeOf(file.files) === 'filelist') {
+                                                        // if we are dealing with input[type="file"]
+                                                        plupload.each(file.files, resolveFile);
+                                                }
+                                                // mixed array of any supported types (see above)
+                                                else if (type === 'array') {
+                                                        fileName = null; // should never happen, but unset anyway to avoid funny situations
+                                                        plupload.each(file, resolveFile);
+                                                }
+                                        }
+
+                                        ruid = getRUID();
+
+                                        resolveFile(file);
+
+                                        if (queue.length) {
+                                                plupload.inSeries(queue, function() {
+                                                        // if any files left after filtration, trigger FilesAdded
+                                                        if (filesAdded.length) {
+                                                                self.trigger("FilesAdded", filesAdded);
+                                                        }
                                                 });
-                                        });
-                                } 
-                                // native File or blob
-                                else if (o.inArray(type, ['file', 'blob']) !== -1) {
-                                        resolveFile(new o.File(null, file));
-                                } 
-                                // input[type="file"]
-                                else if (type === 'node' && o.typeOf(file.files) === 'filelist') {
-                                        // if we are dealing with input[type="file"]
-                                        o.each(file.files, resolveFile);
-                                } 
-                                // mixed array of any supported types (see above)
-                                else if (type === 'array') {
-                                        fileName = null; // should never happen, but unset anyway to avoid funny situations
-                                        o.each(file, resolveFile);
-                                }
-                        }
+                                        }
+                                },
 
-                        ruid = getRUID();
-                        
-                        resolveFile(file);
+                                /**
+                                 * Removes a specific file.
+                                 *
+                                 * @method removeFile
+                                 * @param {plupload.File|String} file File to remove from queue.
+                                 */
+                                removeFile: function(file) {
+                                        var id = typeof(file) === 'string' ? file : file.id;
 
-                        if (queue.length) {
-                                o.inSeries(queue, function() {
-                                        // if any files left after filtration, trigger FilesAdded
-                                        if (filesAdded.length) {
-                                                self.trigger("FilesAdded", filesAdded);
+                                        for (var i = files.length - 1; i >= 0; i--) {
+                                                if (files[i].id === id) {
+                                                        return this.splice(i, 1)[0];
+                                                }
                                         }
-                                });
-                        }
-                },
+                                },
 
-                /**
-                 * Removes a specific file.
-                 *
-                 * @method removeFile
-                 * @param {plupload.File|String} file File to remove from queue.
-                 */
-                removeFile : function(file) {
-                        var id = typeof(file) === 'string' ? file : file.id;
+                                /**
+                                 * Removes part of the queue and returns the files removed. This will also trigger the
+                                 * FilesRemoved and QueueChanged events.
+                                 *
+                                 * @method splice
+                                 * @param {Number} [start=0] Start index to remove from.
+                                 * @param {Number} [length] Number of files to remove (defaults to number of files in the queue).
+                                 * @return {Array} Array of files that was removed.
+                                 */
+                                splice: function(start, length) {
+                                        // Splice and trigger events
+                                        var removed = files.splice(start === undef ? 0 : start, length === undef ? files.length : length);
 
-                        for (var i = files.length - 1; i >= 0; i--) {
-                                if (files[i].id === id) {
-                                        return this.splice(i, 1)[0];
-                                }
-                        }
-                },
+                                        // if upload is in progress we need to stop it and restart after files are removed
+                                        var restartRequired = false;
+                                        if (this.state == plupload.STARTED) { // upload in progress
+                                                plupload.each(removed, function(file) {
+                                                        if (file.status === plupload.UPLOADING) {
+                                                                restartRequired = true; // do not restart, unless file that is being removed is uploading
+                                                                return false;
+                                                        }
+                                                });
 
-                /**
-                 * Removes part of the queue and returns the files removed. This will also trigger the FilesRemoved and QueueChanged events.
-                 *
-                 * @method splice
-                 * @param {Number} start (Optional) Start index to remove from.
-                 * @param {Number} length (Optional) Lengh of items to remove.
-                 * @return {Array} Array of files that was removed.
-                 */
-                splice : function(start, length) {
-                        // Splice and trigger events
-                        var removed = files.splice(start === undef ? 0 : start, length === undef ? files.length : length);
+                                                if (restartRequired) {
+                                                        this.stop();
+                                                }
+                                        }
 
-                        // if upload is in progress we need to stop it and restart after files are removed
-                        var restartRequired = false;
-                        if (this.state == plupload.STARTED) { // upload in progress
-                                plupload.each(removed, function(file) {
-                                        if (file.status === plupload.UPLOADING) {
-                                                restartRequired = true; // do not restart, unless file that is being removed is uploading
-                                                return false;
+                                        this.trigger("FilesRemoved", removed);
+
+                                        // Dispose any resources allocated by those files
+                                        plupload.each(removed, function(file) {
+                                                file.destroy();
+                                        });
+
+                                        if (restartRequired) {
+                                                this.start();
                                         }
-                                });
-                                
-                                if (restartRequired) {
-                                        this.stop();
-                                }
-                        }
 
-                        this.trigger("FilesRemoved", removed);
+                                        return removed;
+                                },
 
-                        // Dispose any resources allocated by those files
-                        plupload.each(removed, function(file) {
-                                file.destroy();
-                        });
-                        
-                        if (restartRequired) {
-                                this.start();
-                        }
+                                /**
+                                Dispatches the specified event name and its arguments to all listeners.
 
-                        return removed;
-                },
+                                @method trigger
+                                @param {String} name Event name to fire.
+                                @param {Object..} Multiple arguments to pass along to the listener functions.
+                                */
 
-                /**
-                Dispatches the specified event name and its arguments to all listeners.
+                                // override the parent method to match Plupload-like event logic
+                                dispatchEvent: function(type) {
+                                        var list, args, result;
 
-                @method trigger
-                @param {String} name Event name to fire.
-                @param {Object..} Multiple arguments to pass along to the listener functions.
-                */
+                                        type = type.toLowerCase();
 
-                // override the parent method to match Plupload-like event logic
-                dispatchEvent: function(type) {
-                        var list, args, result;
-                                                
-                        type = type.toLowerCase();
-                                                        
-                        list = this.hasEventListener(type);
+                                        list = this.hasEventListener(type);
 
-                        if (list) {
-                                // sort event list by priority
-                                list.sort(function(a, b) { return b.priority - a.priority; });
-                                
-                                // first argument should be current plupload.Uploader instance
-                                args = [].slice.call(arguments);
-                                args.shift();
-                                args.unshift(this);
+                                        if (list) {
+                                                // sort event list by priority
+                                                list.sort(function(a, b) {
+                                                        return b.priority - a.priority;
+                                                });
 
-                                for (var i = 0; i < list.length; i++) {
-                                        // Fire event, break chain if false is returned
-                                        if (list[i].fn.apply(list[i].scope, args) === false) {
-                                                return false;
+                                                // first argument should be current plupload.Uploader instance
+                                                args = [].slice.call(arguments);
+                                                args.shift();
+                                                args.unshift(this);
+
+                                                for (var i = 0; i < list.length; i++) {
+                                                        // Fire event, break chain if false is returned
+                                                        if (list[i].fn.apply(list[i].scope, args) === false) {
+                                                                return false;
+                                                        }
+                                                }
                                         }
-                                }
-                        }
-                        return true;
-                },
+                                        return true;
+                                },
 
-                /**
-                Check whether uploader has any listeners to the specified event.
+                                /**
+                                Check whether uploader has any listeners to the specified event.
 
-                @method hasEventListener
-                @param {String} name Event name to check for.
-                */
+                                @method hasEventListener
+                                @param {String} name Event name to check for.
+                                */
 
 
-                /**
-                Adds an event listener by name.
+                                /**
+                                Adds an event listener by name.
 
-                @method bind
-                @param {String} name Event name to listen for.
-                @param {function} fn Function to call ones the event gets fired.
-                @param {Object} [scope] Optional scope to execute the specified function in.
-                @param {Number} [priority=0] Priority of the event handler - handlers with higher priorities will be called first
-                */
-                bind: function(name, fn, scope, priority) {
-                        // adapt moxie EventTarget style to Plupload-like
-                        plupload.Uploader.prototype.bind.call(this, name, fn, priority, scope);
-                },
+                                @method bind
+                                @param {String} name Event name to listen for.
+                                @param {function} fn Function to call ones the event gets fired.
+                                @param {Object} [scope] Optional scope to execute the specified function in.
+                                @param {Number} [priority=0] Priority of the event handler - handlers with higher priorities will be called first
+                                */
+                                bind: function(name, fn, scope, priority) {
+                                        // adapt moxie EventTarget style to Plupload-like
+                                        plupload.Uploader.prototype.bind.call(this, name, fn, priority, scope);
+                                },
 
-                /**
-                Removes the specified event listener.
+                                /**
+                                Removes the specified event listener.
 
-                @method unbind
-                @param {String} name Name of event to remove.
-                @param {function} fn Function to remove from listener.
-                */
+                                @method unbind
+                                @param {String} name Name of event to remove.
+                                @param {function} fn Function to remove from listener.
+                                */
 
-                /**
-                Removes all event listeners.
+                                /**
+                                Removes all event listeners.
 
-                @method unbindAll
-                */
+                                @method unbindAll
+                                */
 
 
+                                /**
+                                 * Destroys Plupload instance and cleans after itself.
+                                 *
+                                 * @method destroy
+                                 */
+                                destroy: function() {
+                                        this.trigger('Destroy');
+                                        settings = total = null; // purge these exclusively
+                                        this.unbindAll();
+                                }
+                        });
+                };
+
+                plupload.Uploader.prototype = o.core.EventTarget.instance;
+
                 /**
-                 * Destroys Plupload instance and cleans after itself.
+                 * Constructs a new file instance.
                  *
-                 * @method destroy
+                 * @class File
+                 * @constructor
+                 *
+                 * @param {Object} file Object containing file properties
+                 * @param {String} file.name Name of the file.
+                 * @param {Number} file.size File size.
                  */
-                destroy : function() {
-                        this.trigger('Destroy');
-                        settings = total = null; // purge these exclusively
-                        this.unbindAll();
-                }
-        });
-};
+                plupload.File = (function() {
+                        var filepool = {};
 
-plupload.Uploader.prototype = o.EventTarget.instance;
+                        function PluploadFile(file) {
 
-/**
- * Constructs a new file instance.
- *
- * @class File
- * @constructor
- * 
- * @param {Object} file Object containing file properties
- * @param {String} file.name Name of the file.
- * @param {Number} file.size File size.
- */
-plupload.File = (function() {
-        var filepool = {};
+                                plupload.extend(this, {
 
-        function PluploadFile(file) {
+                                        /**
+                                         * File id this is a globally unique id for the specific file.
+                                         *
+                                         * @property id
+                                         * @type String
+                                         */
+                                        id: plupload.guid(),
 
-                plupload.extend(this, {
+                                        /**
+                                         * File name for example "myfile.gif".
+                                         *
+                                         * @property name
+                                         * @type String
+                                         */
+                                        name: file.name || file.fileName,
 
-                        /**
-                         * File id this is a globally unique id for the specific file.
-                         *
-                         * @property id
-                         * @type String
-                         */
-                        id: plupload.guid(),
+                                        /**
+                                         * File type, `e.g image/jpeg`
+                                         *
+                                         * @property type
+                                         * @type String
+                                         */
+                                        type: file.type || '',
 
-                        /**
-                         * File name for example "myfile.gif".
-                         *
-                         * @property name
-                         * @type String
-                         */
-                        name: file.name || file.fileName,
+                                        /**
+                                         * Relative path to the file inside a directory
+                                         *
+                                         * @property relativePath
+                                         * @type String
+                                         * @default ''
+                                         */
+                                        relativePath: file.relativePath || '',
 
-                        /**
-                         * File type, `e.g image/jpeg`
-                         *
-                         * @property type
-                         * @type String
-                         */
-                        type: file.type || '',
+                                        /**
+                                         * File size in bytes (may change after client-side manupilation).
+                                         *
+                                         * @property size
+                                         * @type Number
+                                         */
+                                        size: file.fileSize || file.size,
 
+                                        /**
+                                         * Original file size in bytes.
+                                         *
+                                         * @property origSize
+                                         * @type Number
+                                         */
+                                        origSize: file.fileSize || file.size,
+
+                                        /**
+                                         * Number of bytes uploaded of the files total size.
+                                         *
+                                         * @property loaded
+                                         * @type Number
+                                         */
+                                        loaded: 0,
+
+                                        /**
+                                         * Number of percentage uploaded of the file.
+                                         *
+                                         * @property percent
+                                         * @type Number
+                                         */
+                                        percent: 0,
+
+                                        /**
+                                         * Status constant matching the plupload states QUEUED, UPLOADING, FAILED, DONE.
+                                         *
+                                         * @property status
+                                         * @type Number
+                                         * @see plupload
+                                         */
+                                        status: plupload.QUEUED,
+
+                                        /**
+                                         * Date of last modification.
+                                         *
+                                         * @property lastModifiedDate
+                                         * @type {String}
+                                         */
+                                        lastModifiedDate: file.lastModifiedDate || (new Date()).toLocaleString(), // Thu Aug 23 2012 19:40:00 GMT+0400 (GET)
+
+
+                                        /**
+                                         * Set when file becomes plupload.DONE or plupload.FAILED. Is used to calculate proper plupload.QueueProgress.bytesPerSec.
+                                         * @private
+                                         * @property completeTimestamp
+                                         * @type {Number}
+                                         */
+                                        completeTimestamp: 0,
+
+                                        /**
+                                         * Returns native window.File object, when it's available.
+                                         *
+                                         * @method getNative
+                                         * @return {window.File} or null, if plupload.File is of different origin
+                                         */
+                                        getNative: function() {
+                                                var file = this.getSource().getSource();
+                                                return plupload.inArray(plupload.typeOf(file), ['blob', 'file']) !== -1 ? file : null;
+                                        },
+
+                                        /**
+                                         * Returns mOxie.File - unified wrapper object that can be used across runtimes.
+                                         *
+                                         * @method getSource
+                                         * @return {mOxie.File} or null
+                                         */
+                                        getSource: function() {
+                                                if (!filepool[this.id]) {
+                                                        return null;
+                                                }
+                                                return filepool[this.id];
+                                        },
+
+                                        /**
+                                         * Destroys plupload.File object.
+                                         *
+                                         * @method destroy
+                                         */
+                                        destroy: function() {
+                                                var src = this.getSource();
+                                                if (src) {
+                                                        src.destroy();
+                                                        delete filepool[this.id];
+                                                }
+                                        }
+                                });
+
+                                filepool[this.id] = file;
+                        }
+
+                        return PluploadFile;
+                }());
+
+
+                /**
+                 * Constructs a queue progress.
+                 *
+                 * @class QueueProgress
+                 * @constructor
+                 */
+                plupload.QueueProgress = function() {
+                        var self = this; // Setup alias for self to reduce code size when it's compressed
+
                         /**
-                         * File size in bytes (may change after client-side manupilation).
+                         * Total queue file size.
                          *
                          * @property size
                          * @type Number
                          */
-                        size: file.size || file.fileSize,
+                        self.size = 0;
 
                         /**
-                         * Original file size in bytes.
+                         * Total bytes uploaded.
                          *
-                         * @property origSize
+                         * @property loaded
                          * @type Number
                          */
-                        origSize: file.size || file.fileSize,
+                        self.loaded = 0;
 
                         /**
-                         * Number of bytes uploaded of the files total size.
+                         * Number of files uploaded.
                          *
-                         * @property loaded
+                         * @property uploaded
                          * @type Number
                          */
-                        loaded: 0,
+                        self.uploaded = 0;
 
                         /**
-                         * Number of percentage uploaded of the file.
+                         * Number of files failed to upload.
                          *
-                         * @property percent
+                         * @property failed
                          * @type Number
                          */
-                        percent: 0,
+                        self.failed = 0;
 
                         /**
-                         * Status constant matching the plupload states QUEUED, UPLOADING, FAILED, DONE.
+                         * Number of files yet to be uploaded.
                          *
-                         * @property status
+                         * @property queued
                          * @type Number
-                         * @see plupload
                          */
-                        status: plupload.QUEUED,
+                        self.queued = 0;
 
                         /**
-                         * Date of last modification.
+                         * Total percent of the uploaded bytes.
                          *
-                         * @property lastModifiedDate
-                         * @type {String}
+                         * @property percent
+                         * @type Number
                          */
-                        lastModifiedDate: file.lastModifiedDate || (new Date()).toLocaleString(), // Thu Aug 23 2012 19:40:00 GMT+0400 (GET)
+                        self.percent = 0;
 
                         /**
-                         * Returns native window.File object, when it's available.
+                         * Bytes uploaded per second.
                          *
-                         * @method getNative
-                         * @return {window.File} or null, if plupload.File is of different origin
+                         * @property bytesPerSec
+                         * @type Number
                          */
-                        getNative: function() {
-                                var file = this.getSource().getSource();
-                                return o.inArray(o.typeOf(file), ['blob', 'file']) !== -1 ? file : null;
-                        },
+                        self.bytesPerSec = 0;
 
                         /**
-                         * Returns mOxie.File - unified wrapper object that can be used across runtimes.
+                         * Resets the progress to its initial values.
                          *
-                         * @method getSource
-                         * @return {mOxie.File} or null
+                         * @method reset
                          */
-                        getSource: function() {
-                                if (!filepool[this.id]) {
-                                        return null;
-                                }
-                                return filepool[this.id];
-                        },
+                        self.reset = function() {
+                                self.size = self.loaded = self.uploaded = self.failed = self.queued = self.percent = self.bytesPerSec = 0;
+                        };
+                };
 
-                        /**
-                         * Destroys plupload.File object.
-                         *
-                         * @method destroy
-                         */
-                        destroy: function() {
-                                var src = this.getSource();
-                                if (src) {
-                                        src.destroy();
-                                        delete filepool[this.id];
-                                }
-                        }
-                });
+                exports.plupload = plupload;
 
-                filepool[this.id] = file;
-        }
+        }(this, moxie));
 
-        return PluploadFile;
-}());
-
-
-/**
- * Constructs a queue progress.
- *
- * @class QueueProgress
- * @constructor
- */
- plupload.QueueProgress = function() {
-        var self = this; // Setup alias for self to reduce code size when it's compressed
-
-        /**
-         * Total queue file size.
-         *
-         * @property size
-         * @type Number
-         */
-        self.size = 0;
-
-        /**
-         * Total bytes uploaded.
-         *
-         * @property loaded
-         * @type Number
-         */
-        self.loaded = 0;
-
-        /**
-         * Number of files uploaded.
-         *
-         * @property uploaded
-         * @type Number
-         */
-        self.uploaded = 0;
-
-        /**
-         * Number of files failed to upload.
-         *
-         * @property failed
-         * @type Number
-         */
-        self.failed = 0;
-
-        /**
-         * Number of files yet to be uploaded.
-         *
-         * @property queued
-         * @type Number
-         */
-        self.queued = 0;
-
-        /**
-         * Total percent of the uploaded bytes.
-         *
-         * @property percent
-         * @type Number
-         */
-        self.percent = 0;
-
-        /**
-         * Bytes uploaded per second.
-         *
-         * @property bytesPerSec
-         * @type Number
-         */
-        self.bytesPerSec = 0;
-
-        /**
-         * Resets the progress to its initial values.
-         *
-         * @method reset
-         */
-        self.reset = function() {
-                self.size = self.loaded = self.uploaded = self.failed = self.queued = self.percent = self.bytesPerSec = 0;
-        };
-};
-
-window.plupload = plupload;
-
-}(window, mOxie));
+}));
+ No newline at end of file

src/wp-includes/script-loader.php

@@ -1251 +1251 @@
                 'error_uploading'           => __( '“%s” has failed to upload.' ),
         );
 
-        $scripts->add( 'moxiejs', "/wp-includes/js/plupload/moxie$suffix.js", array(), '1.3.5' );
-        $scripts->add( 'plupload', "/wp-includes/js/plupload/plupload$suffix.js", array( 'moxiejs' ), '2.1.9' );
+        $scripts->add( 'moxiejs', "/wp-includes/js/plupload/moxie$suffix.js", array(), '1.5.7' );
+        $scripts->add( 'plupload', "/wp-includes/js/plupload/plupload$suffix.js", array( 'moxiejs' ), '2.3.6' );
         // Back compat handles:
         foreach ( array( 'all', 'html5', 'flash', 'silverlight', 'html4' ) as $handle ) {
                 $scripts->add( "plupload-$handle", false, array( 'plupload' ), '2.1.1' );