Merge pull request #3220 from samvera/revert-add-files-a11y

Revert "Update file upload buttons to be keyboard tab accessible"

Author: Thomas Johnson

app/views/hyrax/base/_form_files.html.erb

@@ -13,17 +13,17 @@
           <div class="row">
             <div class="col-xs-12">
                 <!-- The fileinput-button span is used to style the file input field as button -->
-                <button id="addfiles" class="btn btn-success fileinput-button">
+                <span id="addfiles" class="btn btn-success fileinput-button">
                     <span class="glyphicon glyphicon-plus"></span>
                     <span>Add files...</span>
-                    <input type="file" name="files[]" tabindex="-1" aria-hidden="true" multiple />
-                </button>
+                    <input type="file" name="files[]" multiple />
+                </span>
                 <!-- The fileinput-button span is used to style the file input field as button -->
-                <button id="addfolder" class="btn btn-success fileinput-button">
+                <span id="addfolder" class="btn btn-success fileinput-button">
                     <span class="glyphicon glyphicon-plus"></span>
                     <span>Add folder...</span>
-                    <input type="file" name="files[]" tabindex="-1" aria-hidden="true" multiple directory webkitdirectory />
-                </button>
+                    <input type="file" name="files[]" multiple directory webkitdirectory />
+                </span>
                 <% if Hyrax.config.browse_everything? %>
                   <%= button_tag(type: 'button', class: 'btn btn-success', id: "browse-btn",
                     'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,

app/views/hyrax/dashboard/collections/_form_branding.html.erb

@@ -13,11 +13,11 @@
     <div class="row fileupload-buttonbar">
       <div class="col-xs-4">
         <!-- The fileinput-button span is used to style the file input field as button -->
-        <button class="btn btn-success fileinput-button">
+        <span class="btn btn-success fileinput-button">
           <span class="glyphicon glyphicon-plus"></span>
           <span>Choose File</span>
-          <input type="file" name="files[]" tabindex="-1" aria-hidden="true" single />
-        </button>
+          <input type="file" name="files[]" single />
+        </span>
       </div> <!-- end col-xs-4 -->
 
       <!-- The global progress state -->
@@ -90,11 +90,11 @@
     <div class="row fileupload-buttonbar">
       <div class="col-xs-4">
         <!-- The fileinput-button span is used to style the file input field as button -->
-        <button class="btn btn-success fileinput-button">
+        <span class="btn btn-success fileinput-button">
           <span class="glyphicon glyphicon-plus"></span>
           <span>Choose File</span>
-          <input type="file" name="files[]" tabindex="-1" aria-hidden="true" single />
-        </button>
+          <input type="file" name="files[]" single />
+        </span>
       </div> <!-- end col-xs-4 -->
 
       <!-- The global progress state -->

spec/features/batch_create_spec.rb

@@ -39,7 +39,7 @@
     it "allows on-behalf-of batch deposit", :js do
       click_link "Files" # switch tab
       expect(page).to have_content "Add files"
-      within('button#addfiles') do
+      within('span#addfiles') do
         # two arbitrary files that aren't actually related, but should be
         # small enough to require minimal processessing.
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/small_file.txt", visible: false)

spec/features/create_work_spec.rb

@@ -30,7 +30,7 @@
       click_link "Files" # switch tab
       expect(page).to have_content "Add files"
       expect(page).to have_content "Add folder"
-      within('button#addfiles') do
+      within('span#addfiles') do
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/jp2_fits.xml", visible: false)
       end
@@ -71,7 +71,7 @@
     it "allows on-behalf-of deposit" do
       click_link "Files" # switch tab
       expect(page).to have_content "Add files"
-      within('button#addfiles') do
+      within('span#addfiles') do
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/jp2_fits.xml", visible: false)
       end
@@ -113,7 +113,7 @@
 
     it 'updates the required file check status' do
       click_link "Files" # switch to the Files tab
-      within('button#addfiles') do
+      within('span#addfiles') do
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
       end
       expect(page).to have_css('ul li#required-files.complete', text: 'Add files')

spec/features/dashboard/collection_spec.rb

@@ -671,7 +671,7 @@ def get_url_fragment(type)
 
         # add required file
         click_link "Files" # switch tab
-        within('button#addfiles') do
+        within('span#addfiles') do
           attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
         end
         # set required metadata