Skip to content

Commit 7575605

Browse files
Portugal, MarceloPortugal, Marcelo
Portugal, Marcelo
authored and
Portugal, Marcelo
committed
gh-pages v4.6.3
1 parent fbb67d8 commit 7575605

File tree

285 files changed

+68601
-1109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

285 files changed

+68601
-1109
lines changed

docs/grunt-scripts/marked.js

Lines changed: 250 additions & 124 deletions
Large diffs are not rendered by default.

docs/js/docs-setup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2180,7 +2180,7 @@ UI_DOCS={
21802180
"type": "overview",
21812181
"moduleName": "Tutorial: 209 Grouping",
21822182
"shortDescription": "Grouping",
2183-
"keywords": "$http $interval $scope address adds age aggregate aggregatecolumn aggregated aggregates aggregatestree aggregation aggregations aggval alert alert-warning allow allowing allows alpha angular api app applying asc attributecol automatically average avg avoid balance base based better body breaking breaks btn btn-success bugs button buttons calculate calling cellfilter celltemplate change changed changegrouping changes children choose class cleanly cleargrouping clears code col colname column columndef columndefs columns columnsprocessor company config consideration console controller core count counting counts creating css currency current custom custom_filters customtreeaggregationfinalizerfn customtreeaggregationfinalizertext data deeper default define defining delete dependency desc describe development differently direction distribution documentation documented easily edited enablefiltering enhancement entity example excel existing expand expandall expandallrows exported exporter external extracts false feature female files filter filtered filtering finalizer find foreach format formatting front function functionality functions gender genderhash genders getaggregates getfullyear getgrouping getmonth grid grid1 gridapi gridoption gridoptions gridtestutils group groupcolumn grouped groupheader grouping groupingcolumnprocessor groupingindent groupingrowheaderalwaysvisible groupingrowheaderwidth groupingsuppressaggregationtext grouplevel grouppriority grouprowheader groups groupval handled handles hasn header height high higher html include included including inclusion indent indented individual initialisation input insertion instantiations interact isn js json larger length level leverages limit list load log lot main mainctrl male map mapgender marked match max methods min module move moved moving names newnode ng-click ng-controller ng-if nganimate ngtouch nicer node notable null number onregisterapi option optionally options order otheraggregations outstandings overriding overview people performance permit persisted pinning pivot pixels pleasing prior priority programmatically provided providing proxy publicapi rc22 ready recursiveextract registered registereddate reload remove removes removing rendercontainers rendered replace require response result return returned reversed role row rowheader rownum rows rtl running runs saved savestate scenario second selected selection set setgrouping sets setting settings shared showing skip skipping slice sort sorted space spec special specific src standalone start structure suppress suppressremovesort table templates testing text things title togglefirstrow togglerow togglerowtreestate togglesecondrow tooltip tree treeaggregation treeaggregationfn treeaggregationtype treebase treechildren treeindent treelevel treerowheaderalwaysvisible treerowheaderbasewidth treeview true tuning tutorial type typeof ui ui-grid ui-grid-cell-contents ui-grid-grouping uigridgroupingconstants undefined ungroupcolumn ungrouped ungroups unit user values var visible visiblerowcache visually wanted watch ways width work working write writes xxxx",
2183+
"keywords": "$http $interval $scope address adds age aggregate aggregatecolumn aggregated aggregates aggregatestree aggregation aggregations aggval alert alert-warning allow allowing allows alpha angular api app applying asc attributecol automatically average avg avoid balance base based better body breaking breaks btn btn-success bugs button buttons calculate calling cellfilter celltemplate change changed changegrouping changes children choose class cleanly cleargrouping clears code col colname column columndef columndefs columns columnsprocessor company config consideration console controller core count counting counts creating css currency current custom custom_filters customtreeaggregationfinalizerfn customtreeaggregationfinalizertext data deeper default define defining delete dependency desc describe development differently direction distribution documentation documented easily edited enablefiltering enhancement entity example excel existing expand expandall expandallrows exported exporter external extracts false feature female files filter filtered filtering finalizer find foreach format formatting front function functionality functions gender genderhash genders getaggregates getfullyear getgrouping getmonth grid grid1 gridapi gridoption gridoptions gridtestutils group groupcolumn grouped groupheader grouping groupingcolumnprocessor groupingindent groupingrowheaderalwaysvisible groupingrowheaderwidth groupingsuppressaggregationtext grouplevel grouppriority grouprowheader groups groupval handled handles hasn header height high higher html include included including inclusion indent indented individual initialisation input insertion instantiations interact isn js json larger length level leverages limit list load log lot main mainctrl male map mapgender marked match max methods min module move moved moving names newnode ng-click ng-controller ng-if nganimate ngtouch nicer node notable null number onregisterapi option optionally options order otheraggregations outstandings overriding overview people performance permit persisted pinning pivot pixels pleasing prior priority programmatically provided providing proxy publicapi rc22 ready recursiveextract registered registereddate reload remove removes removing rendercontainers rendered replace require response result return returned reversed role row rowheader rownum rows rtl running runs saved savestate scenario second selected selection set setgrouping sets setting settings shared showing skip skipping slice sort sorted space spec special specific src standalone start structure suppress suppressremovesort table templates testing text things title togglefirstrow togglerow togglerowtreestate togglesecondrow tooltip tree tree-base treeaggregation treeaggregationfn treeaggregationtype treebase treechildren treeindent treelevel treerowheaderalwaysvisible treerowheaderbasewidth treeview true tuning tutorial type typeof ui ui-grid ui-grid-cell-contents ui-grid-grouping uigridgroupingconstants undefined ungroupcolumn ungrouped ungroups unit user values var visible visiblerowcache visually wanted watch ways width work working write writes xxxx",
21842184
"isDeprecated": false
21852185
},
21862186
{

docs/js/marked.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/partials/api/ui.grid.treeBase.directive.uiGridTreeBaseExpandAllButtons.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/angular-ui/ui-grid/edit/master/src/features/tree-base/js/tree-base.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/master/src/features/tree-base/js/tree-base.js#L1616" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">uiGridTreeBaseExpandAllButtons</code>
1+
<a href="https://github.com/angular-ui/ui-grid/edit/master/src/features/tree-base/js/tree-base.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/master/src/features/tree-base/js/tree-base.js#L1624" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">uiGridTreeBaseExpandAllButtons</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">ui.grid.treeBase</code>
33
</span>
44
</div>

docs/partials/api/ui.grid.treeBase.directive.uiGridTreeRowHeaderButtons.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/angular-ui/ui-grid/edit/master/src/features/tree-base/js/tree-base.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/master/src/features/tree-base/js/tree-base.js#L1580" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">uiGridTreeRowHeaderButtons</code>
1+
<a href="https://github.com/angular-ui/ui-grid/edit/master/src/features/tree-base/js/tree-base.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/master/src/features/tree-base/js/tree-base.js#L1588" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">uiGridTreeRowHeaderButtons</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">ui.grid.treeBase</code>
33
</span>
44
</div>

docs/partials/api/ui.grid.treeBase.directive.uiGridViewport.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/angular-ui/ui-grid/edit/master/src/features/tree-base/js/tree-base.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/master/src/features/tree-base/js/tree-base.js#L1652" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">uiGridViewport</code>
1+
<a href="https://github.com/angular-ui/ui-grid/edit/master/src/features/tree-base/js/tree-base.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/angular-ui/ui-grid/blob/master/src/features/tree-base/js/tree-base.js#L1660" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">uiGridViewport</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">ui.grid.treeBase</code>
33
</span>
44
</div>

docs/partials/api/ui.grid.treeBase.service.uiGridTreeBaseService.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@
114114
</div></td></tr><tr><td>row</td><td><a href="" class="label type-hint type-hint-gridrow">GridRow</a></td><td><div class="expandrowchildren-page"><p>the row we want to expand</p>
115115
</div></td></tr></tbody></table></div>
116116
</li>
117-
<li><a href="https://github.com/angular-ui/ui-grid/blob/master/src/features/tree-base/js/tree-base.js#L1493" class="view-source icon-eye-open"> </a><h3 id="methods_finaliseaggregation">finaliseAggregation(row, aggregation)</h3>
117+
<li><a href="https://github.com/angular-ui/ui-grid/blob/master/src/features/tree-base/js/tree-base.js#L1501" class="view-source icon-eye-open"> </a><h3 id="methods_finaliseaggregation">finaliseAggregation(row, aggregation)</h3>
118118
<div class="finaliseaggregation"><div class="finaliseaggregation-page"><p>Helper function used to finalize aggregation nodes and footer cells</p>
119119
</div><h5 id="methods_finaliseaggregation_parameters">Parameters</h5><table class="variables-matrix table table-bordered table-striped"><thead><tr><th>Param</th><th>Type</th><th>Details</th></tr></thead><tbody><tr><td>row</td><td><a href="" class="label type-hint type-hint-gridrow">gridRow</a></td><td><div class="finaliseaggregation-page"><p>The parent we&#39;re finalising</p>
120120
</div></td></tr><tr><td>aggregation</td><td><a href="" class="label type-hint type-hint-aggregation">aggregation</a></td><td><div class="finaliseaggregation-page"><p>The aggregation object manipulated by the aggregationFn</p>
121121
</div></td></tr></tbody></table></div>
122122
</li>
123-
<li><a href="https://github.com/angular-ui/ui-grid/blob/master/src/features/tree-base/js/tree-base.js#L1527" class="view-source icon-eye-open"> </a><h3 id="methods_finaliseaggregations">finaliseAggregations(row)</h3>
123+
<li><a href="https://github.com/angular-ui/ui-grid/blob/master/src/features/tree-base/js/tree-base.js#L1535" class="view-source icon-eye-open"> </a><h3 id="methods_finaliseaggregations">finaliseAggregations(row)</h3>
124124
<div class="finaliseaggregations"><div class="finaliseaggregations-page"><p>Format the data from the aggregation into the rendered text
125125
e.g. if we had label: &#39;sum: &#39; and value: 25, we&#39;d create &#39;sum: 25&#39;.</p>
126126
<p>As part of this we call any formatting callback routines we&#39;ve been provided.</p>
@@ -202,7 +202,7 @@
202202
</div></td></tr></tbody></table><h5 id="methods_treebasecolumnbuilder_returns">Returns</h5><table class="variables-matrix"><tr><td><a href="" class="label type-hint type-hint-promise">promise</a></td><td><div class="treebasecolumnbuilder-page"><p>promise for the builder - actually we do it all inline so it&#39;s immediately resolved</p>
203203
</div></td></tr></table></div>
204204
</li>
205-
<li><a href="https://github.com/angular-ui/ui-grid/blob/master/src/features/tree-base/js/tree-base.js#L1559" class="view-source icon-eye-open"> </a><h3 id="methods_treefooteraggregationtype">treeFooterAggregationType(rows, column)</h3>
205+
<li><a href="https://github.com/angular-ui/ui-grid/blob/master/src/features/tree-base/js/tree-base.js#L1567" class="view-source icon-eye-open"> </a><h3 id="methods_treefooteraggregationtype">treeFooterAggregationType(rows, column)</h3>
206206
<div class="treefooteraggregationtype"><div class="treefooteraggregationtype-page"><p>Uses the tree aggregation functions and finalizers to set the
207207
column footer aggregations.</p>
208208
</div><h5 id="methods_treefooteraggregationtype_parameters">Parameters</h5><table class="variables-matrix table table-bordered table-striped"><thead><tr><th>Param</th><th>Type</th><th>Details</th></tr></thead><tbody><tr><td>rows</td><td><a href="" class="label type-hint type-hint-rows">rows</a></td><td><div class="treefooteraggregationtype-page"><p>The visible rows. not used, but accepted to match signature of GridColumn.aggregationType</p>

docs/partials/tutorial/Tutorial. 209 Grouping.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
<p>For better performance with the following example, you can choose to load the ui-grid.core.js and specific feature files instead:
9999
<pre class="prettyprint linenums">
100100
&lt;script src="/release/ui-grid.core.min.js"&gt;&lt;/script&gt;
101+
&lt;script src="/release/ui-grid.tree-base.min.js"&gt;&lt;/script&gt;
101102
&lt;script src="/release/ui-grid.grouping.min.js"&gt;&lt;/script&gt;
102103
</pre>
103104
</div><h2 id="example">Example</h2>

index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ <h1 class="text-center">Angular UI Grid</h1>
7676
Code on Github
7777
</a>
7878

79-
<a class="btn btn-danger btn-large" href="https://github.com/angular-ui/ui-grid.info/tree/gh-pages/release" title="Download 4.6.2-8c861005">
79+
<a class="btn btn-danger btn-large" href="https://github.com/angular-ui/ui-grid.info/tree/gh-pages/release" title="Download 4.6.3">
8080
<i class="fa fa-download fa-fw"></i>
81-
<!-- Download <small>( 4.6.2 / 4.6.2-8c861005 )</small> --> <!-- TODO(c0bra): note: not showing stable version till 3.0.0 is released -->
81+
<!-- Download <small>( 4.6.3 / 4.6.3 )</small> --> <!-- TODO(c0bra): note: not showing stable version till 3.0.0 is released -->
8282

83-
Download <small>( 4.6.2-8c861005 )</small>
83+
Download <small>( 4.6.3 )</small>
8484
</a>
8585

8686
<a class="btn btn-success btn-large" href="/docs/#!/tutorial" title="Tutorial">

less/body.less

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
21
.ui-grid-render-container {
32
position: inherit;
4-
// overflow: hidden;
53

64
.border-radius(0, @gridBorderRadius, @gridBorderRadius, 0);
75

@@ -12,7 +10,6 @@
1210
}
1311

1412
.ui-grid-viewport {
15-
// overflow: auto; // TODO(c0bra): turn back on when virtual repeater is hooked up
1613
min-height: 20px;
1714
position: relative;
1815
overflow-y: scroll;
@@ -52,9 +49,6 @@
5249
}
5350
}
5451
}
55-
//.ui-grid-row.ui-grid-row-selected > [ui-grid-row] > .ui-grid-cell{
56-
//
57-
//}
5852

