Download as
Browse Code »

Commit d09a8c8f7caac7beafb000e9e2ac563f102959e9

Authored by Evandro Junior
1 parent 58076f77
Exists in contigency_plan_recaptcha

Revert "initial changes" 

This reverts commit 58076f77440e4cff5c09a4ac655c48ebe144a83b.
Showing 2 changed files with 12 additions and 16 deletions   Show diff stats
@@ -463,7 +463,7 @@ @@ -463,7 +463,7 @@
463 <div id="serpro_captcha" class="captcha col-sm-12"> 463 <div id="serpro_captcha" class="captcha col-sm-12">
464 </div> 464 </div>
465 <div class="captcha col-sm-12"> 465 <div class="captcha col-sm-12">
466 - <div id="g-recaptcha"></div> 466 + Digite os caracteres acima:
467 </div> 467 </div>
468 <div class="captcha col-sm-6"> 468 <div class="captcha col-sm-6">
469 <input type="text" name="captcha_text" id="captcha_text"> 469 <input type="text" name="captcha_text" id="captcha_text">
@@ -623,7 +623,7 @@ @@ -623,7 +623,7 @@
623 loadRequireJS(); 623 loadRequireJS();
624 </script> 624 </script>
625 625
626 - <script type="text/javascript" src="http://www.google.com/recaptcha/api/js/recaptcha_ajax.js" async defer></script> 626 + <script src="http://captcha2.servicoscorporativos.serpro.gov.br/js/captcha.serpro.gov.br.js"></script>
627 627
628 </body> 628 </body>
629 629
@@ -31,6 +31,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers @@ -31,6 +31,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
31 // var cat_educacao = 181; 31 // var cat_educacao = 181;
32 // var cat_reducao_da_pobreza = 183; 32 // var cat_reducao_da_pobreza = 183;
33 var recaptchaSiteKey = '6LcLPAcTAAAAAKsd0bxY_TArhD_A7OL19SRCW7_i'; 33 var recaptchaSiteKey = '6LcLPAcTAAAAAKsd0bxY_TArhD_A7OL19SRCW7_i';
  34 +
34 // There are two modes for development 35 // There are two modes for development
35 // 1: Remote API 36 // 1: Remote API
36 // 2: Local API with proposal database 37 // 2: Local API with proposal database
@@ -69,7 +70,6 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers @@ -69,7 +70,6 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
69 } 70 }
70 } 71 }
71 72
72 - window.recaptchaSiteKey = recaptchaSiteKey;  
73 73
74 var BARRA_ADDED = false; 74 var BARRA_ADDED = false;
75 var HIDE_BARRA_DO_GOVERNO = false; 75 var HIDE_BARRA_DO_GOVERNO = false;
@@ -891,25 +891,21 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers @@ -891,25 +891,21 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
891 reloadCaptcha: function(element) { 891 reloadCaptcha: function(element) {
892 var $element = $(element); 892 var $element = $(element);
893 if($element.data('captcha')){ 893 if($element.data('captcha')){
894 - //$element.data('captcha').recarregar();  
895 - Recaptcha.reload(); 894 + $element.data('captcha').recarregar();
896 } 895 }
897 }, 896 },
898 initCaptcha: function(element) { 897 initCaptcha: function(element) {
899 var $element = $(element); 898 var $element = $(element);
900 if($element.data('captcha')) return; 899 if($element.data('captcha')) return;
901 900
902 - // $element.val('');  
903 - // var oCaptcha_serpro_gov_br = new captcha_serpro_gov_br();  
904 - // $element.data('captcha', oCaptcha_serpro_gov_br);  
905 - // oCaptcha_serpro_gov_br.clienteId = serpro_captcha_clienteId;  
906 - // if(!localDevelopment) {  
907 - // oCaptcha_serpro_gov_br.url = "/captchaserpro"  
908 - // }  
909 - // oCaptcha_serpro_gov_br.criarUI(element, 'css', 'serpro_captcha_component_', Main.guid());  
910 -  
911 -  
912 - Recaptcha.create(window.recaptchaSiteKey, $element, { lang : 'pt', theme: "clean", callback: Recaptcha.focus_response_field } ); 901 + $element.val('');
  902 + var oCaptcha_serpro_gov_br = new captcha_serpro_gov_br();
  903 + $element.data('captcha', oCaptcha_serpro_gov_br);
  904 + oCaptcha_serpro_gov_br.clienteId = serpro_captcha_clienteId;
  905 + if(!localDevelopment) {
  906 + oCaptcha_serpro_gov_br.url = "/captchaserpro"
  907 + }
  908 + oCaptcha_serpro_gov_br.criarUI(element, 'css', 'serpro_captcha_component_', Main.guid());
913 }, 909 },
914 computeBoxHeight: function(){ 910 computeBoxHeight: function(){
915 var hPerLineOnTitle = 25; 911 var hPerLineOnTitle = 25;