Merge pull request wenzhixin#46 from dbkaplun/angular

Fix angularjs example

Author: wenzhixin

integrate/angularjs.html

@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
     <!-- Latest compiled and minified CSS -->
     <link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.8.1/bootstrap-table.min.css">
-    
+
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.min.js"></script>
     <!-- Latest compiled and minified JavaScript -->
@@ -31,8 +31,7 @@
 
     <!-- Workspaces containers -->
     <div class="workspaceContainer" ng-repeat="wk in workspaces" ng-show="currentWorkspace==wk">
-
-        <table data-options="wk.tableOptions" bs-table-control> </table>
+        <table bs-table-control="wk.bsTableControl"></table>
     </div>
 
 

integrate/app.js

@@ -26,64 +26,66 @@ angular.module('app', ['bsTable'])
         var colData = {workspace: wk.name};
         wk.rows = makeRandomRows(colData);
         setInterval(function () {
-            wk.rows = wk.tableOptions.data = makeRandomRows(colData);
+            wk.rows = wk.bsTableControl.options.data = makeRandomRows(colData);
             $scope.$applyAsync();
         }, 5000);
 
-        wk.tableOptions = {
-            data: wk.rows,
-            rowStyle: function (row, index) {
-                return { classes: 'none' };
-            },
-            cache: false,
-            height: 400,
-            striped: true,
-            pagination: true,
-            pageSize: 10,
-            pageList: [5, 10, 25, 50, 100, 200],
-            search: true,
-            showColumns: true,
-            showRefresh: false,
-            minimumCountColumns: 2,
-            clickToSelect: false,
-            showToggle: true,
-            maintainSelected: true,
-            columns: [{
-                field: 'state',
-                checkbox: true
-            }, {
-                field: 'index',
-                title: '#',
-                align: 'right',
-                valign: 'bottom',
-                sortable: true
-            }, {
-                field: 'id',
-                title: 'Item ID',
-                align: 'center',
-                valign: 'bottom',
-                sortable: true
-            }, {
-                field: 'name',
-                title: 'Item Name',
-                align: 'center',
-                valign: 'middle',
-                sortable: true
-            }, {
-                field: 'workspace',
-                title: 'Workspace',
-                align: 'left',
-                valign: 'top',
-                sortable: true
-            }, {
-                field: 'flag',
-                title: 'Flag',
-                align: 'center',
-                valign: 'middle',
+        wk.bsTableControl = {
+            options: {
+                data: wk.rows,
+                rowStyle: function (row, index) {
+                    return { classes: 'none' };
+                },
+                cache: false,
+                height: 400,
+                striped: true,
+                pagination: true,
+                pageSize: 10,
+                pageList: [5, 10, 25, 50, 100, 200],
+                search: true,
+                showColumns: true,
+                showRefresh: false,
+                minimumCountColumns: 2,
                 clickToSelect: false,
-                formatter: flagFormatter,
-                // events: flagEvents
-            }]
+                showToggle: true,
+                maintainSelected: true,
+                columns: [{
+                    field: 'state',
+                    checkbox: true
+                }, {
+                    field: 'index',
+                    title: '#',
+                    align: 'right',
+                    valign: 'bottom',
+                    sortable: true
+                }, {
+                    field: 'id',
+                    title: 'Item ID',
+                    align: 'center',
+                    valign: 'bottom',
+                    sortable: true
+                }, {
+                    field: 'name',
+                    title: 'Item Name',
+                    align: 'center',
+                    valign: 'middle',
+                    sortable: true
+                }, {
+                    field: 'workspace',
+                    title: 'Workspace',
+                    align: 'left',
+                    valign: 'top',
+                    sortable: true
+                }, {
+                    field: 'flag',
+                    title: 'Flag',
+                    align: 'center',
+                    valign: 'middle',
+                    clickToSelect: false,
+                    formatter: flagFormatter,
+                    // events: flagEvents
+                }]
+            }
         };
         function flagFormatter(value, row, index) {
             return '<img src="' + row.flagImage + '"/>'