Explorar el Código

Cleaned up js

master
David Winterbottom hace 13 años
padre
commit
9650ce7b38
Se han modificado 3 ficheros con 17 adiciones y 12 borrados
  1. 2
    2
      oscar/static/js/oscar/dashboard.js
  2. 10
    10
      oscar/static/js/oscar/ui.js
  3. 5
    0
      pre-commit.sh

+ 2
- 2
oscar/static/js/oscar/dashboard.js Ver fichero

@@ -1,4 +1,4 @@
1
-var oscar = oscar || {}
1
+var oscar = oscar || {};
2 2
 oscar.dashboard = {
3 3
     promotions: {
4 4
         init: function() {
@@ -11,7 +11,7 @@ oscar.dashboard = {
11 11
             console.log(event, ui);
12 12
         }
13 13
     }
14
-}
14
+};
15 15
 
16 16
 $(document).ready(function() 
17 17
 {   

+ 10
- 10
oscar/static/js/oscar/ui.js Ver fichero

@@ -11,15 +11,15 @@ $(document).ready(function()
11 11
         });
12 12
         var ave_rating = sum_rating_count / sum_total_reviews *10;
13 13
         if (ave_rating <= 2) {
14
-            var ave_rating = 'One'
14
+            ave_rating = 'One';
15 15
         } else if (ave_rating <= 4) {
16
-            var ave_rating = 'Two'
16
+            ave_rating = 'Two';
17 17
         } else if (ave_rating <= 6) {
18
-            var ave_rating = 'Three'
18
+            ave_rating = 'Three';
19 19
         } else if (ave_rating <= 8) {
20
-            var ave_rating = 'Four'
20
+            ave_rating = 'Four';
21 21
         } else if (ave_rating <= 10) {
22
-            var ave_rating = 'Five'
22
+            ave_rating = 'Five';
23 23
         }
24 24
         $(this).find('.review_count')
25 25
           .after('<p class=\"star ' + ave_rating + '\">' + ave_rating + ' star(s) by user reviews. <a href=\"#\">Add review</a></p>')
@@ -34,19 +34,19 @@ $(document).ready(function()
34 34
             user_rating += parseFloat($(this).text());
35 35
         });
36 36
         if (user_rating == 1) {
37
-            var user_rating = 'One'
37
+            user_rating = 'One';
38 38
         }
39 39
         else if (user_rating == 2) {
40
-            var user_rating = 'Two'
40
+            user_rating = 'Two';
41 41
         }
42 42
         else if (user_rating == 3) {
43
-            var user_rating = 'Three'
43
+            user_rating = 'Three';
44 44
         }
45 45
         else if (user_rating == 4) {
46
-            var user_rating = 'Four'
46
+            user_rating = 'Four';
47 47
         }
48 48
         else if (user_rating == 5) {
49
-            var user_rating = 'Five'
49
+            user_rating = 'Five';
50 50
         }
51 51
         $(this)
52 52
           .find('h3')

+ 5
- 0
pre-commit.sh Ver fichero

@@ -3,11 +3,16 @@
3 3
 git stash --keep-index -q
4 4
 
5 5
 source ~/.virtualenvs/oscar/bin/activate
6
+
6 7
 ./run_tests.py
7 8
 TEST_RESULT=$?
8 9
 
10
+jshint oscar/static/js/oscar
11
+JS_RESULT=$?
12
+
9 13
 git stash pop -q
10 14
 
11 15
 [ $TEST_RESULT -ne 0 ] && echo "Tests failed" && exit 1
16
+[ $JS_RESULT -ne 0 ] && echo "JShint failed" && exit 1
12 17
 
13 18
 exit 0

Loading…
Cancelar
Guardar