diff options
| -rw-r--r-- | client/components/cards/checklists.js | 4 | ||||
| -rwxr-xr-x | client/components/main/editor.js | 2 | ||||
| -rw-r--r-- | client/components/settings/settingBody.js | 2 | ||||
| -rw-r--r-- | client/lib/emoji-values.js | 302 | ||||
| -rw-r--r-- | client/lib/modal.js | 2 | ||||
| -rw-r--r-- | client/lib/popup.js | 2 | ||||
| -rw-r--r-- | models/cards.js | 36 | ||||
| -rw-r--r-- | models/invitationCodes.js | 4 | ||||
| -rw-r--r-- | sandstorm.js | 10 | ||||
| -rw-r--r-- | server/migrations.js | 6 | ||||
| -rw-r--r-- | server/notifications/outgoing.js | 4 |
11 files changed, 187 insertions, 187 deletions
diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index d3a946f0..5c0e3d2e 100644 --- a/client/components/cards/checklists.js +++ b/client/components/cards/checklists.js @@ -181,8 +181,8 @@ BlazeComponent.extendComponent({ Template.checklistDeleteDialog.onCreated(() => { const $cardDetails = this.$('.card-details'); this.scrollState = { position: $cardDetails.scrollTop(), //save current scroll position - top: false, //required for smooth scroll animation - }; + top: false, //required for smooth scroll animation + }; //Callback's purpose is to only prevent scrolling after animation is complete $cardDetails.animate({ scrollTop: 0 }, 500, () => { this.scrollState.top = true; }); diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 5987b772..5f384ece 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -6,7 +6,7 @@ Template.editor.onRendered(() => { $textarea.escapeableTextComplete([ // Emoji { - match: /\B:([\-+\w]*)$/, + match: /\B:([-+\w]*)$/, search(term, callback) { callback(Emoji.values.map((emoji) => { return emoji.includes(term) ? emoji : null; diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js index fabcc70c..8c1ff1c7 100644 --- a/client/components/settings/settingBody.js +++ b/client/components/settings/settingBody.js @@ -116,7 +116,7 @@ BlazeComponent.extendComponent({ const from = this.checkField('#mail-server-from'); const tls = $('#mail-server-tls.is-checked').length > 0; Settings.update(Settings.findOne()._id, {$set:{'mailServer.host':host, 'mailServer.port': port, 'mailServer.username': username, - 'mailServer.password': password, 'mailServer.enableTLS': tls, 'mailServer.from': from}}); + 'mailServer.password': password, 'mailServer.enableTLS': tls, 'mailServer.from': from}}); } catch (e) { return; } finally { diff --git a/client/lib/emoji-values.js b/client/lib/emoji-values.js index 1f07ac62..4debfbc0 100644 --- a/client/lib/emoji-values.js +++ b/client/lib/emoji-values.js @@ -1,152 +1,152 @@ Emoji.values = ['+1', '-1', '100', '1234', '8ball', 'a', 'ab', 'abc', 'abcd', -'accept', 'aerial_tramway', 'airplane', 'alarm_clock', 'alien', 'ambulance', -'anchor', 'angel', 'anger', 'angry', 'anguished', 'ant', 'apple', 'aquarius', -'aries', 'arrow_backward', 'arrow_double_down', 'arrow_double_up', 'arrow_down', -'arrow_down_small', 'arrow_forward', 'arrow_heading_down', 'arrow_heading_up', -'arrow_left', 'arrow_lower_left', 'arrow_lower_right', 'arrow_right', -'arrow_right_hook', 'arrow_up', 'arrow_up_down', 'arrow_up_small', -'arrow_upper_left', 'arrow_upper_right', 'arrows_clockwise', -'arrows_counterclockwise', 'art', 'articulated_lorry', 'astonished', 'atm', 'b', -'baby', 'baby_bottle', 'baby_chick', 'baby_symbol', 'baggage_claim', 'balloon', -'ballot_box_with_check', 'bamboo', 'banana', 'bangbang', 'bank', 'bar_chart', -'barber', 'baseball', 'basketball', 'bath', 'bathtub', 'battery', 'bear', 'bee', -'beer', 'beers', 'beetle', 'beginner', 'bell', 'bento', 'bicyclist', 'bike', -'bikini', 'bird', 'birthday', 'black_circle', 'black_joker', 'black_nib', -'black_square', 'black_square_button', 'blossom', 'blowfish', 'blue_book', -'blue_car', 'blue_heart', 'blush', 'boar', 'boat', 'bomb', 'book', 'bookmark', -'bookmark_tabs', 'books', 'boom', 'boot', 'bouquet', 'bow', 'bowling', 'bowtie', -'boy', 'bread', 'bride_with_veil', 'bridge_at_night', 'briefcase', -'broken_heart', 'bug', 'bulb', 'bullettrain_front', 'bullettrain_side', 'bus', -'busstop', 'bust_in_silhouette', 'busts_in_silhouette', 'cactus', 'cake', -'calendar', 'calling', 'camel', 'camera', 'cancer', 'candy', 'capital_abcd', -'capricorn', 'car', 'card_index', 'carousel_horse', 'cat', 'cat2', 'cd', -'chart', 'chart_with_downwards_trend', 'chart_with_upwards_trend', -'checkered_flag', 'cherries', 'cherry_blossom', 'chestnut', 'chicken', -'children_crossing', 'chocolate_bar', 'christmas_tree', 'church', 'cinema', -'circus_tent', 'city_sunrise', 'city_sunset', 'cl', 'clap', 'clapper', -'clipboard', 'clock1', 'clock10', 'clock1030', 'clock11', 'clock1130', -'clock12', 'clock1230', 'clock130', 'clock2', 'clock230', 'clock3', 'clock330', -'clock4', 'clock430', 'clock5', 'clock530', 'clock6', 'clock630', 'clock7', -'clock730', 'clock8', 'clock830', 'clock9', 'clock930', 'closed_book', -'closed_lock_with_key', 'closed_umbrella', 'cloud', 'clubs', 'cn', 'cocktail', -'coffee', 'cold_sweat', 'collision', 'computer', 'confetti_ball', 'confounded', -'confused', 'congratulations', 'construction', 'construction_worker', -'convenience_store', 'cookie', 'cool', 'cop', 'copyright', 'corn', 'couple', -'couple_with_heart', 'couplekiss', 'cow', 'cow2', 'credit_card', 'crocodile', -'crossed_flags', 'crown', 'cry', 'crying_cat_face', 'crystal_ball', 'cupid', -'curly_loop', 'currency_exchange', 'curry', 'custard', 'customs', 'cyclone', -'dancer', 'dancers', 'dango', 'dart', 'dash', 'date', 'de', 'deciduous_tree', -'department_store', 'diamond_shape_with_a_dot_inside', 'diamonds', -'disappointed', 'disappointed_relieved', 'dizzy', 'dizzy_face', 'do_not_litter', -'dog', 'dog2', 'dollar', 'dolls', 'dolphin', 'donut', 'door', 'doughnut', -'dragon', 'dragon_face', 'dress', 'dromedary_camel', 'droplet', 'dvd', 'e-mail', -'ear', 'ear_of_rice', 'earth_africa', 'earth_americas', 'earth_asia', 'egg', -'eggplant', 'eight', 'eight_pointed_black_star', 'eight_spoked_asterisk', -'electric_plug', 'elephant', 'email', 'end', 'envelope', 'es', 'euro', -'european_castle', 'european_post_office', 'evergreen_tree', 'exclamation', -'expressionless', 'eyeglasses', 'eyes', 'facepunch', 'factory', 'fallen_leaf', -'family', 'fast_forward', 'fax', 'fearful', 'feelsgood', 'feet', 'ferris_wheel', -'file_folder', 'finnadie', 'fire', 'fire_engine', 'fireworks', -'first_quarter_moon', 'first_quarter_moon_with_face', 'fish', 'fish_cake', -'fishing_pole_and_fish', 'fist', 'five', 'flags', 'flashlight', 'floppy_disk', -'flower_playing_cards', 'flushed', 'foggy', 'football', 'fork_and_knife', -'fountain', 'four', 'four_leaf_clover', 'fr', 'free', 'fried_shrimp', 'fries', -'frog', 'frowning', 'fu', 'fuelpump', 'full_moon', 'full_moon_with_face', -'game_die', 'gb', 'gem', 'gemini', 'ghost', 'gift', 'gift_heart', 'girl', -'globe_with_meridians', 'goat', 'goberserk', 'godmode', 'golf', 'grapes', -'green_apple', 'green_book', 'green_heart', 'grey_exclamation', 'grey_question', -'grimacing', 'grin', 'grinning', 'guardsman', 'guitar', 'gun', 'haircut', -'hamburger', 'hammer', 'hamster', 'hand', 'handbag', 'hankey', 'hash', -'hatched_chick', 'hatching_chick', 'headphones', 'hear_no_evil', 'heart', -'heart_decoration', 'heart_eyes', 'heart_eyes_cat', 'heartbeat', 'heartpulse', -'hearts', 'heavy_check_mark', 'heavy_division_sign', 'heavy_dollar_sign', -'heavy_exclamation_mark', 'heavy_minus_sign', 'heavy_multiplication_x', -'heavy_plus_sign', 'helicopter', 'herb', 'hibiscus', 'high_brightness', -'high_heel', 'hocho', 'honey_pot', 'honeybee', 'horse', 'horse_racing', -'hospital', 'hotel', 'hotsprings', 'hourglass', 'hourglass_flowing_sand', -'house', 'house_with_garden', 'hurtrealbad', 'hushed', 'ice_cream', 'icecream', -'id', 'ideograph_advantage', 'imp', 'inbox_tray', 'incoming_envelope', -'information_desk_person', 'information_source', 'innocent', 'interrobang', -'iphone', 'it', 'izakaya_lantern', 'jack_o_lantern', 'japan', 'japanese_castle', -'japanese_goblin', 'japanese_ogre', 'jeans', 'joy', 'joy_cat', 'jp', 'key', -'keycap_ten', 'kimono', 'kiss', 'kissing', 'kissing_cat', 'kissing_closed_eyes', -'kissing_face', 'kissing_heart', 'kissing_smiling_eyes', 'koala', 'koko', 'kr', -'large_blue_circle', 'large_blue_diamond', 'large_orange_diamond', -'last_quarter_moon', 'last_quarter_moon_with_face', 'laughing', 'leaves', -'ledger', 'left_luggage', 'left_right_arrow', 'leftwards_arrow_with_hook', -'lemon', 'leo', 'leopard', 'libra', 'light_rail', 'link', 'lips', 'lipstick', -'lock', 'lock_with_ink_pen', 'lollipop', 'loop', 'loudspeaker', 'love_hotel', -'love_letter', 'low_brightness', 'm', 'mag', 'mag_right', 'mahjong', 'mailbox', -'mailbox_closed', 'mailbox_with_mail', 'mailbox_with_no_mail', 'man', -'man_with_gua_pi_mao', 'man_with_turban', 'mans_shoe', 'maple_leaf', 'mask', -'massage', 'meat_on_bone', 'mega', 'melon', 'memo', 'mens', 'metal', 'metro', -'microphone', 'microscope', 'milky_way', 'minibus', 'minidisc', -'mobile_phone_off', 'money_with_wings', 'moneybag', 'monkey', 'monkey_face', -'monorail', 'moon', 'mortar_board', 'mount_fuji', 'mountain_bicyclist', -'mountain_cableway', 'mountain_railway', 'mouse', 'mouse2', 'movie_camera', -'moyai', 'muscle', 'mushroom', 'musical_keyboard', 'musical_note', -'musical_score', 'mute', 'nail_care', 'name_badge', 'neckbeard', 'necktie', -'negative_squared_cross_mark', 'neutral_face', 'new', 'new_moon', -'new_moon_with_face', 'newspaper', 'ng', 'nine', 'no_bell', 'no_bicycles', -'no_entry', 'no_entry_sign', 'no_good', 'no_mobile_phones', 'no_mouth', -'no_pedestrians', 'no_smoking', 'non-potable_water', 'nose', 'notebook', -'notebook_with_decorative_cover', 'notes', 'nut_and_bolt', 'o', 'o2', 'ocean', -'octocat', 'octopus', 'oden', 'office', 'ok', 'ok_hand', 'ok_woman', -'older_man', 'older_woman', 'on', 'oncoming_automobile', 'oncoming_bus', -'oncoming_police_car', 'oncoming_taxi', 'one', 'open_file_folder', 'open_hands', -'open_mouth', 'ophiuchus', 'orange_book', 'outbox_tray', 'ox', 'page_facing_up', -'page_with_curl', 'pager', 'palm_tree', 'panda_face', 'paperclip', 'parking', -'part_alternation_mark', 'partly_sunny', 'passport_control', 'paw_prints', -'peach', 'pear', 'pencil', 'pencil2', 'penguin', 'pensive', 'performing_arts', -'persevere', 'person_frowning', 'person_with_blond_hair', -'person_with_pouting_face', 'phone', 'pig', 'pig2', 'pig_nose', 'pill', -'pineapple', 'pisces', 'pizza', 'plus1', 'point_down', 'point_left', -'point_right', 'point_up', 'point_up_2', 'police_car', 'poodle', 'poop', -'post_office', 'postal_horn', 'postbox', 'potable_water', 'pouch', -'poultry_leg', 'pound', 'pouting_cat', 'pray', 'princess', 'punch', -'purple_heart', 'purse', 'pushpin', 'put_litter_in_its_place', 'question', -'rabbit', 'rabbit2', 'racehorse', 'radio', 'radio_button', 'rage', 'rage1', -'rage2', 'rage3', 'rage4', 'railway_car', 'rainbow', 'raised_hand', -'raised_hands', 'raising_hand', 'ram', 'ramen', 'rat', 'recycle', 'red_car', -'red_circle', 'registered', 'relaxed', 'relieved', 'repeat', 'repeat_one', -'restroom', 'revolving_hearts', 'rewind', 'ribbon', 'rice', 'rice_ball', -'rice_cracker', 'rice_scene', 'ring', 'rocket', 'roller_coaster', 'rooster', -'rose', 'rotating_light', 'round_pushpin', 'rowboat', 'ru', 'rugby_football', -'runner', 'running', 'running_shirt_with_sash', 'sa', 'sagittarius', 'sailboat', -'sake', 'sandal', 'santa', 'satellite', 'satisfied', 'saxophone', 'school', -'school_satchel', 'scissors', 'scorpius', 'scream', 'scream_cat', 'scroll', -'seat', 'secret', 'see_no_evil', 'seedling', 'seven', 'shaved_ice', 'sheep', -'shell', 'ship', 'shipit', 'shirt', 'shit', 'shoe', 'shower', 'signal_strength', -'six', 'six_pointed_star', 'ski', 'skull', 'sleeping', 'sleepy', 'slot_machine', -'small_blue_diamond', 'small_orange_diamond', 'small_red_triangle', -'small_red_triangle_down', 'smile', 'smile_cat', 'smiley', 'smiley_cat', -'smiling_imp', 'smirk', 'smirk_cat', 'smoking', 'snail', 'snake', 'snowboarder', -'snowflake', 'snowman', 'sob', 'soccer', 'soon', 'sos', 'sound', -'space_invader', 'spades', 'spaghetti', 'sparkler', 'sparkles', -'sparkling_heart', 'speak_no_evil', 'speaker', 'speech_balloon', 'speedboat', -'squirrel', 'star', 'star2', 'stars', 'station', 'statue_of_liberty', -'steam_locomotive', 'stew', 'straight_ruler', 'strawberry', 'stuck_out_tongue', -'stuck_out_tongue_closed_eyes', 'stuck_out_tongue_winking_eye', 'sun_with_face', -'sunflower', 'sunglasses', 'sunny', 'sunrise', 'sunrise_over_mountains', -'surfer', 'sushi', 'suspect', 'suspension_railway', 'sweat', 'sweat_drops', -'sweat_smile', 'sweet_potato', 'swimmer', 'symbols', 'syringe', 'tada', -'tanabata_tree', 'tangerine', 'taurus', 'taxi', 'tea', 'telephone', -'telephone_receiver', 'telescope', 'tennis', 'tent', 'thought_balloon', 'three', -'thumbsdown', 'thumbsup', 'ticket', 'tiger', 'tiger2', 'tired_face', 'tm', -'toilet', 'tokyo_tower', 'tomato', 'tongue', 'top', 'tophat', 'tractor', -'traffic_light', 'train', 'train2', 'tram', 'triangular_flag_on_post', -'triangular_ruler', 'trident', 'triumph', 'trolleybus', 'trollface', 'trophy', -'tropical_drink', 'tropical_fish', 'truck', 'trumpet', 'tshirt', 'tulip', -'turtle', 'tv', 'twisted_rightwards_arrows', 'two', 'two_hearts', -'two_men_holding_hands', 'two_women_holding_hands', 'u5272', 'u5408', 'u55b6', -'u6307', 'u6708', 'u6709', 'u6e80', 'u7121', 'u7533', 'u7981', 'u7a7a', 'uk', -'umbrella', 'unamused', 'underage', 'unlock', 'up', 'us', 'v', -'vertical_traffic_light', 'vhs', 'vibration_mode', 'video_camera', 'video_game', -'violin', 'virgo', 'volcano', 'vs', 'walking', 'waning_crescent_moon', -'waning_gibbous_moon', 'warning', 'watch', 'water_buffalo', 'watermelon', -'wave', 'wavy_dash', 'waxing_crescent_moon', 'waxing_gibbous_moon', 'wc', -'weary', 'wedding', 'whale', 'whale2', 'wheelchair', 'white_check_mark', -'white_circle', 'white_flower', 'white_square', 'white_square_button', -'wind_chime', 'wine_glass', 'wink', 'wolf', 'woman', 'womans_clothes', -'womans_hat', 'womens', 'worried', 'wrench', 'x', 'yellow_heart', 'yen', 'yum', -'zap', 'zero', 'zzz']; + 'accept', 'aerial_tramway', 'airplane', 'alarm_clock', 'alien', 'ambulance', + 'anchor', 'angel', 'anger', 'angry', 'anguished', 'ant', 'apple', 'aquarius', + 'aries', 'arrow_backward', 'arrow_double_down', 'arrow_double_up', 'arrow_down', + 'arrow_down_small', 'arrow_forward', 'arrow_heading_down', 'arrow_heading_up', + 'arrow_left', 'arrow_lower_left', 'arrow_lower_right', 'arrow_right', + 'arrow_right_hook', 'arrow_up', 'arrow_up_down', 'arrow_up_small', + 'arrow_upper_left', 'arrow_upper_right', 'arrows_clockwise', + 'arrows_counterclockwise', 'art', 'articulated_lorry', 'astonished', 'atm', 'b', + 'baby', 'baby_bottle', 'baby_chick', 'baby_symbol', 'baggage_claim', 'balloon', + 'ballot_box_with_check', 'bamboo', 'banana', 'bangbang', 'bank', 'bar_chart', + 'barber', 'baseball', 'basketball', 'bath', 'bathtub', 'battery', 'bear', 'bee', + 'beer', 'beers', 'beetle', 'beginner', 'bell', 'bento', 'bicyclist', 'bike', + 'bikini', 'bird', 'birthday', 'black_circle', 'black_joker', 'black_nib', + 'black_square', 'black_square_button', 'blossom', 'blowfish', 'blue_book', + 'blue_car', 'blue_heart', 'blush', 'boar', 'boat', 'bomb', 'book', 'bookmark', + 'bookmark_tabs', 'books', 'boom', 'boot', 'bouquet', 'bow', 'bowling', 'bowtie', + 'boy', 'bread', 'bride_with_veil', 'bridge_at_night', 'briefcase', + 'broken_heart', 'bug', 'bulb', 'bullettrain_front', 'bullettrain_side', 'bus', + 'busstop', 'bust_in_silhouette', 'busts_in_silhouette', 'cactus', 'cake', + 'calendar', 'calling', 'camel', 'camera', 'cancer', 'candy', 'capital_abcd', + 'capricorn', 'car', 'card_index', 'carousel_horse', 'cat', 'cat2', 'cd', + 'chart', 'chart_with_downwards_trend', 'chart_with_upwards_trend', + 'checkered_flag', 'cherries', 'cherry_blossom', 'chestnut', 'chicken', + 'children_crossing', 'chocolate_bar', 'christmas_tree', 'church', 'cinema', + 'circus_tent', 'city_sunrise', 'city_sunset', 'cl', 'clap', 'clapper', + 'clipboard', 'clock1', 'clock10', 'clock1030', 'clock11', 'clock1130', + 'clock12', 'clock1230', 'clock130', 'clock2', 'clock230', 'clock3', 'clock330', + 'clock4', 'clock430', 'clock5', 'clock530', 'clock6', 'clock630', 'clock7', + 'clock730', 'clock8', 'clock830', 'clock9', 'clock930', 'closed_book', + 'closed_lock_with_key', 'closed_umbrella', 'cloud', 'clubs', 'cn', 'cocktail', + 'coffee', 'cold_sweat', 'collision', 'computer', 'confetti_ball', 'confounded', + 'confused', 'congratulations', 'construction', 'construction_worker', + 'convenience_store', 'cookie', 'cool', 'cop', 'copyright', 'corn', 'couple', + 'couple_with_heart', 'couplekiss', 'cow', 'cow2', 'credit_card', 'crocodile', + 'crossed_flags', 'crown', 'cry', 'crying_cat_face', 'crystal_ball', 'cupid', + 'curly_loop', 'currency_exchange', 'curry', 'custard', 'customs', 'cyclone', + 'dancer', 'dancers', 'dango', 'dart', 'dash', 'date', 'de', 'deciduous_tree', + 'department_store', 'diamond_shape_with_a_dot_inside', 'diamonds', + 'disappointed', 'disappointed_relieved', 'dizzy', 'dizzy_face', 'do_not_litter', + 'dog', 'dog2', 'dollar', 'dolls', 'dolphin', 'donut', 'door', 'doughnut', + 'dragon', 'dragon_face', 'dress', 'dromedary_camel', 'droplet', 'dvd', 'e-mail', + 'ear', 'ear_of_rice', 'earth_africa', 'earth_americas', 'earth_asia', 'egg', + 'eggplant', 'eight', 'eight_pointed_black_star', 'eight_spoked_asterisk', + 'electric_plug', 'elephant', 'email', 'end', 'envelope', 'es', 'euro', + 'european_castle', 'european_post_office', 'evergreen_tree', 'exclamation', + 'expressionless', 'eyeglasses', 'eyes', 'facepunch', 'factory', 'fallen_leaf', + 'family', 'fast_forward', 'fax', 'fearful', 'feelsgood', 'feet', 'ferris_wheel', + 'file_folder', 'finnadie', 'fire', 'fire_engine', 'fireworks', + 'first_quarter_moon', 'first_quarter_moon_with_face', 'fish', 'fish_cake', + 'fishing_pole_and_fish', 'fist', 'five', 'flags', 'flashlight', 'floppy_disk', + 'flower_playing_cards', 'flushed', 'foggy', 'football', 'fork_and_knife', + 'fountain', 'four', 'four_leaf_clover', 'fr', 'free', 'fried_shrimp', 'fries', + 'frog', 'frowning', 'fu', 'fuelpump', 'full_moon', 'full_moon_with_face', + 'game_die', 'gb', 'gem', 'gemini', 'ghost', 'gift', 'gift_heart', 'girl', + 'globe_with_meridians', 'goat', 'goberserk', 'godmode', 'golf', 'grapes', + 'green_apple', 'green_book', 'green_heart', 'grey_exclamation', 'grey_question', + 'grimacing', 'grin', 'grinning', 'guardsman', 'guitar', 'gun', 'haircut', + 'hamburger', 'hammer', 'hamster', 'hand', 'handbag', 'hankey', 'hash', + 'hatched_chick', 'hatching_chick', 'headphones', 'hear_no_evil', 'heart', + 'heart_decoration', 'heart_eyes', 'heart_eyes_cat', 'heartbeat', 'heartpulse', + 'hearts', 'heavy_check_mark', 'heavy_division_sign', 'heavy_dollar_sign', + 'heavy_exclamation_mark', 'heavy_minus_sign', 'heavy_multiplication_x', + 'heavy_plus_sign', 'helicopter', 'herb', 'hibiscus', 'high_brightness', + 'high_heel', 'hocho', 'honey_pot', 'honeybee', 'horse', 'horse_racing', + 'hospital', 'hotel', 'hotsprings', 'hourglass', 'hourglass_flowing_sand', + 'house', 'house_with_garden', 'hurtrealbad', 'hushed', 'ice_cream', 'icecream', + 'id', 'ideograph_advantage', 'imp', 'inbox_tray', 'incoming_envelope', + 'information_desk_person', 'information_source', 'innocent', 'interrobang', + 'iphone', 'it', 'izakaya_lantern', 'jack_o_lantern', 'japan', 'japanese_castle', + 'japanese_goblin', 'japanese_ogre', 'jeans', 'joy', 'joy_cat', 'jp', 'key', + 'keycap_ten', 'kimono', 'kiss', 'kissing', 'kissing_cat', 'kissing_closed_eyes', + 'kissing_face', 'kissing_heart', 'kissing_smiling_eyes', 'koala', 'koko', 'kr', + 'large_blue_circle', 'large_blue_diamond', 'large_orange_diamond', + 'last_quarter_moon', 'last_quarter_moon_with_face', 'laughing', 'leaves', + 'ledger', 'left_luggage', 'left_right_arrow', 'leftwards_arrow_with_hook', + 'lemon', 'leo', 'leopard', 'libra', 'light_rail', 'link', 'lips', 'lipstick', + 'lock', 'lock_with_ink_pen', 'lollipop', 'loop', 'loudspeaker', 'love_hotel', + 'love_letter', 'low_brightness', 'm', 'mag', 'mag_right', 'mahjong', 'mailbox', + 'mailbox_closed', 'mailbox_with_mail', 'mailbox_with_no_mail', 'man', + 'man_with_gua_pi_mao', 'man_with_turban', 'mans_shoe', 'maple_leaf', 'mask', + 'massage', 'meat_on_bone', 'mega', 'melon', 'memo', 'mens', 'metal', 'metro', + 'microphone', 'microscope', 'milky_way', 'minibus', 'minidisc', + 'mobile_phone_off', 'money_with_wings', 'moneybag', 'monkey', 'monkey_face', + 'monorail', 'moon', 'mortar_board', 'mount_fuji', 'mountain_bicyclist', + 'mountain_cableway', 'mountain_railway', 'mouse', 'mouse2', 'movie_camera', + 'moyai', 'muscle', 'mushroom', 'musical_keyboard', 'musical_note', + 'musical_score', 'mute', 'nail_care', 'name_badge', 'neckbeard', 'necktie', + 'negative_squared_cross_mark', 'neutral_face', 'new', 'new_moon', + 'new_moon_with_face', 'newspaper', 'ng', 'nine', 'no_bell', 'no_bicycles', + 'no_entry', 'no_entry_sign', 'no_good', 'no_mobile_phones', 'no_mouth', + 'no_pedestrians', 'no_smoking', 'non-potable_water', 'nose', 'notebook', + 'notebook_with_decorative_cover', 'notes', 'nut_and_bolt', 'o', 'o2', 'ocean', + 'octocat', 'octopus', 'oden', 'office', 'ok', 'ok_hand', 'ok_woman', + 'older_man', 'older_woman', 'on', 'oncoming_automobile', 'oncoming_bus', + 'oncoming_police_car', 'oncoming_taxi', 'one', 'open_file_folder', 'open_hands', + 'open_mouth', 'ophiuchus', 'orange_book', 'outbox_tray', 'ox', 'page_facing_up', + 'page_with_curl', 'pager', 'palm_tree', 'panda_face', 'paperclip', 'parking', + 'part_alternation_mark', 'partly_sunny', 'passport_control', 'paw_prints', + 'peach', 'pear', 'pencil', 'pencil2', 'penguin', 'pensive', 'performing_arts', + 'persevere', 'person_frowning', 'person_with_blond_hair', + 'person_with_pouting_face', 'phone', 'pig', 'pig2', 'pig_nose', 'pill', + 'pineapple', 'pisces', 'pizza', 'plus1', 'point_down', 'point_left', + 'point_right', 'point_up', 'point_up_2', 'police_car', 'poodle', 'poop', + 'post_office', 'postal_horn', 'postbox', 'potable_water', 'pouch', + 'poultry_leg', 'pound', 'pouting_cat', 'pray', 'princess', 'punch', + 'purple_heart', 'purse', 'pushpin', 'put_litter_in_its_place', 'question', + 'rabbit', 'rabbit2', 'racehorse', 'radio', 'radio_button', 'rage', 'rage1', + 'rage2', 'rage3', 'rage4', 'railway_car', 'rainbow', 'raised_hand', + 'raised_hands', 'raising_hand', 'ram', 'ramen', 'rat', 'recycle', 'red_car', + 'red_circle', 'registered', 'relaxed', 'relieved', 'repeat', 'repeat_one', + 'restroom', 'revolving_hearts', 'rewind', 'ribbon', 'rice', 'rice_ball', + 'rice_cracker', 'rice_scene', 'ring', 'rocket', 'roller_coaster', 'rooster', + 'rose', 'rotating_light', 'round_pushpin', 'rowboat', 'ru', 'rugby_football', + 'runner', 'running', 'running_shirt_with_sash', 'sa', 'sagittarius', 'sailboat', + 'sake', 'sandal', 'santa', 'satellite', 'satisfied', 'saxophone', 'school', + 'school_satchel', 'scissors', 'scorpius', 'scream', 'scream_cat', 'scroll', + 'seat', 'secret', 'see_no_evil', 'seedling', 'seven', 'shaved_ice', 'sheep', + 'shell', 'ship', 'shipit', 'shirt', 'shit', 'shoe', 'shower', 'signal_strength', + 'six', 'six_pointed_star', 'ski', 'skull', 'sleeping', 'sleepy', 'slot_machine', + 'small_blue_diamond', 'small_orange_diamond', 'small_red_triangle', + 'small_red_triangle_down', 'smile', 'smile_cat', 'smiley', 'smiley_cat', + 'smiling_imp', 'smirk', 'smirk_cat', 'smoking', 'snail', 'snake', 'snowboarder', + 'snowflake', 'snowman', 'sob', 'soccer', 'soon', 'sos', 'sound', + 'space_invader', 'spades', 'spaghetti', 'sparkler', 'sparkles', + 'sparkling_heart', 'speak_no_evil', 'speaker', 'speech_balloon', 'speedboat', + 'squirrel', 'star', 'star2', 'stars', 'station', 'statue_of_liberty', + 'steam_locomotive', 'stew', 'straight_ruler', 'strawberry', 'stuck_out_tongue', + 'stuck_out_tongue_closed_eyes', 'stuck_out_tongue_winking_eye', 'sun_with_face', + 'sunflower', 'sunglasses', 'sunny', 'sunrise', 'sunrise_over_mountains', + 'surfer', 'sushi', 'suspect', 'suspension_railway', 'sweat', 'sweat_drops', + 'sweat_smile', 'sweet_potato', 'swimmer', 'symbols', 'syringe', 'tada', + 'tanabata_tree', 'tangerine', 'taurus', 'taxi', 'tea', 'telephone', + 'telephone_receiver', 'telescope', 'tennis', 'tent', 'thought_balloon', 'three', + 'thumbsdown', 'thumbsup', 'ticket', 'tiger', 'tiger2', 'tired_face', 'tm', + 'toilet', 'tokyo_tower', 'tomato', 'tongue', 'top', 'tophat', 'tractor', + 'traffic_light', 'train', 'train2', 'tram', 'triangular_flag_on_post', + 'triangular_ruler', 'trident', 'triumph', 'trolleybus', 'trollface', 'trophy', + 'tropical_drink', 'tropical_fish', 'truck', 'trumpet', 'tshirt', 'tulip', + 'turtle', 'tv', 'twisted_rightwards_arrows', 'two', 'two_hearts', + 'two_men_holding_hands', 'two_women_holding_hands', 'u5272', 'u5408', 'u55b6', + 'u6307', 'u6708', 'u6709', 'u6e80', 'u7121', 'u7533', 'u7981', 'u7a7a', 'uk', + 'umbrella', 'unamused', 'underage', 'unlock', 'up', 'us', 'v', + 'vertical_traffic_light', 'vhs', 'vibration_mode', 'video_camera', 'video_game', + 'violin', 'virgo', 'volcano', 'vs', 'walking', 'waning_crescent_moon', + 'waning_gibbous_moon', 'warning', 'watch', 'water_buffalo', 'watermelon', + 'wave', 'wavy_dash', 'waxing_crescent_moon', 'waxing_gibbous_moon', 'wc', + 'weary', 'wedding', 'whale', 'whale2', 'wheelchair', 'white_check_mark', + 'white_circle', 'white_flower', 'white_square', 'white_square_button', + 'wind_chime', 'wine_glass', 'wink', 'wolf', 'woman', 'womans_clothes', + 'womans_hat', 'womens', 'worried', 'wrench', 'x', 'yellow_heart', 'yen', 'yum', + 'zap', 'zero', 'zzz']; diff --git a/client/lib/modal.js b/client/lib/modal.js index 1ca8804b..d5350264 100644 --- a/client/lib/modal.js +++ b/client/lib/modal.js @@ -31,7 +31,7 @@ window.Modal = new class { this._currentModal.set({ header, modalName }); this._onCloseGoTo = onCloseGoTo; } -}; +}(); Blaze.registerHelper('Modal', Modal); diff --git a/client/lib/popup.js b/client/lib/popup.js index d9e29ff1..0a700f82 100644 --- a/client/lib/popup.js +++ b/client/lib/popup.js @@ -190,7 +190,7 @@ window.Popup = new class { return title !== translationKey ? title : defaultTitle; }; } -}; +}(); // We close a potential opened popup on any left click on the document, or go // one step back by pressing escape. diff --git a/models/cards.js b/models/cards.js index b62bfea8..8676dfdc 100644 --- a/models/cards.js +++ b/models/cards.js @@ -18,9 +18,9 @@ Cards.attachSchema(new SimpleSchema({ listId: { type: String, }, - // The system could work without this `boardId` information (we could deduce - // the board identifier from the card), but it would make the system more - // difficult to manage and less efficient. + // The system could work without this `boardId` information (we could deduce + // the board identifier from the card), but it would make the system more + // difficult to manage and less efficient. boardId: { type: String, }, @@ -146,8 +146,8 @@ Cards.helpers({ cover() { const cover = Attachments.findOne(this.coverId); - // if we return a cover before it is fully stored, we will get errors when we try to display it - // todo XXX we could return a default "upload pending" image in the meantime? + // if we return a cover before it is fully stored, we will get errors when we try to display it + // todo XXX we could return a default "upload pending" image in the meantime? return cover && cover.url() && cover; }, @@ -339,7 +339,7 @@ function cardMembers(userId, doc, fieldNames, modifier) { if (!_.contains(fieldNames, 'members')) return; let memberId; - // Say hello to the new member + // Say hello to the new member if (modifier.$addToSet && modifier.$addToSet.members) { memberId = modifier.$addToSet.members; if (!_.contains(doc.members, memberId)) { @@ -353,10 +353,10 @@ function cardMembers(userId, doc, fieldNames, modifier) { } } - // Say goodbye to the former member + // Say goodbye to the former member if (modifier.$pull && modifier.$pull.members) { memberId = modifier.$pull.members; - // Check that the former member is member of the card + // Check that the former member is member of the card if (_.contains(doc.members, memberId)) { Activities.insert({ userId, @@ -396,8 +396,8 @@ function cardRemover(userId, doc) { if (Meteor.isServer) { - // Cards are often fetched within a board, so we create an index to make these - // queries more efficient. + // Cards are often fetched within a board, so we create an index to make these + // queries more efficient. Meteor.startup(() => { Cards._collection._ensureIndex({boardId: 1, createdAt: -1}); }); @@ -406,24 +406,24 @@ if (Meteor.isServer) { cardCreation(userId, doc); }); - // New activity for card (un)archivage + // New activity for card (un)archivage Cards.after.update((userId, doc, fieldNames) => { cardState(userId, doc, fieldNames); }); - //New activity for card moves + //New activity for card moves Cards.after.update(function (userId, doc, fieldNames) { const oldListId = this.previous.listId; cardMove(userId, doc, fieldNames, oldListId); }); - // Add a new activity if we add or remove a member to the card + // Add a new activity if we add or remove a member to the card Cards.before.update((userId, doc, fieldNames, modifier) => { cardMembers(userId, doc, fieldNames, modifier); }); - // Remove all activities associated with a card if we remove the card - // Remove also card_comments / checklists / attachments + // Remove all activities associated with a card if we remove the card + // Remove also card_comments / checklists / attachments Cards.after.remove((userId, doc) => { cardRemover(userId, doc); }); @@ -498,12 +498,12 @@ if (Meteor.isServer) { if (req.body.hasOwnProperty('title')) { const newTitle = req.body.title; Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false}, - {$set: {title: newTitle}}); + {$set: {title: newTitle}}); } if (req.body.hasOwnProperty('listId')) { const newParamListId = req.body.listId; Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false}, - {$set: {listId: newParamListId}}); + {$set: {listId: newParamListId}}); const card = Cards.findOne({_id: paramCardId} ); cardMove(req.body.authorId, card, {fieldName: 'listId'}, paramListId); @@ -512,7 +512,7 @@ if (Meteor.isServer) { if (req.body.hasOwnProperty('description')) { const newDescription = req.body.description; Cards.direct.update({_id: paramCardId, listId: paramListId, boardId: paramBoardId, archived: false}, - {$set: {description: newDescription}}); + {$set: {description: newDescription}}); } JsonRoutes.sendResult(res, { code: 200, diff --git a/models/invitationCodes.js b/models/invitationCodes.js index 5761977a..53163f06 100644 --- a/models/invitationCodes.js +++ b/models/invitationCodes.js @@ -34,8 +34,8 @@ InvitationCodes.helpers({ }); // InvitationCodes.before.insert((userId, doc) => { - // doc.createdAt = new Date(); - // doc.authorId = userId; +// doc.createdAt = new Date(); +// doc.authorId = userId; // }); if (Meteor.isServer) { diff --git a/sandstorm.js b/sandstorm.js index 6b7c8172..80269bb9 100644 --- a/sandstorm.js +++ b/sandstorm.js @@ -73,7 +73,7 @@ if (isSandstorm && Meteor.isServer) { session.claimRequest(token).then((response) => { const identity = response.cap.castAs(Identity.Identity); const promises = [api.getIdentityId(identity), identity.getProfile(), - httpBridge.saveIdentity(identity)]; + httpBridge.saveIdentity(identity)]; return Promise.all(promises).then((responses) => { const identityId = responses[0].id.toString('hex').slice(0, 32); const profile = responses[1].profile; @@ -113,9 +113,9 @@ if (isSandstorm && Meteor.isServer) { const identity = response.identity; return identity.getProfile().then(() => { return { identity, - mentioned: !!user.mentioned, - subscribed: !!user.subscribed, - }; + mentioned: !!user.mentioned, + subscribed: !!user.subscribed, + }; }); }).catch(() => { // Ignore identities that fail to restore. Either they were added before we set @@ -130,7 +130,7 @@ if (isSandstorm && Meteor.isServer) { return session.activity(event); }).then(() => done(), - (e) => done(e)); + (e) => done(e)); })(); } diff --git a/server/migrations.js b/server/migrations.js index 76721623..f828a14c 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -109,9 +109,9 @@ Migrations.add('add-member-isactive-field', () => { Boards.find({}, {fields: {members: 1}}).forEach((board) => { const allUsersWithSomeActivity = _.chain( Activities.find({ boardId: board._id }, { fields:{ userId:1 }}).fetch()) - .pluck('userId') - .uniq() - .value(); + .pluck('userId') + .uniq() + .value(); const currentUsers = _.pluck(board.members, 'userId'); const formerUsers = _.difference(allUsersWithSomeActivity, currentUsers); diff --git a/server/notifications/outgoing.js b/server/notifications/outgoing.js index ed3d8df7..779d41a0 100644 --- a/server/notifications/outgoing.js +++ b/server/notifications/outgoing.js @@ -30,8 +30,8 @@ Meteor.methods({ }; [ 'cardId', 'listId', 'oldListId', - 'boardId', 'comment', 'user', - 'card', 'commentId', + 'boardId', 'comment', 'user', + 'card', 'commentId', ].forEach((key) => { if (params[key]) value[key] = params[key]; }); |