Bladeren bron

small code style changes

Robert Autenrieth 8 jaren geleden
bovenliggende
commit
e07f1659dc
3 gewijzigde bestanden met toevoegingen van 14 en 14 verwijderingen
  1. 8
    8
      generator/js/cards.js
  2. 1
    1
      generator/js/colors.js
  3. 5
    5
      generator/js/ui.js

+ 8
- 8
generator/js/cards.js Bestand weergeven

43
 function card_add_tag(card, tag) {
43
 function card_add_tag(card, tag) {
44
     tag = tag.trim().toLowerCase();
44
     tag = tag.trim().toLowerCase();
45
     var index = card.tags.indexOf(tag);
45
     var index = card.tags.indexOf(tag);
46
-    if (index == -1) {
46
+    if (index === -1) {
47
         card.tags.push(tag);
47
         card.tags.push(tag);
48
     }
48
     }
49
 }
49
 }
51
 function card_remove_tag(card, tag) {
51
 function card_remove_tag(card, tag) {
52
     tag = tag.trim().toLowerCase();
52
     tag = tag.trim().toLowerCase();
53
     card.tags = card.tags.filter(function (t) {
53
     card.tags = card.tags.filter(function (t) {
54
-        return tag != t;
54
+        return tag !== t;
55
     });
55
     });
56
 }
56
 }
57
 
57
 
115
     var align = params[2] || "center";
115
     var align = params[2] || "center";
116
     var margin_left = 0;
116
     var margin_left = 0;
117
     var color = card_data_color_front(card_data, options);
117
     var color = card_data_color_front(card_data, options);
118
-    if(align == "center") {
118
+    if (align === "center") {
119
         margin_left = (size/-2) + 'px';
119
         margin_left = (size/-2) + 'px';
120
     }
120
     }
121
-    else if (align == 'right') {
121
+    else if (align === 'right') {
122
         margin_left = 'auto';
122
         margin_left = 'auto';
123
     }
123
     }
124
     return '<div class="card-element card-inline-icon align-' + align + ' icon-' + icon + '" style ="height:' + size + 'px; width: ' + size + 'px; margin-left: ' + margin_left + '; background-color: ' + color + '"></div>';
124
     return '<div class="card-element card-inline-icon align-' + align + ' icon-' + icon + '" style ="height:' + size + 'px; width: ' + size + 'px; margin-left: ' + margin_left + '; background-color: ' + color + '"></div>';
450
     var result = "";
450
     var result = "";
451
     for (var i = 0; i < pages.length; ++i) {
451
     for (var i = 0; i < pages.length; ++i) {
452
         var style = "";
452
         var style = "";
453
-        if ((options.card_arrangement == "doublesided") &&  (i % 2 == 1)) {
453
+        if ((options.card_arrangement === "doublesided") &&  (i % 2 === 1)) {
454
             style += 'style="background-color:' + options.background_color + '"';
454
             style += 'style="background-color:' + options.background_color + '"';
455
         } else {
455
         } else {
456
             style += 'style="background-color:' + options.foreground_color + '"';
456
             style += 'style="background-color:' + options.foreground_color + '"';
501
     });
501
     });
502
 
502
 
503
     var pages = [];
503
     var pages = [];
504
-    if (options.card_arrangement == "doublesided") {
504
+    if (options.card_arrangement === "doublesided") {
505
         // Add padding cards so that the last page is full of cards
505
         // Add padding cards so that the last page is full of cards
506
         front_cards = card_pages_add_padding(front_cards, options);
506
         front_cards = card_pages_add_padding(front_cards, options);
507
         back_cards = card_pages_add_padding(back_cards, options);
507
         back_cards = card_pages_add_padding(back_cards, options);
517
 
517
 
518
         // Interleave front and back pages so that we can print double-sided
518
         // Interleave front and back pages so that we can print double-sided
519
         pages = card_pages_merge(front_pages, back_pages);
519
         pages = card_pages_merge(front_pages, back_pages);
520
-    } else if (options.card_arrangement == "front_only") {
520
+    } else if (options.card_arrangement === "front_only") {
521
         var cards = card_pages_add_padding(front_cards, options);
521
         var cards = card_pages_add_padding(front_cards, options);
522
         pages = card_pages_split(cards, rows, cols);
522
         pages = card_pages_split(cards, rows, cols);
523
-    } else if (options.card_arrangement == "side_by_side") {
523
+    } else if (options.card_arrangement === "side_by_side") {
524
         var cards = card_pages_interleave_cards(front_cards, back_cards, options);
524
         var cards = card_pages_interleave_cards(front_cards, back_cards, options);
525
         cards = card_pages_add_padding(cards, options);
525
         cards = card_pages_add_padding(cards, options);
526
         pages = card_pages_split(cards, rows, cols);
526
         pages = card_pages_split(cards, rows, cols);

+ 1
- 1
generator/js/colors.js Bestand weergeven

295
     "LightYellow": "LightYellow",
295
     "LightYellow": "LightYellow",
296
     "Ivory": "Ivory",
296
     "Ivory": "Ivory",
297
     "White": "White",
297
     "White": "White",
298
-}
298
+};

+ 5
- 5
generator/js/ui.js Bestand weergeven

35
 
35
 
36
 var ui_generate_modal_shown = false;
36
 var ui_generate_modal_shown = false;
37
 function ui_generate() {
37
 function ui_generate() {
38
-    if (card_data.length == 0) {
38
+    if (card_data.length === 0) {
39
         alert("Your deck is empty. Please define some cards first, or load the sample deck.");
39
         alert("Your deck is empty. Please define some cards first, or load the sample deck.");
40
         return;
40
         return;
41
     }
41
     }
47
     // Use a separate window to avoid CSS conflicts
47
     // Use a separate window to avoid CSS conflicts
48
     var tab = window.open("output.html", 'rpg-cards-output');
48
     var tab = window.open("output.html", 'rpg-cards-output');
49
 
49
 
50
-    if (ui_generate_modal_shown == false) {
50
+    if (ui_generate_modal_shown === false) {
51
         $("#print-modal").modal('show');
51
         $("#print-modal").modal('show');
52
         ui_generate_modal_shown = true;
52
         ui_generate_modal_shown = true;
53
     }
53
     }
273
 
273
 
274
 function ui_change_option() {
274
 function ui_change_option() {
275
     var property = $(this).attr("data-option");
275
     var property = $(this).attr("data-option");
276
-    var value
277
-    if($(this).attr('type') == 'checkbox') {
276
+    var value;
277
+    if ($(this).attr('type') === 'checkbox') {
278
         value = $(this).is(':checked');
278
         value = $(this).is(':checked');
279
     }
279
     }
280
     else {
280
     else {
368
 
368
 
369
     var card = ui_selected_card();
369
     var card = ui_selected_card();
370
     if (card) {
370
     if (card) {
371
-        if (value.trim().length == 0) {
371
+        if (value.trim().length === 0) {
372
             card.tags = [];
372
             card.tags = [];
373
         } else {
373
         } else {
374
             card.tags = value.split(",").map(function (val) {
374
             card.tags = value.split(",").map(function (val) {

Laden…
Annuleren
Opslaan