Add the dataTable and DataTable instances #86

l-lin · Oct 3, 2014 · c25b040 · c25b040
1 parent 635d07c
commit c25b040
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -85,7 +85,11 @@ You can catch the event like this in your parent directive or controller:
 
 ```js
 $scope.$on('event:dataTableLoaded', function(event, loadedDT) {
-    // loadedDT === {"id": "foobar", dt: oTable}
+    // loadedDT === {"id": "foobar", "DataTable": oTable, "dataTable": $oTable}
+
+    // loadedDT.DataTable is the DataTable API instance
+    // loadedDT.dataTable is the jQuery Object
+    // See http://datatables.net/manual/api#Accessing-the-API
 });
 ```
 

diff --git a/demo/partials/getting_started.html b/demo/partials/getting_started.html
@@ -79,7 +79,11 @@ <h3>Additional Notes</h3>
                     </p>
 <div hljs language="js">
 $scope.$on('event:dataTableLoaded', function(event, loadedDT) {
-    // loadedDT === {"id": "foobar", dt: oTable}
+    // loadedDT === {"id": "foobar", "DataTable": oTable, "dataTable": $oTable}
+
+    // loadedDT.DataTable is the DataTable API instance
+    // loadedDT.dataTable is the jQuery Object
+    // See http://datatables.net/manual/api#Accessing-the-API
 });
 </div>
                 </li>

diff --git a/dist/angular-datatables.js b/dist/angular-datatables.js
@@ -863,9 +863,11 @@
             options.destroy = true;
           }
           var oTable = $elem.DataTable(options);
+          // See http://datatables.net/manual/api#Accessing-the-API to understand the difference between DataTable and dataTable
           $scope.$emit('event:dataTableLoaded', {
             id: $elem.attr('id'),
-            dt: oTable
+            DataTable: oTable,
+            dataTable: $elem.dataTable()
           });
           return oTable;
         },

diff --git a/dist/angular-datatables.min.js b/dist/angular-datatables.min.js
diff --git a/index.html b/index.html
@@ -71,15 +71,15 @@ <h1>
 	<script src="vendor/angular-bootstrap/ui-bootstrap.min.js"></script>
 	<script src="vendor/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
 
-	<script src="dist/angular-datatables.min.js"></script>
-    <!--<script src="src/angular-datatables.js"></script>-->
-    <!--<script src="src/angular-datatables.util.js"></script>-->
-    <!--<script src="src/angular-datatables.options.js"></script>-->
-    <!--<script src="src/angular-datatables.factory.js"></script>-->
-    <!--<script src="src/angular-datatables.renderer.js"></script>-->
-    <!--<script src="src/angular-datatables.bootstrap.options.js"></script>-->
-    <!--<script src="src/angular-datatables.bootstrap.js"></script>-->
-    <!--<script src="src/angular-datatables.directive.js"></script>-->
+	<!--<script src="dist/angular-datatables.min.js"></script>-->
+    <script src="src/angular-datatables.js"></script>
+    <script src="src/angular-datatables.util.js"></script>
+    <script src="src/angular-datatables.options.js"></script>
+    <script src="src/angular-datatables.factory.js"></script>
+    <script src="src/angular-datatables.renderer.js"></script>
+    <script src="src/angular-datatables.bootstrap.options.js"></script>
+    <script src="src/angular-datatables.bootstrap.js"></script>
+    <script src="src/angular-datatables.directive.js"></script>
 
 	<script src="demo/app.js"></script>
 	<script src="demo/api.js"></script>

diff --git a/src/angular-datatables.renderer.js b/src/angular-datatables.renderer.js
@@ -18,7 +18,8 @@ angular.module('datatables.renderer', ['datatables.factory', 'datatables.options
                 options.destroy = true;
             }
             var oTable = $elem.DataTable(options);
-            $scope.$emit('event:dataTableLoaded', { id: $elem.attr('id'), dt: oTable });
+            // See http://datatables.net/manual/api#Accessing-the-API to understand the difference between DataTable and dataTable
+            $scope.$emit('event:dataTableLoaded', { id: $elem.attr('id'), DataTable: oTable, dataTable: $elem.dataTable() });
             return oTable;
         },
         doRenderDataTable: function($elem, options, $scope) {