You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jo...@apache.org on 2015/07/11 10:45:46 UTC

[2/3] struts git commit: WW-4522 Support latest stable AngularJS version in maven angularjs archetype

WW-4522 Support latest stable AngularJS version in maven angularjs archetype

- Rename exposed service object to avoid naming conflict


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9ef3aba0
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9ef3aba0
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9ef3aba0

Branch: refs/heads/master
Commit: 9ef3aba047b43411915c591fd9461aecda631b51
Parents: f200a84
Author: Johannes Geppert <jo...@apache.org>
Authored: Sat Jul 11 10:44:49 2015 +0200
Committer: Johannes Geppert <jo...@apache.org>
Committed: Sat Jul 11 10:44:49 2015 +0200

----------------------------------------------------------------------
 .../src/main/webapp/js/services/DataService.js                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/9ef3aba0/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services/DataService.js
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services/DataService.js b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services/DataService.js
index 3f9e308..c0034a7 100644
--- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services/DataService.js
+++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services/DataService.js
@@ -33,11 +33,11 @@
         };
 
         /** The DataService with all public methods */
-        var DataService = {
+        var service = {
             getProjects: getProjects
         };
 
-        return DataService;
+        return service;
 
         /** Get all projects */
         function getProjects() {