Resolve merge conflicts of testing Refactory

Michel Felipe
1 parent 1f3b2247
Showing 3 changed files with 38 additions and 40 deletions Show diff stats
index.html
js/handlebars-helpers.js
js/requirejs-config.js
@@ -19,16 +19,8 @@
         return {
           initBase: function(){
-            _base = window.location.href;
-            var host = window.location.host;
-            var regex = new RegExp(".*" + host + '/', "g");
-
-            if(host){
-              _base = _base.replace(regex,'');
-            }else{
-              _base = _base.replace('index.html','');
-            }
-            return this;
+            _base = "//" + window.location.host + window.location.pathname.replace('/index.html','');
+            return _base;
           },
           getBase: function(){
             if(!_base){
@@ -37,17 +29,16 @@
             return _base;
           },
-          removeUrlParameters: function(full_url){
-            full_url = full_url || _base;
-            var url_base = full_url.split('#').shift();
-            return url_base;
+          getPath: function(){
+
+            return window.location.pathname.replace(/\/\w*\.html/g,'');
           },
            addBaseUrl: function(filename){
             base = window.location.href;
             if(base.match(/file:/) || filename.match(/http:/)){
               base = '';
             }else{
-              base = this.removeUrlParameters(base) + '/';
+              base = this.initBase() + '/';
             }
             return base + filename;
           },
@@ -93,16 +84,16 @@
         var script_element = document.createElement('script');
         script_element.type = 'text/javascript';
         script_element.src = makeJSURL('js/require.js');
-        // script_element.setAttribute('data-main', makeJSURL('js/requirejs-config.js'));
+
         if(onLoad instanceof Function){
           script_element.onreadystatechange = function(){
             if (this.readyState == 'complete'){
               onload();
             }
+
           }
           script_element.addEventListener('load', onLoad);
         }
-
         head.appendChild(script_element);
       }
       loadCSSFiles();
@@ -245,6 +236,7 @@
                 </div>
               </div>
               <div class="results-container hide"></div>
+
               <div class="experience-proposal-container">
                 <div class="experience-proposal">
                   <div class="container-title">Conte sua experiência</div>
@@ -297,6 +289,8 @@
                   </ul>
                 </div>
               </div>
+
+              <div class="clearfix"></div>
             </div>
           </div>
         {{!-- </div> --}}
@@ -363,13 +357,15 @@
     </script>
     <script type='text/javascript'>
+
       loadRequireJS(function(){
-        require([ Url.getBase()+'/js/requirejs-config' ], function(){
+        require([Url.getPath()+'/js/requirejs-config.js' ], function(){
           requirejs(['proposal_app','main']);
         });
       });
+
     </script>
   </body>
@@ -3,13 +3,13 @@ define([&#39;handlebars&#39;], function(Handlebars){
   Handlebars.registerHelper('link', function(text, url) {
     text = Handlebars.Utils.escapeExpression(text);
     url  = Handlebars.Utils.escapeExpression(url);
-  
+
     // Exemplo: <a href="#/programas/{{id}}" class="proposal-link" data-target="">{{name}}</a>
     var result = '<a href="#/programas/' + url + '" data-target="proposal-item-' + url + '" class="proposal-link">' + text + '</a>';
-  
+
     return new Handlebars.SafeString(result);
   });
-  
+
   Handlebars.registerHelper('list_proposal', function(proposals, options) {
     proposals = proposals.sort(function(p1, p2) {
@@ -18,19 +18,19 @@ define([&#39;handlebars&#39;], function(Handlebars){
     var ret = "";
     for(var i=0, j=proposals.length; i<j; i++) {
       var proposal = proposals[i];
-      
-      element = '<li class="proposal-item">' + 
+
+      element = '<li class="proposal-item">' +
         '<a href="#/programas/'+proposal.id+'" data-target="proposal-item-'+proposal.id+'" class="proposal-link">' +
           '<div class="item">' +
             '' + proposal.title;
       category = "<ul class='category'>";
-      
-      
+
+
       for(var x=0, y=proposal.categories.length; x<y; x++) {
         if((options.hash['category'] != null) && (options.hash['category'] != proposal.categories[x].slug)){
           element = '';
           continue;
-        }      
+        }
         category = category + '<li class="category-'+proposal.categories[x].slug+'">' + proposal.categories[x].name + '</li>';
       }
       if(element == ''){
@@ -39,13 +39,13 @@ define([&#39;handlebars&#39;], function(Handlebars){
       category =  category + '</ul>';
       // element = element + options.fn(proposal);
       element = element + (proposal.abstract ? proposal.abstract : '');
-  
+
       element = element + category;
       ret = ret + element + '</div></a></li>';
     }
     return ret;
   });
-  
+
   Handlebars.registerHelper('proposal_detail', function(proposals, options) {
     var ret = "";
     for(var i=0, j=proposals.length; i<j; i++) {
@@ -56,29 +56,29 @@ define([&#39;handlebars&#39;], function(Handlebars){
     }
     return ret;
   });
-  
+
   Handlebars.registerHelper('replace', function(string, to_replace, replacement) {
     return (string || '').replace(new RegExp(to_replace, 'g'), replacement);
   });
-  
+
   Handlebars.registerHelper('score', function(article) {
     return article.votes_for - article.votes_against;
   });
-  
+
   Handlebars.registerHelper('apoio', function(article) {
     // return (article.votes_for - article.votes_against)/(article.countViews);
     return 0;
   });
-  
+
   Handlebars.registerHelper('participacao', function(article) {
     // return (article.votes_for + article.votes_against)/(article.countViews);
     return 0;
   });
-  
+
   Handlebars.registerHelper('select_proposal', function(proposals, category_slug, selected_id) {
     var ret = '<label for="proposal-selection" class="sr-only">Selecione o programa</label>'
     ret =  ret + '<select id="proposal-selection" name="proposal-selection" data-proposal="'+selected_id+'" title="Selecione o programa" class="proposal-selection">';
-  
+
     for(var i=0; i<proposals.length; i++) {
       if(!proposal_has_category(proposals[i], category_slug)) continue;
       var selected = proposals[i].id===selected_id ? "selected" : "";
@@ -109,4 +109,6 @@ define([&#39;handlebars&#39;], function(Handlebars){
     return false;
   }
+  return Handlebars;
+
 });
 var base,test = '';
 if(window.Url){
-  var base = Url.initBase().removeUrlParameters()+'/js/';
+  base = Url.initBase() + '/js/';
 }else{
-  base = '../js'
+  base = '../js';
   test = window.location.href.replace(/\/\w*\.html/g,'');
 }
@@ -45,13 +45,13 @@ requirejs.config({
       'jquery_maxlength':{
         deps: ['jquery']
       },
-      'jquery_cookie':{
-        deps: ['jquery']
-      },
       'jquery_slick': {
         deps: ['jquery']
       },
-      'proposal_app' :{
+      'jquery_cookie':{
+         deps: ['jquery']
+       },
+      'proposal_app': {
         deps: ['jquery'],
         exports: 'ProposalApp'
       }