Download as
Browse Code »

Commit 76a3a4798b778c6bc9fea6fcbf65b26da10a953c

Authored by ABNER SILVA DE OLIVEIRA
1 parent 72ca2a4c
Exists in master and in 30 other branches activities_block, btn-new-post, cosmetic_changes_people_and_communities_block, edit-blocks, edit-header-footer, env-tags-block, forgot_password, header_and_footer, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, profile-article-resolvers, profile-blocks-sass, profile_description_block_component, profile_page_improvements, recent-activities, remove-article-confirmation, responsive-fixes, seo, signup_page, skin-small-change, staging, tags-block, theme-skin-yellow, translations, updated_signup_page, users_profile_page

fixed the build task 'npm run build'

Showing 3 changed files with 6 additions and 8 deletions   Show diff stats
dist/index.html
  Diff comments   View file @76a3a47
1   -<!doctype html><html ng-app="noosferoApp"><head><base href="/"><meta charset="utf-8"><title>angular</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="/designs/themes/angular-theme/dist/styles/vendor-ebefc2c7fc.css"><link rel="stylesheet" href="/designs/themes/angular-theme/dist/styles/app-bfd148a542.css"></head><body><!--[if lt IE 10]>
  1 +<!doctype html><html ng-app="noosferoApp"><head><base href="/"><meta charset="utf-8"><title>angular</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="/designs/themes/angular-theme/dist/styles/vendor-ebefc2c7fc.css"><link rel="stylesheet" href="/designs/themes/angular-theme/dist/styles/app-df3fab49fa.css"></head><body><!--[if lt IE 10]>
2 2 <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
3   - <![endif]--><div ui-view=""></div><script src="/designs/themes/angular-theme/dist/scripts/vendor-9a3c78f00a.js"></script><script src="/designs/themes/angular-theme/dist/scripts/app-8b422df734.js"></script></body></html>
4 3 \ No newline at end of file
  4 + <![endif]--><div ui-view=""></div><script src="/designs/themes/angular-theme/dist/scripts/vendor-f83486386e.js"></script><script src="/designs/themes/angular-theme/dist/scripts/app-a25576689b.js"></script></body></html>
5 5 \ No newline at end of file
... ...
gulp/build.js
  Diff comments   View file @76a3a47
... ... @@ -20,7 +20,7 @@ gulp.task(&#39;partials&#39;, function () {
20 20 quotes: true
21 21 }))
22 22 .pipe($.angularTemplatecache('templateCacheHtml.js', {
23   - module: 'angular',
  23 + module: 'noosferoApp',
24 24 root: 'app'
25 25 }))
26 26 .pipe(gulp.dest(conf.paths.tmp + '/partials/'));
... ... @@ -51,7 +51,8 @@ gulp.task(&#39;html&#39;, [&#39;inject&#39;, &#39;partials&#39;], function () {
51 51 .pipe($.replace('bower_components/messageformat/', noosferoThemePrefix + 'locale/messageformat/'))
52 52 .pipe($.sourcemaps.init())
53 53 .pipe($.ngAnnotate())
54   - .pipe($.uglify({ preserveComments: $.uglifySaveLicense })).on('error', conf.errorHandler('Uglify'))
  54 + // TODO - check how to make uglify work with ngforward
  55 + //.pipe($.uglify({ preserveComments: $.uglifySaveLicense })).on('error', conf.errorHandler('Uglify'))
55 56 .pipe($.sourcemaps.write('maps'))
56 57 .pipe(jsFilter.restore)
57 58 .pipe(cssFilter)
... ...
src/index.html
  Diff comments   View file @76a3a47
... ... @@ -36,10 +36,7 @@
36 36 <!-- build:js({.tmp/serve,.tmp/partials,src}) scripts/app.js -->
37 37 <script src="commons.js"></script>
38 38 <script src="vendor.bundle.js"></script>
39   - <script src="noosfero.js"></script>
40   - <!-- endinject -->
41   -
42   -
  39 + <script src="noosfero.js"></script>
43 40 <!-- inject:partials -->
44 41 <!-- angular templates will be automatically converted in js and inserted here -->
45 42 <!-- endinject -->
... ...