Merge pull request #3727 from furinvader/bug/21638-insert-columns-focus

[21638] No keyboard focus when opening columns modal from column context menu

frontend/app/global.js

@@ -65,5 +65,5 @@ require('select2/select2.css');
 require('angular');
 require('angular-sanitize');
 
-require('ui-select/dist/select');
-require('ui-select/dist/select.css');
+require('angular-ui-select/dist/select');
+require('angular-ui-select/dist/select.css');

frontend/app/templates/work_packages/modals/columns.html

@@ -6,7 +6,7 @@
 
     <div cg-busy="vm.promise" class="columns-modal-content select2-modal-content">
       <label for="selected_columns" class="hidden-for-sighted">{{ ::I18n.t('js.description_selected_columns') }}</label>
-      <ui-select multiple sortable="true" ng-model="vm.selectedColumns" theme="select2" id="selected_columns" focus aria-labelledby="column_multiselect_description">
+      <ui-select multiple sortable="true" ng-model="vm.selectedColumns" theme="select2" id="selected_columns" focus-on="columnsModalOpened" aria-labelledby="column_multiselect_description">
         <ui-select-match>
           {{$item.title}}
         </ui-select-match>

frontend/app/work_packages/controllers/dialogs/columns.js

@@ -110,4 +110,8 @@ module.exports = function($scope, $filter, columnsModal, QueryService,
         event.preventDefault(); 
       });
   });
+
+  $timeout(function () {
+    $scope.$broadcast('columnsModalOpened');
+  });
 };

frontend/bower.json

@@ -28,7 +28,7 @@
     "lodash": "~2.4.1",
     "foundation-apps": "1.1.0",
     "bourbon": "~4.2.1",
-    "ui-select": "0xf013/ui-select#c7bef79e24cbeab977635c7a94d8f9504d4ee2e2",
+    "angular-ui-select": "~0.13.2",
     "mousetrap": "~1.4.6",
     "ng-file-upload": "~5.0.9"
   },