Merge branch 'lius-master' into dev (#18)

Author: l-lin

dist/angular-datatables.js

@@ -239,7 +239,7 @@
               return new NGRenderer(options);
             }
             if (angular.isDefined(options)) {
-              if (angular.isFunction(options.fnPromise)) {
+              if (angular.isDefined(options.fnPromise)) {
                 return new PromiseRenderer(options);
               }
               if (angular.isDefined(options.sAjaxSource)) {
@@ -314,7 +314,11 @@
               _loadedPromise = null;
             };
             var _startLoading = function (fnPromise) {
-              _loadedPromise = fnPromise();
+              if (angular.isFunction(fnPromise)) {
+                _loadedPromise = fnPromise();
+              } else {
+                _loadedPromise = fnPromise;
+              }
               _showLoading($elem);
               _loadedPromise.then(_whenLoaded);
             };
@@ -328,10 +332,10 @@
               }
             };
             $scope.$watch('dtOptions.fnPromise', function (fnPromise) {
-              if (angular.isFunction(fnPromise)) {
+              if (angular.isDefined(fnPromise)) {
                 _reload(fnPromise);
               } else {
-                throw new Error('You must provide a function that returns a promise!');
+                throw new Error('You must provide a promise or a function that returns a promise!');
               }
             });
             $scope.$watch('dtOptions.reload', function (reload) {