Skip to content

Commit bb5f5b0

Browse files
author
Cristian Escudero
committed
Fixing issues when building a sample project.
Summary: Minor fix in the template to avoid warnings The major problems were related to dependency problems. I removed angular-mocks and angular-scenarios due to there are not longer being used (and angular-scenarios is now deprected). Resolves #123456 Test Plan: Built test server and tested. Reviewers: jmsotuyo Reviewed By: jmsotuyo Differential Revision: http://ph.monits.com/D12501
1 parent 9dfc8fb commit bb5f5b0

File tree

4 files changed

+26
-29
lines changed

4 files changed

+26
-29
lines changed

app/templates/_bower.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"version": "0.0.0",
44
"dependencies": {
55
"angular": "~1.2.0",
6-
"json3": "~3.3.1",
7-
"es5-shim": "~3.1.0",
8-
"bootstrap-sass-official": "~3.2.0",
96
"angular-route": "~1.2.0",
7+
"angular-translate": "~2.4.2",
8+
"bootstrap-sass-official": "~3.2.0",
9+
"es5-shim": "~3.1.0",
10+
"json3": "~3.3.1",
1011
"moment": "~2.8.3",
11-
"requirejs": "~2.1.11",
12-
"angular-translate": "~2.4.2"
12+
"requirejs": "~2.1.11"
1313
},
1414
"devDependencies": {
1515
"bootstrap": "~3.3.1"

app/templates/_index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title><%= appname %></title>
66
<meta name="description" content="">
7-
7+
88
<!-- build:css(.tmp) styles/main.css -->
99
<link rel="stylesheet" href="styles/main.css">
1010
<!-- endbuild -->

app/templates/scripts/_build.js

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,27 @@
22
require.config({
33
baseUrl: '/scripts',
44
paths: {
5-
angular: '../../bower_components/angular/angular',
5+
'affix': '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix',
6+
'alert': '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/alert',
7+
'angular': '../../bower_components/angular/angular',
68
'angular-route': '../../bower_components/angular-route/angular-route',
7-
bootstrap: '../../bower_components/bootstrap/dist/js/bootstrap',
8-
jquery: '../../bower_components/jquery/dist/jquery',
9-
'angular-mocks': '../../bower_components/angular-mocks/angular-mocks',
10-
'angular-scenario': '../../bower_components/angular-scenario/angular-scenario',
11-
affix: '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix',
12-
alert: '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/alert',
13-
button: '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/button',
14-
carousel: '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/carousel',
15-
collapse: '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse',
16-
dropdown: '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/dropdown',
17-
tab: '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tab',
18-
transition: '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/transition',
19-
scrollspy: '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/scrollspy',
20-
modal: '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/modal',
21-
tooltip: '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip',
22-
popover: '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/popover',
9+
'angular-translate': '../../bower_components/angular-translate/angular-translate',
10+
'button': '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/button',
11+
'bootstrap': '../../bower_components/bootstrap/dist/js/bootstrap',
12+
'carousel': '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/carousel',
13+
'collapse': '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse',
14+
'dropdown': '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/dropdown',
2315
'es5-shim': '../../bower_components/es5-shim/es5-shim',
24-
json3: '../../bower_components/json3/lib/json3',
25-
moment: '../../bower_components/moment/moment',
26-
requirejs: '../../bower_components/requirejs/require',
27-
underscore: '../../bower_components/underscore/underscore',
28-
'angular-translate': '../../bower_components/angular-translate/angular-translate'
16+
'jquery': '../../bower_components/jquery/dist/jquery',
17+
'json3': '../../bower_components/json3/lib/json3',
18+
'modal': '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/modal',
19+
'moment': '../../bower_components/moment/moment',
20+
'popover': '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/popover',
21+
'requirejs': '../../bower_components/requirejs/require',
22+
'scrollspy': '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/scrollspy',
23+
'tab': '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tab',
24+
'tooltip': '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip',
25+
'transition': '../../bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/transition'
2926
},
3027
shim: {
3128
angular: {

app/templates/views/_home.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="jumbotron">
22
<h1>'Allo, 'Allo!</h1>
33
<p class="lead">
4-
<img src="images/yeoman.png" alt="I'm Yeoman"><br>
4+
<img src="images/yeoman.png" alt="I'm Yeoman"><br />
55
{{'WELCOME_MESSAGE' | translate}}
66
</p>
77
<p><a class="btn btn-lg btn-success" ng-href="#">Splendid!<span class="glyphicon glyphicon-ok"></span></a></p>

0 commit comments

Comments
 (0)