Skip to content

Commit ddc2922

Browse files
committed
Merge pull request l-lin#11 from l-lin/dev
Merge master from dev
2 parents 1fbb734 + 17779fc commit ddc2922

8 files changed

+14
-27
lines changed

demo/partials/api.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ <h3>DTOptionsBuilder</h3>
7272
<tr>
7373
<td><code>DTOptions</code></td>
7474
<td><code>withFnServerData(fn)</code></td>
75-
<td>Set the data server retrieval function. If not defined, it uses angular <code>$http</code> to call the requests.</td>
75+
<td>Set the data server retrieval function.</td>
7676
</tr>
7777
<tr>
7878
<td><code>DTOptions</code></td>

dist/angular-datatables.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,14 +224,6 @@
224224
if (angular.isDefined($scope.dtOptions)) {
225225
var options = {};
226226
angular.extend(options, $scope.dtOptions);
227-
// for Angular http inceptors
228-
if (angular.isUndefined(options.fnServerData)) {
229-
options.fnServerData = function (sSource, aoData, resultCb) {
230-
$http.get(sSource).then(function (result) {
231-
resultCb(result.data);
232-
});
233-
};
234-
}
235227
// Set the columns
236228
if (angular.isArray($scope.dtColumns)) {
237229
options.aoColumns = $scope.dtColumns;

dist/angular-datatables.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.

dist/datatables.boostrap.css renamed to dist/datatables.bootstrap.css

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ div.dataTables_scrollFoot table {
7878
/*
7979
* TableTools styles
8080
*/
81-
.table tbody tr.active td, .table tbody tr.active th {
81+
/*
82+
.table tbody tr.active td, .table tbody tr.active th {
8283
background-color: #08C;
8384
color: white;
8485
}
@@ -88,6 +89,7 @@ div.dataTables_scrollFoot table {
8889
.table-striped tbody tr.active:nth-child(odd) td, .table-striped tbody tr.active:nth-child(odd) th {
8990
background-color: #017ebc;
9091
}
92+
*/
9193
table.DTTT_selectable tbody tr {
9294
cursor: pointer;
9395
}
@@ -114,7 +116,7 @@ div.DTTT_collection_background {
114116
z-index: 2002;
115117
}
116118
/* TableTools information display */
117-
div.DTTT_print_info.modal {
119+
div.DTTT_print_info.modal {
118120
height: 150px;
119121
margin-top: -75px;
120122
text-align: center;
@@ -132,7 +134,7 @@ div.DTTT_print_info p {
132134
/*
133135
* FixedColumns styles
134136
*/
135-
div.DTFC_LeftHeadWrapper table, div.DTFC_LeftFootWrapper table, div.DTFC_RightHeadWrapper table, div.DTFC_RightFootWrapper table, table.DTFC_Cloned tr.even {
137+
div.DTFC_LeftHeadWrapper table, div.DTFC_LeftFootWrapper table, div.DTFC_RightHeadWrapper table, div.DTFC_RightFootWrapper table, table.DTFC_Cloned tr.even {
136138
background-color: white;
137139
}
138140
div.DTFC_RightHeadWrapper table, div.DTFC_LeftHeadWrapper table {

0 commit comments

Comments
 (0)