Skip to content

Commit a687105

Browse files
committed
chore(tree-base): All Templates Multiline
Makes all of the templates multiline to reduce the number of merge conflics. This also makes git blame easier to use as each tag change will be line dependent.
1 parent 8d8ddea commit a687105

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
<div class="ui-grid-tree-base-row-header-buttons" ng-class="{'ui-grid-icon-minus-squared': grid.treeBase.numberLevels > 0 && grid.treeBase.expandAll, 'ui-grid-icon-plus-squared': grid.treeBase.numberLevels > 0 && !grid.treeBase.expandAll}" ng-click="headerButtonClick($event)">
2-
</div>
1+
<div
2+
class="ui-grid-tree-base-row-header-buttons"
3+
ng-class="{'ui-grid-icon-minus-squared': grid.treeBase.numberLevels > 0 && grid.treeBase.expandAll, 'ui-grid-icon-plus-squared': grid.treeBase.numberLevels > 0 && !grid.treeBase.expandAll}"
4+
ng-click="headerButtonClick($event)">
5+
</div>
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<div>
2-
<div class="ui-grid-cell-contents" col-index="renderIndex">
3-
<ui-grid-tree-base-expand-all-buttons ></ui-grid-tree-base-expand-all-buttons>
2+
<div
3+
class="ui-grid-cell-contents"
4+
col-index="renderIndex">
5+
<ui-grid-tree-base-expand-all-buttons>
6+
</ui-grid-tree-base-expand-all-buttons>
47
</div>
58
</div>
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
<div class="ui-grid-cell-contents">
2-
<ui-grid-tree-base-row-header-buttons></ui-grid-tree-base-row-header-buttons>
1+
<div
2+
class="ui-grid-cell-contents">
3+
<ui-grid-tree-base-row-header-buttons>
4+
</ui-grid-tree-base-row-header-buttons>
35
</div>
Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
<div class="ui-grid-tree-base-row-header-buttons" ng-class="{'ui-grid-tree-base-header': row.treeLevel > -1 }" ng-click="treeButtonClick(row, $event)">
2-
<i ng-class="{'ui-grid-icon-minus-squared': ( ( grid.options.showTreeExpandNoChildren && row.treeLevel > -1 ) || ( row.treeNode.children && row.treeNode.children.length > 0 ) ) && row.treeNode.state === 'expanded', 'ui-grid-icon-plus-squared': ( ( grid.options.showTreeExpandNoChildren && row.treeLevel > -1 ) || ( row.treeNode.children && row.treeNode.children.length > 0 ) ) && row.treeNode.state === 'collapsed'}" ng-style="{'padding-left': grid.options.treeIndent * row.treeLevel + 'px'}"></i>
1+
<div
2+
class="ui-grid-tree-base-row-header-buttons"
3+
ng-class="{'ui-grid-tree-base-header': row.treeLevel > -1 }"
4+
ng-click="treeButtonClick(row, $event)">
5+
<i
6+
ng-class="{'ui-grid-icon-minus-squared': ( ( grid.options.showTreeExpandNoChildren && row.treeLevel > -1 ) || ( row.treeNode.children && row.treeNode.children.length > 0 ) ) && row.treeNode.state === 'expanded', 'ui-grid-icon-plus-squared': ( ( grid.options.showTreeExpandNoChildren && row.treeLevel > -1 ) || ( row.treeNode.children && row.treeNode.children.length > 0 ) ) && row.treeNode.state === 'collapsed'}"
7+
ng-style="{'padding-left': grid.options.treeIndent * row.treeLevel + 'px'}">
8+
</i>
39
&nbsp;
4-
</div>
10+
</div>

0 commit comments

Comments
 (0)