5953
.ui-grid-no-row-overlay {
6054
position: absolute;

less/cell.less

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
.ui-grid-cell {
44
overflow: hidden;
5-
// position: absolute;
6-
// position: relative; // NOTE: removing so border is visible
75
float: left;
86
background-color: inherit;
97
border-right: @gridBorderWidth solid;
@@ -26,7 +24,6 @@
2624
text-overflow: ellipsis;
2725
overflow: hidden;
2826
height: 100%;
29-
// width: 100%;
3027
}
3128

3229
.ui-grid-cell-contents-hidden {

less/cellnav/less/cellNav.less

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
@import '../../../less/variables';
2-
@import (reference) '../../../less/bootstrap/bootstrap';
3-
4-
// .ui-grid-cell-contents:focus {
5-
// outline: 0;
6-
// background-color: @focusedCell;
7-
// }
82

93
.ui-grid-cell-focus {
104
outline: 0;
@@ -13,12 +7,17 @@
137

148
.ui-grid-focuser {
159
position: absolute;
16-
left: 0px;
17-
top: 0px;
10+
left: 0;
11+
top: 0;
1812
z-index: -1;
1913
width:100%;
2014
height:100%;
21-
#ui-grid-twbs > .form-control-focus();
15+
&:focus {
16+
border-color: #66afe9;
17+
outline: 0;
18+
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
19+
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
20+
}
2221
}
2322

2423
.ui-grid-offscreen{

less/core.less

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@import 'elements';
2+
@import 'grid';
3+
@import 'header';
4+
@import 'body';
5+
@import 'cell';
6+
@import 'footer';
7+
@import 'menu';
8+
@import 'sorting';
9+
@import 'icons';
10+
@import 'rtl';
11+
@import 'animation';

less/elements.less

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
/*---------------------------------------------------
2-
LESS Elements 0.9
3-
---------------------------------------------------
4-
A set of useful LESS mixins
5-
More info at: http://lesselements.com
6-
---------------------------------------------------*/
1+
// ---------------------------------------------------
2+
// LESS Elements 0.9
3+
// ---------------------------------------------------
4+
// A set of useful LESS mixins
5+
// More info at: http://lesselements.com
6+
// ---------------------------------------------------
77

88
.gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) {
99
background: @color;

less/footer.less

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@
99
@topPanelRadius: @gridBorderRadius - @gridBorderWidth;
1010
.ui-grid-footer-panel {
1111
position: relative;
12-
// z-index: 1;
13-
// background-color: @darkGray; // #EAEAEA
1412
border-bottom: 1px solid @borderColor; // #D4D4D4
1513
border-top: 1px solid @borderColor;
1614
overflow: hidden; // Disable so menus show up
1715
font-weight: bold;
1816

19-
// .gradient(@headerBackgroundColor, @headerGradientStart, @headerGradientStop);
2017
.ui-grid-footer-panel-background;
2118

2219
.border-radius(@topPanelRadius, 0, 0, @topPanelRadius);
@@ -51,8 +48,6 @@
5148
&:after {
5249
clear:both;
5350
}
54-
55-
// .border-radius(@gridBorderRadius, 0, 0, @gridBorderRadius);
5651
}
5752

5853
.ui-grid-footer-cell-wrapper {
@@ -68,7 +63,6 @@
6863

6964
.ui-grid-footer-cell {
7065
overflow: hidden;
71-
// position: relative; // NOTE: removing so border is visible
7266
background-color: inherit;
7367
border-right: @gridBorderWidth solid;
7468
border-color: @borderColor;

less/grid.less

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
21
.ui-grid {
32
border: @gridBorderWidth solid @borderColor;
43
box-sizing: content-box; // If bootstrap (or another included library) makes the default sizing on element "border-box", then calculations get messed up
54

65
.rounded(@gridBorderRadius);
76

87
.transform(translateZ(0));
9-
108
}
119

1210
.ui-grid-vertical-bar {
@@ -37,11 +35,6 @@
3735
background-color: @headerVerticalBarColor;
3836
}
3937

40-
// .ui-grid-vertical-bar-visible {
41-
// width: 1px;
42-
// background-color: @borderColor;
43-
// }
44-
4538
.ui-grid-clearfix {
4639
&:before, &:after {
4740
content: "";
@@ -54,7 +47,7 @@
5447
}
5548

5649
.ui-grid-invisible {
57-
visibility: hidden;;
50+
visibility: hidden;
5851
}
5952

6053
// Wraps the contents inside the grid directive with a relatively-positioned element so that all absolute elements are positioned relative to the grid, and not the page

0 commit comments

Comments
 (0)