Merge branch 'master' of softwarepublico.gov.br:noosfero-themes/angular-theme

Ábner Oliveira
2 parents dc8c43fd 63a0a102
Showing 4 changed files with 21 additions and 13 deletions Show diff stats
bower.json
gulp/build.js
src/app/index.ts
src/index.html
@@ -46,9 +46,7 @@
     "ng-ckeditor": {
       "main": [
         "ng-ckeditor.js",
-        "libs/ckeditor/lang",
-        "libs/ckeditor/ckeditor.js",
-        "libs/ckeditor/config.js"
+        "libs/ckeditor/ckeditor.js"
       ]
     },
     "bootstrap-sass": {
@@ -30,7 +30,8 @@ gulp.task(&#39;partials&#39;, function () {
         quotes: true
       }))
       .pipe($.angularTemplatecache('templateCacheHtml-'+partialPath+'.js', {
-        module: 'noosferoApp',
+        module: 'noosfero.templates.' + partialPath,
+        standalone: true,
         root: partialPath
       }))
       .pipe(gulp.dest(conf.paths.tmp + '/partials/')));
@@ -81,7 +82,6 @@ gulp.task(&#39;html&#39;, [&#39;inject&#39;, &#39;partials&#39;], function () {
     .pipe($.revReplace({prefix: noosferoThemePrefix}))
     .pipe(htmlFilter)
     .pipe($.replace('/bower_components/ng-ckeditor/libs/ckeditor/', noosferoThemePrefix + 'ng-ckeditor/libs/ckeditor/'))
-    .pipe($.replace('/bower_components/ng-ckeditor/ng-ckeditor.min.js', noosferoThemePrefix + 'ng-ckeditor/ng-ckeditor.min.js'))
     .pipe($.minifyHtml({
       empty: true,
       spare: true,
@@ -103,7 +103,7 @@ gulp.task(&#39;fonts&#39;, function () {
 });
 gulp.task('ckeditor', function () {
-  conf.wiredep.exclude.push(/ckeditor/); // exclude ckeditor from build to improve performance
+  conf.wiredep.exclude.push(/bower_components\/ng-ckeditor\/libs\/ckeditor/); // exclude ckeditor from build to improve performance
   return gulp.src(['bower_components/ng-ckeditor/**/*']).pipe(gulp.dest(path.join(conf.paths.dist, '/ng-ckeditor')));
 });
@@ -6,7 +6,19 @@ import {AuthEvents} from &quot;./login/auth-events&quot;;
 declare var moment: any;
-angular.module('noosfero.init', []).config(noosferoModuleConfig).
+//FIXME see a better way to declare template modules for dev mode
+try {
+    angular.module('noosfero.templates.app');
+} catch (error) {
+    angular.module('noosfero.templates.app', []);
+}
+try {
+    angular.module('noosfero.templates.plugins');
+} catch (error) {
+    angular.module('noosfero.templates.plugins', []);
+}
+angular.module('noosfero.init', ['noosfero.templates.app', 'noosfero.templates.plugins']).
+    config(noosferoModuleConfig).
     run(noosferoAngularRunBlock).
     constant("moment", moment).
     constant("AuthEvents", AuthEvents);
@@ -30,6 +30,7 @@
     <script>
       CKEDITOR_BASEPATH='/bower_components/ng-ckeditor/libs/ckeditor/';
     </script>
+    <script src="/bower_components/ng-ckeditor/libs/ckeditor/ckeditor.js"></script>
     <!-- build:js(src) scripts/vendor.js -->
     <!-- bower:js -->
@@ -38,15 +39,12 @@
     <!-- endbuild -->
     <!-- build:js({.tmp/serve,.tmp/partials,src}) scripts/app.js -->
-    <script src="commons.js"></script>
-    <script src="vendor.bundle.js"></script>
-    <script src="noosfero.js"></script>  
     <!-- inject:partials -->
     <!-- angular templates will be automatically converted in js and inserted here -->
     <!-- endinject -->
+    <script src="commons.js"></script>
+    <script src="vendor.bundle.js"></script>
+    <script src="noosfero.js"></script>
     <!-- endbuild -->
-
-    <script src="/bower_components/ng-ckeditor/libs/ckeditor/ckeditor.js"></script>
-    <script src="/bower_components/ng-ckeditor/ng-ckeditor.min.js"></script>
   </body>
 </html>
	@@ -6,7 +6,19 @@ import {AuthEvents} from "./login/auth-events";		@@ -6,7 +6,19 @@ import {AuthEvents} from "./login/auth-events";
6		6
7	declare var moment: any;	7	declare var moment: any;
8		8
9	-angular.module('noosfero.init', []).config(noosferoModuleConfig).	9	+//FIXME see a better way to declare template modules for dev mode
		10	+try {
		11	+ angular.module('noosfero.templates.app');
		12	+} catch (error) {
		13	+ angular.module('noosfero.templates.app', []);
		14	+}
		15	+try {
		16	+ angular.module('noosfero.templates.plugins');
		17	+} catch (error) {
		18	+ angular.module('noosfero.templates.plugins', []);
		19	+}
		20	+angular.module('noosfero.init', ['noosfero.templates.app', 'noosfero.templates.plugins']).
		21	+ config(noosferoModuleConfig).
10	run(noosferoAngularRunBlock).	22	run(noosferoAngularRunBlock).
11	constant("moment", moment).	23	constant("moment", moment).
12	constant("AuthEvents", AuthEvents);	24	constant("AuthEvents", AuthEvents);