Download as
Browse Code »

Commit 50852382b0cc90fffc4490608217c266a2dbb88d

Authored by Cleverson Sacramento
1 parent 359d9b6d
Exists in master

FWK-196: Melhorias na organização do código-fonte gerado pelo arquétipo 

demoiselle-html-rest 

Task-Url: https://demoiselle.atlassian.net/browse/FWK-196
Showing 5 changed files with 18 additions and 31 deletions   Show diff stats
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/bookmark-edit.html
  Diff comments   View file @5085238
@@ -37,15 +37,16 @@ @@ -37,15 +37,16 @@
37 </div> 37 </div>
38 <p class="demoiselle"> 38 <p class="demoiselle">
39 Aplicação de exemplo do Demoiselle <span id="demoiselle-version"></span> 39 Aplicação de exemplo do Demoiselle <span id="demoiselle-version"></span>
  40 + </p>
40 41
41 - <script type="text/javascript" src="js/lib/jquery-2.1.0.min.js"></script>  
42 - <script type="text/javascript" src="js/lib/bootstrap.min.js"></script>  
43 - <script type="text/javascript" src="js/lib/purl.js"></script>  
44 - <script type="text/javascript" src="js/lib/bootbox.js"></script>  
45 - <script type="text/javascript" src="js/lib/app.js"></script>  
46 - <script type="text/javascript" src="js/proxy/metadata.js"></script>  
47 - <script type="text/javascript" src="js/proxy/auth.js"></script>  
48 - <script type="text/javascript" src="js/proxy/bookmark.js"></script>  
49 - <script type="text/javascript" src="js/controller/menu.js"></script>  
50 - <script type="text/javascript" src="js/controller/bookmark-edit.js"></script> 42 + <script type="text/javascript" src="js/lib/jquery-2.1.0.min.js"></script>
  43 + <script type="text/javascript" src="js/lib/bootstrap.min.js"></script>
  44 + <script type="text/javascript" src="js/lib/purl.js"></script>
  45 + <script type="text/javascript" src="js/lib/bootbox.js"></script>
  46 + <script type="text/javascript" src="js/lib/app.js"></script>
  47 + <script type="text/javascript" src="js/proxy/metadata.js"></script>
  48 + <script type="text/javascript" src="js/proxy/auth.js"></script>
  49 + <script type="text/javascript" src="js/proxy/bookmark.js"></script>
  50 + <script type="text/javascript" src="js/controller/menu.js"></script>
  51 + <script type="text/javascript" src="js/controller/bookmark-edit.js"></script>
51 </body> 52 </body>
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/bookmark-edit.js
  Diff comments   View file @5085238
@@ -2,16 +2,14 @@ $(function() { @@ -2,16 +2,14 @@ $(function() {
2 $("#delete").hide(); 2 $("#delete").hide();
3 $("#description").focus(); 3 $("#description").focus();
4 4
  5 + if (id = $.url().param('id')) {
  6 + BookmarkProxy.load(id).done(loadOk).fail(loadFailed);
  7 + }
  8 +
5 MetadataProxy.getDemoiselleVersion().done(function(data) { 9 MetadataProxy.getDemoiselleVersion().done(function(data) {
6 $("#demoiselle-version").html(data); 10 $("#demoiselle-version").html(data);
7 }); 11 });
8 12
9 - $(document).ready(function() {  
10 - if (id = $.url().param('id')) {  
11 - BookmarkProxy.load(id).done(loadOk).fail(loadFailed);  
12 - }  
13 - });  
14 -  
15 $("form").submit(function(event) { 13 $("form").submit(function(event) {
16 event.preventDefault(); 14 event.preventDefault();
17 }); 15 });
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/bookmark-list.js
  Diff comments   View file @5085238
1 $(function() { 1 $(function() {
2 $("#new").focus(); 2 $("#new").focus();
3 3
  4 + BookmarkProxy.findAll().done(findAllOk);
  5 +
4 MetadataProxy.getDemoiselleVersion().done(function(data) { 6 MetadataProxy.getDemoiselleVersion().done(function(data) {
5 $("#demoiselle-version").html(data); 7 $("#demoiselle-version").html(data);
6 }); 8 });
7 9
8 - $(document).ready(function() {  
9 - BookmarkProxy.findAll().done(findAllOk);  
10 - });  
11 -  
12 $("form").submit(function(event) { 10 $("form").submit(function(event) {
13 event.preventDefault(); 11 event.preventDefault();
14 }); 12 });
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/controller/login.js
  Diff comments   View file @5085238
@@ -33,7 +33,7 @@ function loginOk(data) { @@ -33,7 +33,7 @@ function loginOk(data) {
33 function loginFail(request) { 33 function loginFail(request) {
34 switch (request.status) { 34 switch (request.status) {
35 case 401: 35 case 401:
36 - $("#global-message").html("Usuário ou senha inválidos.").show(); 36 + $("#global-message").html(request.responseText).show();
37 break; 37 break;
38 38
39 case 422: 39 case 422:
archetype/html-rest/src/main/resources/archetype-resources/src/main/webapp/js/proxy/auth.js
  Diff comments   View file @5085238
@@ -12,16 +12,6 @@ var AuthProxy = { @@ -12,16 +12,6 @@ var AuthProxy = {
12 }); 12 });
13 }, 13 },
14 14
15 - logout : function() {  
16 - return $.ajax({  
17 - url : this.url,  
18 - type : "DELETE",  
19 - beforeSend : function(request) {  
20 - request.setRequestHeader("Authorization", App.getToken());  
21 - }  
22 - });  
23 - },  
24 -  
25 getUser : function() { 15 getUser : function() {
26 return $.ajax({ 16 return $.ajax({
27 url : this.url, 17 url : this.url,