RosterBot
diff --git a/‎dist/angular-datatables.js
Lines changed: 12 additions & 21 deletions b/‎dist/angular-datatables.js
Lines changed: 12 additions & 21 deletions
diff --git a/‎dist/angular-datatables.min.js
Lines changed: 1 addition & 1 deletion b/‎dist/angular-datatables.min.js
Lines changed: 1 addition & 1 deletion
@@ -214,9 +214,7 @@
     'DT_DEFAULT_OPTIONS',
     '$timeout',
     'DT_LAST_ROW_KEY',
-    'DT_HAS_NG_ROWS',
-    function ($http, DT_DEFAULT_OPTIONS, $timeout, DT_LAST_ROW_KEY, DT_HAS_NG_ROWS) {
-      var hasNgRows = false;
+    function ($http, DT_DEFAULT_OPTIONS, $timeout, DT_LAST_ROW_KEY) {
       var $loading = angular.element('<h3>Loading...</h3>');
       var _doRenderDataTable = function ($elem, options) {
         // Add $timeout to be sure that angular has finished rendering before calling datatables
@@ -227,20 +225,17 @@
           $elem.dataTable(options);
         }, 0, false);
       };
-      var _renderDataTableIfNoNgRows = function ($elem, options) {
-        // Mmh ugly... I don't know how to do it in another way...
-        // Waiting in case we have ng rows
-        $timeout(function () {
-          if (!hasNgRows) {
-            _doRenderDataTable($elem, options);
-          }
-        }, 100);
+      var _renderDataTableIfNoNgRows = function ($elem, options, isNgDisplay) {
+        if (!isNgDisplay) {
+          _doRenderDataTable($elem, options);
+        }
       };
       return {
         restrict: 'A',
         scope: {
           dtOptions: '=',
-          dtColumns: '='
+          dtColumns: '=',
+          datatable: '@'
         },
         link: function ($scope, $elem) {
           // Display loading
@@ -268,10 +263,8 @@
               }
             }
           }
-          _renderDataTableIfNoNgRows($elem, options);
-          $scope.$on(DT_HAS_NG_ROWS, function () {
-            hasNgRows = true;
-          });
+          var isNgDisplay = $scope.datatable && $scope.datatable === 'ng';
+          _renderDataTableIfNoNgRows($elem, options, isNgDisplay);
           $scope.$on(DT_LAST_ROW_KEY, function () {
             _doRenderDataTable($elem, options);
           });
@@ -281,12 +274,10 @@
   ]).directive('dtRows', [
     '$rootScope',
     'DT_LAST_ROW_KEY',
-    'DT_HAS_NG_ROWS',
-    function ($rootScope, DT_LAST_ROW_KEY, DT_HAS_NG_ROWS) {
+    function ($rootScope, DT_LAST_ROW_KEY) {
       return {
         restrict: 'A',
         link: function ($scope) {
-          $rootScope.$broadcast(DT_HAS_NG_ROWS);
           if ($scope.$last === true) {
             $rootScope.$broadcast(DT_LAST_ROW_KEY);
           }
@@ -486,7 +477,7 @@
              * Add option to "oColReorder" option
              * @param key the key of the option to add
              * @param value an object or a function of the function
-             * @param {DTOption} the options
+             * @return {DTOptions} the options
              */
         this.withColReorderOption = function (key, value) {
           if (angular.isString(key)) {
@@ -698,5 +689,5 @@
     'datatables.directive',
     'datatables.factory',
     'datatables.bootstrap'
-  ]).value('DT_LAST_ROW_KEY', 'datatable:lastRow').value('DT_HAS_NG_ROWS', 'datatable:hasNgRow');
+  ]).value('DT_LAST_ROW_KEY', 'datatable:lastRow');
 }(angular));