Remove some code

pull/913/head
Till Breuer 11 years ago
parent f1bb0b6fa5
commit 1d4dbb2d60
  1. 7
      app/assets/javascripts/angular/directives/timelines/timeline_directive.js
  2. 3
      public/templates/timelines/tree.html

@ -77,8 +77,6 @@ timelinesApp.directive('timeline', function() {
}; };
drawTree = function(tree) { drawTree = function(tree) {
console.log('-------- Draw tree --------');
timeline = scope.timeline; timeline = scope.timeline;
try { try {
@ -100,10 +98,7 @@ timelinesApp.directive('timeline', function() {
scope.timeline.registerTimelineContainer(element); scope.timeline.registerTimelineContainer(element);
TimelineLoaderService.loadTimelineData(scope.timeline) TimelineLoaderService.loadTimelineData(scope.timeline)
.then(buildTree) .then(buildTree)
.then(drawTree) .then(drawTree);
.then(function(){
scope.dataLoaded = true;
});
} }
}; };
}); });

@ -1,4 +1,4 @@
<tr ng-repeat="node in nodes" ng-class="{'tl-first-row': $first, 'tl-last-row': $last, 'tl-grouping': timeline.isGrouping(), 'tl-project-row': node.payload.is(Timeline.Project)}" ng-show="!node.parentNode || (node.ancestors | ancestorsExpanded)"> <tr ng-repeat="node in nodes" ng-class="{'tl-first-row': $first, 'tl-last-row': $last, 'tl-grouping': timeline.isGrouping(), 'tl-project-row': node.payload.is(Timeline.Project)}" ng-show="node.ancestors | ancestorsExpanded">
<td ng-if="timeline.isGrouping() && node.payload.is(Timeline.Project) && node.level === 0 && node.group !== nodes[$index-1].group" class="tl-grouping" colspan="{{timeline.options.columns.length + 1}}"> <td ng-if="timeline.isGrouping() && node.payload.is(Timeline.Project) && node.level === 0 && node.group !== nodes[$index-1].group" class="tl-grouping" colspan="{{timeline.options.columns.length + 1}}">
<span class="tl-word-ellipsis"> <span class="tl-word-ellipsis">
@ -16,6 +16,7 @@
</span> </span>
</span> </span>
</td> </td>
<!-- <!--
<td ng-repeat="option in timeline.options.columns"> <td ng-repeat="option in timeline.options.columns">
(typeof availableRows[option] === 'function') && availableRows[option].call(node.payload, node.payload) || availableRows.general.call(node.payload, node.payload, option) (typeof availableRows[option] === 'function') && availableRows[option].call(node.payload, node.payload) || availableRows.general.call(node.payload, node.payload, option)

Loading…
Cancel
Save