Skip to content

Commit 07170a6

Browse files
committed
Merge remote-tracking branch 'refs/remotes/IgniteUI/master'
2 parents 1262908 + b8f4dff commit 07170a6

54 files changed

Lines changed: 1033 additions & 57 deletions

Some content is hidden

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

HTMLSamples/data-chart/edit-chart-items-with-knockout.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
.legend-container { width: 300px; margin-top: 10px; }
3737
.legend-container .title { font-weight: bold; font-size: 14px; margin-bottom: 10px; }
3838
.legend-container .legend { float: left; width: 48px; height: 48px; margin: 2px 5px 5px 0; padding: 0;
39-
background-image: url(../../../../images/data-chart/music-controls-sprite.png); background-repeat: no-repeat;
39+
background-image: url(https://igniteui.github.io/help-samples/images/data-chart/music-controls-sprite.png); background-repeat: no-repeat;
4040
border: 1px solid #535353; zoom: 50%; }
4141
.legend-container .add { background-position: -337px 0px; }
4242
.legend-container .delete { background-position: -384px 0px; }
@@ -63,7 +63,7 @@
6363
.btn-container .btn-add-end:hover { background-position: -336px -50px; }
6464
.legend-container .btn-pause { background-position: -96px 0px; opacity: 0.5 }
6565
.legend-container button { float: left; width: 48px; height: 48px; margin: 2px 5px 5px 0; padding: 0; border: none; cursor: pointer; padding: 0;
66-
background-image: url(../../../../images/data-chart/music-controls-sprite.png); background-repeat: no-repeat;
66+
background-image: url(https://igniteui.github.io/help-samples/images/data-chart/music-controls-sprite.png); background-repeat: no-repeat;
6767
border: 1px solid #535353; zoom: 50% }
6868
.legend-container span { font-size: 12px; }
6969
#barColumnChart { margin-top: 20px; }

HTMLSamples/dialog-window/angular.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<ig-dialog id="dialog1" header-text="Foo" height="325px">
2929
<content>
3030
<p>
31-
<img style="width: 220px" src="../../images/samples/dialog-window/content.jpg">
31+
<img style="width: 220px" src="https://igniteui.github.io/help-samples/images/dialog-window/content.jpg">
3232
</p>
3333
<input style="margin: 5px"></input>
3434
</content>

HTMLSamples/dialog-window/api-and-events.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<!--igDialog target element-->
3636
<div id="dialog" class="sb-min-tablet-portrait">
3737
<p>
38-
<img src="../../images/samples/dialog-window/content.jpg">
38+
<img src="https://igniteui.github.io/help-samples/images/dialog-window/content.jpg">
3939
</p>
4040
<button id="closeDialog"></button>
4141
</div>

HTMLSamples/grid/append-rows-on-demand.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ <h3>$$(AppendRowsOnDemand_Button_Caption)</h3>
9191
});
9292

9393
$('#autoAppendRowsOnDemand').igGrid({
94-
dataSource: 'http://igniteui.com/api/tweets',
95-
responseDataKey: 'Records',
94+
dataSource: 'https://www.igniteui.com/api/tweets?callback=?',
95+
responseDataKey: 'd.results.Records',
9696
autoGenerateColumns: false,
9797
enableUTCDates: true,
9898
columns: [
@@ -105,7 +105,7 @@ <h3>$$(AppendRowsOnDemand_Button_Caption)</h3>
105105
],
106106
features: [
107107
{
108-
recordCountKey: 'TotalRecordsCount',
108+
recordCountKey: 'd.results.TotalRecordsCount',
109109
chunkIndexUrlKey: 'page',
110110
chunkSizeUrlKey: 'pageSize',
111111
name: 'AppendRowsOnDemand',
@@ -119,8 +119,8 @@ <h3>$$(AppendRowsOnDemand_Button_Caption)</h3>
119119
});
120120

121121
$('#buttonAppendRowsOnDemand').igGrid({
122-
dataSource: 'http://igniteui.com/api/tweets',
123-
responseDataKey: 'Records',
122+
dataSource: 'https://www.igniteui.com/api/tweets?callback=?',
123+
responseDataKey: 'd.results.Records',
124124
autoGenerateColumns: false,
125125
enableUTCDates: true,
126126
columns: [
@@ -133,7 +133,7 @@ <h3>$$(AppendRowsOnDemand_Button_Caption)</h3>
133133
],
134134
features: [
135135
{
136-
recordCountKey: 'TotalRecordsCount',
136+
recordCountKey: 'd.results.TotalRecordsCount',
137137
chunkIndexUrlKey: 'page',
138138
chunkSizeUrlKey: 'pageSize',
139139
name: 'AppendRowsOnDemand',

HTMLSamples/grid/export-client-events.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
exportingOverlay.css({
126126
"width": $gridContainer.outerWidth(),
127127
"height": $gridContainer.outerHeight()
128-
}).html('<span class="exporting-text">Exporting...</span>');
128+
}).html('<span class="exporting-text">$$(Exporting)</span>');
129129
exportingOverlay.addClass("exporting-overlay");
130130

131131
$gridContainer.append(exportingOverlay);

0 commit comments

Comments
 (0)