Skip to content

Commit 885ccb3

Browse files
committed
project cleanup
1 parent 764e735 commit 885ccb3

File tree

6 files changed

+31
-11
lines changed

6 files changed

+31
-11
lines changed

bower.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@
4646
"respond": "~1.4.2",
4747
"html5shiv": "~3.7.2",
4848
"showdown": "~0.3.1",
49-
"animate.css": "~3.2.0"
49+
"animate.css": "~3.2.0",
50+
"angular-markdown-text": "~0.0.2",
51+
"angular-sanitize": "1.2.26"
5052
},
5153
"overrides": {
5254
"respond": {

build-config.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ var config = {
2828
// name: 'angular-delay',
2929
// alias: 'delay'
3030
// },
31-
{
32-
name: 'angular-showdown',
33-
alias: 'showdown'
34-
},
31+
// {
32+
// name: 'angular-showdown',
33+
// alias: 'showdown'
34+
// },
3535
{
3636
name: 'app',
3737
alias: 'myApp'

dist/README.md

+15
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,21 @@ It's also possible to do the blocking manually. The blockUI module exposes a ser
4949
});
5050
};
5151
});
52+
53+
##### Non-angular events
54+
Note that whenever you're starting or stopping a block in an event outside of _AngularJS_ you'll need to wrap this inside a `$apply` call to [make _AngularJS_ aware of changes on the scope](http://jimhoskins.com/2012/12/17/angularjs-and-apply.html).
55+
56+
```
57+
var button = document.getElementById('clickMe');
58+
button.addEventListener('click', buttonClicked);
59+
60+
function buttonClicked () {
61+
// Event called without the knowledge of angular
62+
$scope.$apply(function() {
63+
blockUI.stop();
64+
});
65+
}
66+
```
5267

5368
BlockUI service methods
5469
=======================

src/app/app.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
angular.module('myApp', [
22
'ngRoute',
3-
'ngResource',
4-
'ngAnimate',
3+
'ngSanitize',
4+
// 'ngResource',
5+
// 'ngAnimate',
56
'blockUI',
6-
'showdown',
7+
'markdown',
78
'responseLag',
89
'inform',
910
'inform-exception',

src/app/examples/readme.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<div>
2-
<div showdown showdown-src="app/README.md"></div>
2+
<div markdown markdown-src="'app/README.md'"></div>
33
</div>

src/index.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,12 @@
3939
<script src="vendor/showdown/compressed/showdown.js"></script>
4040
<script src="vendor/angular/angular.js"></script>
4141
<script src="vendor/angular-route/angular-route.min.js"></script>
42-
<script src="vendor/angular-animate/angular-animate.min.js"></script>
43-
<script src="vendor/angular-resource/angular-resource.min.js"></script>
42+
<!--<script src="vendor/angular-animate/angular-animate.min.js"></script>-->
43+
<script src="vendor/angular-sanitize/angular-sanitize.min.js"></script>
44+
<!--<script src="vendor/angular-resource/angular-resource.min.js"></script>-->
4445
<script src="vendor/angular-inform/dist/angular-inform.min.js"></script>
4546
<script src="vendor/angular-response-lag/angular-response-lag.min.js"></script>
47+
<script src="vendor/angular-markdown-text/dist/angular-markdown-text.min.js"></script>
4648

4749
<% _.forEach(js, function(include) { %>
4850
<script src="<%-include%>"></script>

0 commit comments

Comments
 (0)