Skip to content
This repository was archived by the owner on Oct 26, 2021. It is now read-only.

Commit 2e7019e

Browse files
tistotisto
committed
Concat js resources.
1 parent 7978fa5 commit 2e7019e

File tree

9 files changed

+19
-286
lines changed

9 files changed

+19
-286
lines changed

‎app/index.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<link rel="stylesheet" href="bower_components/angular-loading-bar/build/loading-bar.min.css" />
99
<link rel="stylesheet" href="bower_components/angular-bootstrap-nav-tree/dist/abn_tree.css">
1010
<link rel="stylesheet" href="styles/main.css" />
11+
<!-- build:scripts -->
1112
<script src="bower_components/jquery/dist/jquery.min.js"></script>
1213
<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
1314
<script src="bower_components/angular/angular.min.js"></script>
@@ -21,7 +22,7 @@
2122
<script src="scripts/modal.js"></script>
2223
<script src="scripts/navigation-top.js"></script>
2324
<script src="scripts/navigation-portlet.js"></script>
24-
<!-- Mock Backend -->
25+
<!-- endbuild -->
2526
<!-- build:mock -->
2627
<script src="bower_components/angular-mocks/angular-mocks.js"></script>
2728
<script src="scripts/mock-backend.js"></script>

‎gulpfile.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
var gulp = require('gulp'),
2+
concat = require('gulp-concat'),
23
del = require('del'),
34
prefix = require('gulp-prefix'),
45
less = require('gulp-less'),
56
replace = require('gulp-replace'),
7+
ugilfy = require('gulp-uglify'),
68
htmlReplace = require('gulp-html-replace'),
79
browserSync = require('browser-sync'),
810
sourcemaps = require('gulp-sourcemaps');
@@ -34,15 +36,18 @@ gulp.task('index-html', function(){
3436
gulp.src('app/index.html')
3537
.pipe(prefix(prefixUrl, null, true))
3638
.pipe(htmlReplace({
37-
'mock': ''
39+
'scripts': '++theme++plone.app.angularjs/plone.app.angularjs.min.js',
40+
'mock': ''
3841
}))
3942
.pipe(gulp.dest('src/plone/app/angularjs/app'));
4043
});
4144

45+
4246
// SCRIPTS
4347
gulp.task('scripts', function(){
4448
gulp.src('app/scripts/**/*.js')
4549
.pipe(replace("templateUrl: '", "templateUrl: '++theme++plone.app.angularjs/"))
50+
.pipe(concat('plone.app.angularjs.min.js'))
4651
.pipe(gulp.dest('src/plone/app/angularjs/app/scripts/'));
4752
});
4853

‎package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
"browser-sync": "^1.5.7",
77
"del": "*",
88
"gulp": "^3.8.8",
9+
"gulp-concat": "^2.4.1",
910
"gulp-html-replace": "^1.4.0",
11+
"gulp-less": "^1.3.6",
1012
"gulp-prefix": "*",
1113
"gulp-replace": "^0.4.0",
12-
"gulp-less": "^1.3.6",
13-
"gulp-sourcemaps": "^1.2.4"
14+
"gulp-sourcemaps": "^1.2.4",
15+
"gulp-uglify": "^1.0.1"
1416
},
15-
"dependencies": {
16-
}
17+
"dependencies": {}
1718
}

‎src/plone/app/angularjs/app/index.html‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
11
<!doctype html>
22
<html ng-app="ploneApp">
33
<head>
4+
45
<title>Plone + AngularJS</title>
56
<meta charset="utf-8" />
67
<base tal:attributes="href view/base">
8+
79
<link rel="stylesheet" href="++theme++plone.app.angularjs/bower_components/bootstrap/dist/css/bootstrap.min.css">
810
<link rel="stylesheet" href="++theme++plone.app.angularjs/bower_components/angular-loading-bar/build/loading-bar.min.css">
911
<link rel="stylesheet" href="++theme++plone.app.angularjs/bower_components/angular-bootstrap-nav-tree/dist/abn_tree.css">
1012
<link rel="stylesheet" href="++theme++plone.app.angularjs/styles/main.css">
11-
<script src="++theme++plone.app.angularjs/bower_components/jquery/dist/jquery.min.js"></script>
12-
<script src="++theme++plone.app.angularjs/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
13-
<script src="++theme++plone.app.angularjs/bower_components/angular/angular.min.js"></script>
14-
<script src="++theme++plone.app.angularjs/bower_components/angular-route/angular-route.min.js"></script>
15-
<script src="++theme++plone.app.angularjs/bower_components/angular-animate/angular-animate.js"></script>
16-
<script src="++theme++plone.app.angularjs/bower_components/angular-loading-bar/build/loading-bar.min.js"></script>
17-
<script src="++theme++plone.app.angularjs/bower_components/angular-sanitize/angular-sanitize.js"></script>
18-
<script src="++theme++plone.app.angularjs/bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
19-
<script src="++theme++plone.app.angularjs/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
20-
<script src="++theme++plone.app.angularjs/scripts/app.js"></script>
21-
<script src="++theme++plone.app.angularjs/scripts/modal.js"></script>
22-
<script src="++theme++plone.app.angularjs/scripts/navigation-top.js"></script>
23-
<script src="++theme++plone.app.angularjs/scripts/navigation-portlet.js"></script>
24-
<!-- Mock Backend -->
13+
14+
<script src="++theme++plone.app.angularjs/plone.app.angularjs.min.js"></script>
15+
2516

17+
2618
</head>
2719
<body>
2820
<div id="top-navigation-directive" navigation-directive></div>

‎src/plone/app/angularjs/app/scripts/app.js‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎src/plone/app/angularjs/app/scripts/mock-backend.js‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎src/plone/app/angularjs/app/scripts/modal.js‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎src/plone/app/angularjs/app/scripts/navigation-portlet.js‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎src/plone/app/angularjs/app/scripts/navigation-top.js‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)