UI working

Evandro Junior
1 parent 3d10c1fb
Showing 3 changed files with 24 additions and 30 deletions Show diff stats
js/main.js
test/SpecRunner.html
test/spec/MainSpec.js
-define(['handlebars'], function(Handlebars){
+define(['handlebars','handlebars_helpers','jquery'], function(Handlebars){
   /* global Handlebars, $ */
   // The template code
-  var templateSource = document.getElementById('proposal-template').innerHTML;
+  var templateSource = $('#proposal-template').html();
   // compile the template
   var template = Handlebars.compile(templateSource);
@@ -529,6 +529,7 @@ define([&#39;handlebars&#39;], function(Handlebars){
              votedProposals.push(id);
            }
            $.cookie("votedProposals", JSON.stringify(votedProposals), {expires : 999 }) ;
+           return votedProposals;
          },
          hasProposalbeenVoted: function(id) {
            if (typeof($.cookie("votedProposals")) == "undefined") {
@@ -571,29 +572,14 @@ define([&#39;handlebars&#39;], function(Handlebars){
     });
   });
-
-
-
-
-
-
-
-
-
-
-
-
   if('onhashchange' in window){
     window.onhashchange = function(){
       Main.locationHashChanged.apply(Main);
     }
-
   }else{
     console.log('The browser not supports the hashchange event!');
   }
-
-
-
+  return Main;
 });
@@ -7,24 +7,30 @@
   <link rel="shortcut icon" type="image/png" href="lib/jasmine-2.2.0/jasmine_favicon.png">
   <link rel="stylesheet" href="lib/jasmine-2.2.0/jasmine.css">
-  <script src="../js/require.js"></script>
-  <script src="../js/handlebars-v3.0.1.js"></script>
-  <script src="../js/handlebars-helpers.js"></script>
+
+
   <script src="lib/jasmine-2.2.0/jasmine.js"></script>
   <script src="lib/jasmine-2.2.0/jasmine-html.js"></script>
-  <script src="lib/jasmine-2.2.0/boot.js"></script>
+  <!-- // <script src="lib/jasmine-2.2.0/boot.js"></script> -->
   <script type="text/javascript">
-        var require = {
-            paths: {
-                "domReady": "lib/requirejs-plugins/domReady",
-                "model": "../js"
-            }
-        };
+        // var require = {
+        //     paths: {
+        //         "domReady": "lib/requirejs-plugins/domReady",
+        //         "model": "../js",
+        //         "handlebars": '../js/handlebars-v3.0.1',
+        //         "handlebars_helpers": '../js/handlebars-helpers',
+        //         "jquery":'../js/jquery-2.1.3.min'
+        //     }
+        // };
     </script>
+  <script src="../js/require.js" data-main="../js/requirejs-config.js" ></script>
+  <!-- // <script src="../js/handlebars-v3.0.1.js"></script> -->
+  <!-- // <script src="../js/handlebars-helpers.js"></script> -->
+
   <!-- include source files here... -->
   <!-- <script src="../js/main.js"></script> -->
@@ -54,6 +60,7 @@
     </script>
+
   <!-- // <script src="spec/MainSpec.js"></script> -->
 </head>
-define(["model/main"],function(){
+define(["model/main"],function(Main){
   describe("addVotedProposal", function(){
     it("Should register a voted id", function(){
-        addVotedProposal(1).toEqual(true);
+        expect(Main.addVotedProposal(1)).toContain(1);
+
     });
   });
 });