[ARVADOS] updated: 086df9da5514492c9b5751de14be7825f49285a0

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/application.js  | 10 +++++++---
 apps/workbench/app/views/application/_choose.html.erb |  2 +-
 apps/workbench/app/views/application/_choose.js.erb   |  1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

       via  086df9da5514492c9b5751de14be7825f49285a0 (commit)
       via  321bd2a34076f2f21714ebb9f1b92368607930c9 (commit)
      from  1e1712c0cb2f3eb9da5759ef9b356ad52f5749b7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 086df9da5514492c9b5751de14be7825f49285a0
Author: Tom Clegg <tom at curoverse.com>
Date:   Sun Jul 27 18:35:20 2014 -0400

    3235: Bind Esc key to close modals.

diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index d21c4b5..6f9b515 100644
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -135,13 +135,17 @@ jQuery(function($){
         on('ajax:complete ready', function() {
             // See http://getbootstrap.com/javascript/#buttons
             $('.btn').button();
-        });
-
-    $(document).
+        }).
         on('ready ajax:complete', function() {
             $('[data-toggle~=tooltip]').tooltip({container:'body'});
+        }).
+        on('ready ajax:complete', function() {
+            // This makes the dialog close on Esc key, obviously.
+            $('.modal').attr('tabindex', '-1')
         });
 
+
+     
     HeaderRowFixer = function(selector) {
         this.duplicateTheadTr = function() {
             $(selector).each(function() {

commit 321bd2a34076f2f21714ebb9f1b92368607930c9
Author: Tom Clegg <tom at curoverse.com>
Date:   Sun Jul 27 18:28:18 2014 -0400

    3235: Focus search box when chooser modal appears.

diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index bf8ea88..aa6d2d4 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -8,7 +8,7 @@
 
       <div class="modal-body">
         <div class="input-group">
-          <input type="text" class="form-control filterable-control" placeholder="Search" data-filterable-target=".modal.arv-choose .selectable-container"/>
+          <input type="text" class="form-control filterable-control focus-on-display" placeholder="Search" data-filterable-target=".modal.arv-choose .selectable-container"/>
           <% if params[:by_project] != false %>
             <div class="input-group-btn" data-filterable-target=".modal.arv-choose .selectable-container">
               <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
diff --git a/apps/workbench/app/views/application/_choose.js.erb b/apps/workbench/app/views/application/_choose.js.erb
index 44c2cd9..2d18975 100644
--- a/apps/workbench/app/views/application/_choose.js.erb
+++ b/apps/workbench/app/views/application/_choose.js.erb
@@ -5,3 +5,4 @@ $('body > .modal-container .modal .modal-footer .btn-primary').
     attr('data-action-href', '<%= j params[:action_href] %>').
     attr('data-method', '<%= j params[:action_method] %>').
     data('action-data', <%= raw params[:action_data] %>);
+$('body > .modal-container .modal .focus-on-display').focus();

-----------------------------------------------------------------------


hooks/post-receive
--