Remove feature-flags

We no longer disable detailsView, thus save the extra request.
pull/4253/head
Oliver Günther 9 years ago
parent 56fbeaf6e8
commit afd1c8cd0d
  1. 2
      app/assets/stylesheets/_work_packages_show_view_overwrite.scss
  2. 2
      app/assets/stylesheets/layout/_work_package.sass
  3. 7
      frontend/app/components/routing/wp-list/wp.list.html
  4. 4
      frontend/app/components/routing/wp-show/wp.show.html
  5. 8
      frontend/app/components/wp-table/wp-table.directive.js
  6. 5
      frontend/app/openproject-app.js
  7. 7
      frontend/app/templates/work_packages/menus/work_package_context_menu.html
  8. 1
      frontend/bower.json
  9. 1
      frontend/webpack.config.js
  10. 8
      public/javascripts/feature-flags.json

@ -195,7 +195,7 @@ body.controller-work_packages.action-show {
@media only screen and (max-width: 1280px) {
.work-packages--details {
@at-root {
li[feature-flag=detailsView] {
.detailsViewMenuItem {
display: block;
}
}

@ -144,7 +144,7 @@
width: 480px
@at-root
li[feature-flag=detailsView]
.detailsViewMenuItem
display: none
@media only screen and (min-width: 1281px)
width: 480px

@ -26,13 +26,13 @@
<span class="badge -secondary">{{ getFilterCount() }}</span>
</button>
</li>
<li class="toolbar-item hidden-for-mobile" feature-flag="detailsView">
<li class="toolbar-item hidden-for-mobile">
<ul id="work-packages-view-mode-selection" class="toolbar-button-group">
<li>
<wp-list-view-button disabled="editAll.state"
project-identifier="projectIdentifier"></wp-list-view-button>
</li>
<li feature-flag="detailsView">
<li>
<wp-details-view-button
next-wp-func="nextAvailableWorkPackage"></wp-details-view-button>
</li>
@ -88,6 +88,5 @@
</table-pagination>
</div>
</div>
<div class="work-packages--details" ui-view ng-show="workPackage"
feature-flag="detailsView"></div>
<div class="work-packages--details" ui-view ng-show="workPackage"></div>
</div>

@ -19,13 +19,13 @@
<li class="toolbar-item" ng-if="displayWatchButton">
<wp-watcher-button work-package="workPackage" disabled="editAll.state"></wp-watcher-button>
</li>
<li class="toolbar-item hidden-for-mobile" feature-flag="detailsView">
<li class="toolbar-item hidden-for-mobile">
<ul id="work-packages-view-mode-selection" class="toolbar-button-group">
<li>
<wp-list-view-button disabled="editAll.state"
project-identifier="projectIdentifier"></wp-list-view-button>
</li>
<li feature-flag="detailsView">
<li>
<wp-details-view-button project-identifier="projectIdentifier"></wp-details-view-button>
</li>
<li>

@ -30,7 +30,7 @@ angular
.module('openproject.workPackages.directives')
.directive('wpTable', wpTable);
function wpTable(WorkPackagesTableService, $window, featureFlags, PathHelper, apiWorkPackages){
function wpTable(WorkPackagesTableService, $window, PathHelper, apiWorkPackages){
return {
restrict: 'E',
replace: true,
@ -135,12 +135,6 @@ function wpTable(WorkPackagesTableService, $window, featureFlags, PathHelper, ap
}
});
scope.$watch(function() {
return featureFlags.isOn('detailsView');
}, function(detailsEnabled) {
scope.hideWorkPackageDetails = !detailsEnabled;
});
// Thanks to http://stackoverflow.com/a/880518
function clearSelection() {
if(document.selection && document.selection.empty) {

@ -52,7 +52,6 @@ require('angular-ui-router');
require('angular-ui-date');
require('angular-truncate');
require('angular-feature-flags');
require('angular-busy/dist/angular-busy');
require('angular-busy/dist/angular-busy.css');
@ -193,7 +192,6 @@ var openprojectApp = angular.module('openproject', [
'ngAria',
'ngSanitize',
'truncate',
'feature-flags',
'openproject.layout',
'cgBusy',
'openproject.api',
@ -242,14 +240,12 @@ openprojectApp
'$http',
'$rootScope',
'$window',
'featureFlags',
'TimezoneService',
'CacheService',
'KeyboardShortcutService',
function($http,
$rootScope,
$window,
flags,
TimezoneService,
CacheService,
KeyboardShortcutService) {
@ -259,7 +255,6 @@ openprojectApp
$window.sessionStorage.getItem('openproject:navigation-toggle') !==
'collapsed';
flags.set($http.get('/javascripts/feature-flags.json'));
TimezoneService.setupLocale();
KeyboardShortcutService.activate();

@ -1,15 +1,14 @@
<div id="work-package-context-menu" class="action-menu dropdown" role="menu">
<ul class="dropdown-menu">
<li class="open"
feature-flag="detailsView">
<a role="menuitem" focus="isDetailsViewLinkPresent()" ui-sref="work-packages.list.details.overview({workPackageId: row.object.id})">
<li class="open detailsViewMenuItem">
<a role="menuitem" focus ui-sref="work-packages.list.details.overview({workPackageId: row.object.id})">
<i ng-class="['icon-action-menu', 'icon-view-split']"></i>
<span ng-bind="I18n.t('js.button_open_details')"/>
</a>
</li>
<li ng-repeat="action in permittedActions"
class="{{action.icon}}">
<a role="menuitem" focus="$index == 0 && !isDetailsViewLinkPresent()" href="" ng-click="triggerContextMenuAction(action.icon, action.link)">
<a role="menuitem" href="" ng-click="triggerContextMenuAction(action.icon, action.link)">
<i ng-class="['icon-action-menu', 'icon-' + action.icon]"></i>
<span ng-bind="I18n.t('js.button_' + action.icon)"/>
</a>

@ -16,7 +16,6 @@
"angular-modal": "finnlabs/angular-modal#d45eb9ceb720b8785613ba89ba0f14f8ab197569",
"angular-sanitize": "~1.3.14",
"angular-truncate": "sparkalow/angular-truncate#fdf60fda265042d12e9414b5354b2cc52f1419de",
"angular-feature-flags": "mjt01/angular-feature-flags",
"angular-elastic": "2.5.0",
"angular-cache": "~4.3.2",
"jquery-migrate": "~1.2.1",

@ -125,7 +125,6 @@ module.exports = {
'angular-ui-date': 'angular-ui-date/src/date',
'angular-truncate': 'angular-truncate/src/truncate',
'angular-feature-flags': 'angular-feature-flags/dist/featureFlags.js',
'angular-context-menu': 'angular-context-menu/dist/angular-context-menu.js',
'mousetrap': 'mousetrap/mousetrap.js',
'hyperagent': 'hyperagent/dist/hyperagent',

@ -1,8 +0,0 @@
[
{
"key": "detailsView",
"active": true,
"name": "Details View",
"description": "Displays details for individual work packages."
}
]
Loading…
Cancel
Save