diff options
author | zotlabs <mike@macgirvin.com> | 2017-06-26 17:32:38 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-06-26 17:32:38 -0700 |
commit | a8374b25f15c1c7545748bae26dda5e3c190573c (patch) | |
tree | 57bc976d9dd798e3c73f14399132822d3abfff8d /library/blueimp_upload/js/jquery.iframe-transport.js | |
parent | 4d81c498e2f9a65eac7f71b077aa3e787d53325d (diff) | |
download | volse-hubzilla-a8374b25f15c1c7545748bae26dda5e3c190573c.tar.gz volse-hubzilla-a8374b25f15c1c7545748bae26dda5e3c190573c.tar.bz2 volse-hubzilla-a8374b25f15c1c7545748bae26dda5e3c190573c.zip |
upgrade blueimp from 9.8 to 9.18
Diffstat (limited to 'library/blueimp_upload/js/jquery.iframe-transport.js')
-rw-r--r-- | library/blueimp_upload/js/jquery.iframe-transport.js | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/library/blueimp_upload/js/jquery.iframe-transport.js b/library/blueimp_upload/js/jquery.iframe-transport.js index 8d64b591b..8d25c4641 100644 --- a/library/blueimp_upload/js/jquery.iframe-transport.js +++ b/library/blueimp_upload/js/jquery.iframe-transport.js @@ -1,21 +1,24 @@ /* - * jQuery Iframe Transport Plugin 1.8.2 + * jQuery Iframe Transport Plugin * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2011, Sebastian Tschan * https://blueimp.net * * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT + * https://opensource.org/licenses/MIT */ -/* global define, window, document */ +/* global define, require, window, document, JSON */ -(function (factory) { +;(function (factory) { 'use strict'; if (typeof define === 'function' && define.amd) { // Register as an anonymous AMD module: define(['jquery'], factory); + } else if (typeof exports === 'object') { + // Node/CommonJS: + factory(require('jquery')); } else { // Browser globals: factory(window.jQuery); @@ -24,7 +27,14 @@ 'use strict'; // Helper variable to create unique names for the transport iframes: - var counter = 0; + var counter = 0, + jsonAPI = $, + jsonParse = 'parseJSON'; + + if ('JSON' in window && 'parse' in JSON) { + jsonAPI = JSON; + jsonParse = 'parse'; + } // The iframe transport accepts four additional options: // options.fileInput: a jQuery collection of file input fields @@ -194,7 +204,7 @@ return iframe && $(iframe[0].body).text(); }, 'iframe json': function (iframe) { - return iframe && $.parseJSON($(iframe[0].body).text()); + return iframe && jsonAPI[jsonParse]($(iframe[0].body).text()); }, 'iframe html': function (iframe) { return iframe && $(iframe[0].body).html(); |