Skip to content

Commit 519ebd7

Browse files
committed
Add angular example.
1 parent 66b6ace commit 519ebd7

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

index.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,12 @@
9999
<li><a href="extensions/fixed-columns.html">Fixed Columns</a></li>
100100
</ul>
101101
</li>
102+
<li>
103+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Integrate <span class="caret"></span></a>
104+
<ul class="dropdown-menu" role="menu">
105+
<li><a href="integrate/angular">Angular</a></li>
106+
</ul>
107+
</li>
102108
<li>
103109
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Issues <span class="caret"></span></a>
104110
<ul class="dropdown-menu" role="menu">

index.html.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,12 @@
9999
<li><a href="extensions/fixed-columns.html">Fixed Columns</a></li>
100100
</ul>
101101
</li>
102+
<li>
103+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Integrate <span class="caret"></span></a>
104+
<ul class="dropdown-menu" role="menu">
105+
<li><a href="integrate/angular">Angular</a></li>
106+
</ul>
107+
</li>
102108
<li>
103109
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Issues <span class="caret"></span></a>
104110
<ul class="dropdown-menu" role="menu">

integrate/app.js renamed to integrate/angular/app.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ angular.module('app', ['bsTable'])
2525
$scope.workspaces.forEach(function (wk,index) {
2626
var colData = {workspace: wk.name};
2727
wk.rows = makeRandomRows(colData);
28-
setInterval(function () {
29-
wk.rows = wk.bsTableControl.options.data = makeRandomRows(colData);
30-
$scope.$applyAsync();
31-
}, 5000);
3228

3329
wk.bsTableControl = {
3430
options: {
@@ -96,7 +92,7 @@ angular.module('app', ['bsTable'])
9692

9793
$scope.changeCurrentWorkspace = function (wk) {
9894
$scope.currentWorkspace = wk;
99-
}
95+
};
10096

10197

10298
//Select the workspace in document ready event
File renamed without changes.
File renamed without changes.

integrate/angularjs.html renamed to integrate/angular/index.html

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@
88

99

1010
<!-- Latest compiled and minified CSS -->
11-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
11+
<link rel="stylesheet" href="../../assets/bootstrap/css/bootstrap.min.css">
1212
<!-- Latest compiled and minified CSS -->
13-
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.8.1/bootstrap-table.min.css">
13+
<link rel="stylesheet" href="../../assets/bootstrap-table/src/bootstrap-table.css">
1414

15-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
16-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.min.js"></script>
15+
<script src="../../assets/jquery.min.js"></script>
16+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.min.js"></script>
1717
<!-- Latest compiled and minified JavaScript -->
18-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
19-
<!-- Latest compiled and minified JavaScript -->
20-
<script src="../node_modules/bootstrap-table/dist/bootstrap-table.min.js"></script>
21-
<script src="../assets/bootstrap-table/dist/extensions/angular/bootstrap-table-angular.min.js"></script>
18+
<script src="../../assets/bootstrap-table/src/bootstrap-table.js"></script>
19+
<script src="../../assets/bootstrap-table/dist/extensions/angular/bootstrap-table-angular.js"></script>
2220

2321

2422
<script src="app.js"></script>

0 commit comments

Comments
 (0)