Safari FormData workaround?

textpattern · Aug 8, 2018 · cad43c7 · cad43c7 · bloatware · Aug 8, 2018
1 parent 45ef5e9
commit cad43c7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/textpattern/include/txp_css.php b/textpattern/include/txp_css.php
@@ -103,7 +103,7 @@ function css_list($current)
 
             if ((!$count-- || $extension !== $ext) && !empty($out)) {
                 $id = 'all_styles_'.($extension ? $types[$extension-1] : 'css');
-                $label = $extension ? $mimetypes[$types[$extension-1]] : 'all_stylesheets';
+                $label = $extension ? strtoupper($types[$extension-1]).' ('.$mimetypes[$types[$extension-1]].')' : 'CSS (text/css)';
                 $list .= wrapGroup($id, tag(join(n, $out), 'ul', array('class' => 'switcher-list')), $label);
                 $out = array();
             }

diff --git a/textpattern/textpattern.js b/textpattern/textpattern.js
@@ -1002,13 +1002,23 @@ jQuery.fn.txpAsyncForm = function (options) {
         if (typeof extra === 'undefined') extra = new Object;
 
         var $this = $(this);
+
+        // Safari workaround?
+        var $inputs = $('input[type="file"]:not([disabled])', $this);
+        $inputs.each(function(i, input) {
+            if (input.files.length > 0) return 
+            $(input).prop('disabled', true)
+        })
+
         var form =
         {
             data   : ( typeof window.FormData === 'undefined' ? $this.serialize() : new FormData(this) ),
             extra  : new Object,
             spinner: typeof extra['_txp_spinner'] !== 'undefined' ? $(extra['_txp_spinner']) : $('<span />').addClass('spinner ui-icon ui-icon-refresh')
         };
 
+        $inputs.prop('disabled', false);// Safari workaround.
+
         if (typeof extra['_txp_submit'] !== 'undefined') {
             form.button = $this.find(extra['_txp_submit']).eq(0);
         } else {