Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Commit 730e575

Browse files
committed
Use instead of in doc #777
1 parent 12444ad commit 730e575

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

demo/basic/withPromise.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,14 @@ <h1><i class="fa fa-play"></i>&nbsp;With a function that returns a promise</h1>
3434
<div hljs language="js">
3535
angular.module('showcase.withPromise', ['datatables', 'ngResource']).controller('WithPromiseCtrl', WithPromiseCtrl);
3636

37-
function WithPromiseCtrl(DTOptionsBuilder, DTColumnBuilder, $resource) {
37+
function WithPromiseCtrl(DTOptionsBuilder, DTColumnBuilder, $http, $q) {
3838
var vm = this;
3939
vm.dtOptions = DTOptionsBuilder.fromFnPromise(function() {
40-
return $resource('data.json').query().$promise;
40+
var defer = $q.defer();
41+
$http.get('data.json').then(function(result) {
42+
defer.resolve(result.data);
43+
});
44+
return defer.promise;
4145
}).withPaginationType('full_numbers');
4246

4347
vm.dtColumns = [

demo/basic/withPromise.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
'use strict';
22
angular.module('showcase.withPromise', ['datatables', 'ngResource']).controller('WithPromiseCtrl', WithPromiseCtrl);
33

4-
function WithPromiseCtrl(DTOptionsBuilder, DTColumnBuilder, $resource) {
4+
function WithPromiseCtrl(DTOptionsBuilder, DTColumnBuilder, $http, $q) {
55
var vm = this;
66
vm.dtOptions = DTOptionsBuilder.fromFnPromise(function() {
7-
return $resource('data.json').query().$promise;
7+
var defer = $q.defer();
8+
$http.get('data.json').then(function(result) {
9+
defer.resolve(result.data);
10+
});
11+
return defer.promise;
812
}).withPaginationType('full_numbers');
913

1014
vm.dtColumns = [

0 commit comments

Comments
 (0)