Skip to content

Commit f53efd2

Browse files
author
Null McNull
committed
Merge branch 'single-block-ui-element' into animation
2 parents 7811963 + f1bf93d commit f53efd2

13 files changed

+142
-80
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Specifies the amount in milliseconds before the block is visible to the user. By
147147
Specifies a custom template to use as the overlay.
148148

149149
// Provide a custom template to use
150-
blockUIConfigProvider.template('<div class="block-ui-overlay">{{ message }}</div>');
150+
blockUIConfigProvider.template('<pre><code>{{ state | json }}</code></pre>');
151151

152152
#### templateUrl
153153
Specifies a url to retrieve the template from. *The current release only works with pre-cached templates, which means that this url should be known in the $templateCache service of Angular. If you're using the grunt with html2js or angular-templates, which I highly recommend, you're already set.*

dist/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Specifies the amount in milliseconds before the block is visible to the user. By
147147
Specifies a custom template to use as the overlay.
148148

149149
// Provide a custom template to use
150-
blockUIConfigProvider.template('<div class="block-ui-overlay">{{ message }}</div>');
150+
blockUIConfigProvider.template('<pre><code>{{ state | json }}</code></pre>');
151151

152152
#### templateUrl
153153
Specifies a url to retrieve the template from. *The current release only works with pre-cached templates, which means that this url should be known in the $templateCache service of Angular. If you're using the grunt with html2js or angular-templates, which I highly recommend, you're already set.*

dist/angular-block-ui.js

Lines changed: 14 additions & 6 deletions
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.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.

0 commit comments

Comments
 (0)