Skip to content

Commit cc1437b

Browse files
author
Null McNull
committed
allow manual location change
1 parent 3eb8800 commit cc1437b

File tree

12 files changed

+139
-6
lines changed

12 files changed

+139
-6
lines changed

‎bower.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,8 @@
6060
"angular-mocks": {
6161
"ignore": true
6262
}
63+
},
64+
"resolutions": {
65+
"angular": "1.2.28"
6366
}
6467
}

‎dist/angular-block-ui.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/angular-block-ui.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/angular-block-ui.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/angular-block-ui.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/angular-block-ui.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/angular-block-ui.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/sandbox/preventroute-bug/index.html‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<!DOCTYPE html>
2+
<!-- define angular app -->
3+
<html ng-app="scotchApp">
4+
5+
6+
<!-- define angular app -->
7+
8+
<head>
9+
<!-- SCROLLS -->
10+
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" />
11+
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.0/css/font-awesome.css" />
12+
<link rel="stylesheet" href="https://cdn.rawgit.com/McNull/angular-block-ui/v0.1.2/dist/angular-block-ui.min.css" />
13+
<!-- SPELLS -->
14+
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.27/angular.min.js"></script>
15+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.27/angular-route.js"></script>
16+
<!-- <script src="https://cdn.rawgit.com/McNull/angular-block-ui/v0.1.2/dist/angular-block-ui.min.js"></script>-->
17+
<script src="/angular-block-ui/angular-block-ui.js"></script>
18+
19+
<script src="script.js"></script>
20+
</head>
21+
22+
<!-- define angular controller -->
23+
24+
<body ng-controller="mainController">
25+
<nav class="navbar navbar-default">
26+
<div class="container">
27+
<div class="navbar-header">
28+
<a class="navbar-brand" href="/">Angular Routing Example</a>
29+
</div>
30+
<ul class="nav navbar-nav navbar-right">
31+
<li>
32+
<a href="#/">
33+
<i class="fa fa-home"></i> Home
34+
</a>
35+
</li>
36+
<li>
37+
<a href="#/about">
38+
<i class="fa fa-shield"></i> About
39+
</a>
40+
</li>
41+
<li>
42+
<a href="#/contact">
43+
<i class="fa fa-comment"></i> Contact
44+
</a>
45+
</li>
46+
</ul>
47+
</div>
48+
</nav>
49+
<div id="main">
50+
<!-- angular templating -->
51+
<!-- this is where content will be injected -->
52+
<div ng-view=""></div>
53+
</div>
54+
<footer class="text-center">
55+
<p>View the tutorial on <a href="http://scotch.io/tutorials/javascript/single-page-apps-with-angularjs-routing-and-templating">Scotch.io</a>
56+
</p>
57+
<p>View a tutorial on <a href="http://scotch.io/tutorials/javascript/animating-angularjs-apps-ngview">Animating Your Angular Single Page App</a>
58+
</p>
59+
</footer>
60+
61+
</body>
62+
63+
</html>

‎src/sandbox/preventroute-bug/pages/about.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<div class="jumbotron text-center">
2+
<h1>About Page</h1>
3+
4+
<p>{{ message }}</p>
5+
</div>

‎src/sandbox/preventroute-bug/pages/contact.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<div class="jumbotron text-center">
2+
<h1>Contact Page</h1>
3+
4+
<p>{{ message }}</p>
5+
</div>

0 commit comments

Comments
 (0)