Merge pull request #1516 from opf/fix/focus-modal-windows

pull/1520/head
Hagen Schink 10 years ago
commit 1cc7dfc1d1
  1. 38
      app/assets/javascripts/angular/directives/components/focus.js
  2. 2
      bower.json
  3. 60
      karma/tests/directives/components/focus-test.js
  4. 2
      public/templates/work_packages/modals/save.html
  5. 2
      public/templates/work_packages/modals/settings.html
  6. 3
      public/templates/work_packages/modals/share.html

@ -0,0 +1,38 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.
//
// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
// Copyright (C) 2006-2013 Jean-Philippe Lang
// Copyright (C) 2010-2013 the ChiliProject Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// See doc/COPYRIGHT.rdoc for more details.
//++
// TODO move to UI components
angular.module('openproject.uiComponents')
.directive('focus', function() {
return {
link: function(scope, element, attrs) {
element[0].focus();
}
};
});

@ -15,7 +15,7 @@
"angular-ui-date": "latest",
"angular-ui-router": "~0.2.10",
"angular-i18n": "~1.3.0",
"angular-modal": "~0.3.0",
"angular-modal": "~0.4.0",
"angular-sanitize": "~1.2.14",
"angular-truncate": "sparkalow/angular-truncate",
"angular-feature-flags": "mjt01/angular-feature-flags",

@ -0,0 +1,60 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.
//
// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
// Copyright (C) 2006-2013 Jean-Philippe Lang
// Copyright (C) 2010-2013 the ChiliProject Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// See doc/COPYRIGHT.rdoc for more details.
//++
describe('focus Directive', function() {
var doc, compile, element, rootScope, scope;
beforeEach(angular.mock.module('openproject.uiComponents'));
beforeEach(module('templates'));
beforeEach(inject(function($compile, $rootScope, $document) {
var html = '<input type="text" name="testInput" focus></input>';
doc = $document[0];
rootScope = $rootScope;
scope = $rootScope.$new();
compile = function() {
element = angular.element(html);
var body = angular.element(doc.body);
body.append(element);
$compile(element)(scope);
scope.$digest();
};
}));
describe('element', function() {
it('should focus the element', function() {
compile();
// NOTE: $(element).is(':focus') is broken in PhantomJS
expect(doc.activeElement).to.equal(element[0]);
});
});
});

@ -9,7 +9,7 @@
<label>
Name:
<span class="required"> *</span>
<input class="short" type="text" name="query_name" ng-model="queryName" required></input>
<input class="short" type="text" name="query_name" ng-model="queryName" focus required></input>
</label>
</div>
<div>

@ -9,7 +9,7 @@
<label>
{{ I18n.t('js.modals.label_name') }}
<span class="required"> *</span>
<input class="short" type="text" name="query_name" ng-model="queryName" required></input>
<input class="short" type="text" name="query_name" ng-model="queryName" focus required></input>
</label>
</div>
<div>

@ -9,7 +9,8 @@
<input type="checkbox"
name="is_public"
ng-model="query.isPublic"
ng-disabled="cannot('query', 'publicize')"></input>
ng-disabled="cannot('query', 'publicize')"
focus></input>
<div class="styled-checkbox"></div>
Page visible for others
</label>

Loading…
Cancel
Save