Selaa lähdekoodia

Cleaned up js

master
David Winterbottom 13 vuotta sitten
vanhempi
commit
9650ce7b38
3 muutettua tiedostoa jossa 17 lisäystä ja 12 poistoa
  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 Näytä tiedosto

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

+ 10
- 10
oscar/static/js/oscar/ui.js Näytä tiedosto

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

+ 5
- 0
pre-commit.sh Näytä tiedosto

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

Loading…
Peruuta
Tallenna