Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add showJsError when developing. Update imagemin version. #107

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add showJsError when developing. Update imagemin version. #107

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d724911
Add showJsError when developing. Update imagemin version.
HelenaEksler Mar 28, 2016
93fdff0
Show Javascript and Angular errors in popup on development.
HelenaEksler Mar 31, 2016
14c9843
Include custom script only on dev.
HelenaEksler Mar 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/templates/client/Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,11 @@ module.exports = function (grunt) {

// Automatically inject Bower components into the app
wiredep: {
dev: {
devDependencies: true,
src: ['<%= yeoman.app %>/index.html'],
ignorePath: /\.\.\//
},
app: {
src: ['<%= yeoman.app %>/index.html'],
ignorePath: /\.\.\//
Expand Down Expand Up @@ -453,7 +458,7 @@ module.exports = function (grunt) {
grunt.task.run([
'clean:server',
'ngconstant:server',
'wiredep',
'wiredep:dev',
'concurrent:server',
'autoprefixer',
'connect:livereload',
Expand Down
14 changes: 12 additions & 2 deletions app/templates/client/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ <h3>Login with demo / 1234</h3>
</pre>
</div>


<!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
Expand All @@ -64,7 +63,6 @@ <h3>Login with demo / 1234</h3>
<script src="bower_components/angular-animate/angular-animate.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.js"></script>
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
<script src="bower_components/leaflet/dist/leaflet.js"></script>
<script src="bower_components/leaflet/dist/leaflet-src.js"></script>
<script src="bower_components/angular-leaflet-directive/dist/angular-leaflet-directive.js"></script>
<script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
Expand Down Expand Up @@ -94,5 +92,17 @@ <h3>Login with demo / 1234</h3>
<script src="scripts/services/account.js"></script>
<script src="scripts/controllers/homepage.js"></script>
<!-- endbuild -->

<script>
// Use showJsError bower component if exists.
if (typeof showJSError !== 'undefined') {
showJSError.init({
title: 'JavaScript error',
userAgent: navigator.userAgent,
sendText: 'Send',
sendUrl: 'https://github.com/skeleton/skeleton/issues/new?title={title}&body={body}'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the github URL should be replaced upon yo hedley -- see other places where is happens

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are right. I've forgot to change it after synchronization.

});
}
</script>
</body>
</html>
3 changes: 2 additions & 1 deletion app/templates/client/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"angular-scenario": "~1.3.0",
"angular": "~1.4.0",
"json3": "~3.3.2",
"es5-shim": "~4.1.6"
"es5-shim": "~4.1.6",
"show-js-error" : "1.2.0"
},
"appPath": "app",
"resolutions": {
Expand Down
2 changes: 1 addition & 1 deletion app/templates/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"grunt-contrib-copy": "^0.8.0",
"grunt-contrib-cssmin": "^0.12.3",
"grunt-contrib-htmlmin": "^0.4.0",
"grunt-contrib-imagemin": "^0.9.4",
"grunt-contrib-imagemin": "^1.0.0",
"grunt-contrib-jshint": "^0.11.2",
"grunt-contrib-uglify": "^0.9.1",
"grunt-contrib-watch": "^0.6.1",
Expand Down