thredded 0.8.4 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0ae737f91c634807997bd570331a9e198cd6d45
-  data.tar.gz: 816e598eb872a77f20c595c9bfa42a84de5e9d90
+  metadata.gz: 279e815e52564fc440a5495e4952aaf8ab84a5fb
+  data.tar.gz: 5907233bce4511abeb29d7d6a9ce01fdb30c1d11
 SHA512:
-  metadata.gz: 12d028119412d16ab051683c9e0d63559e1f220f96c64b737786e8b705c756151827ac1c4416e53693e571f96026b32e6483f00c2c01b5664c8b0235aa1537de
-  data.tar.gz: 771a6a57fa030bbbe80d6fb552f0c7e9b974d42a8e44e9f79305d3fa082041556d00e113e8c4ca8f16f98e401f432dbc5f19796a6ab399673ff0b2af1ff3811f
+  metadata.gz: a6dc5895f37044bc4da48f31065ecb5a6b42360c56cba3ced82d9ff6723d014c79d249065857dcacaa315803b817515459ac42c4a270cc7281d897d7bc70af67
+  data.tar.gz: be64c3bae2cef65b90988c9473ca1b003fae0fbffa464b717622d982f93a18d4420c695d50d3fd53bef115150d8697b7b474cfdcd70de31a2edfc003bd907328

data/README.md

@@ -56,7 +56,7 @@ Then, see the rest of this Readme for more information about using and customizi
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.8.4'
+gem 'thredded', '~> 0.9.1'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -105,14 +105,26 @@ rails g thredded:install
 
 But then compare this with the previous version to decide what to keep.
 
-2) To upgrade the database (in this example from v0.4 to the v0.5):
+2) To upgrade the database:
+
+Latest version (in this example from v0.6 to v0.7):
 
 ```console
-cp `bundle show thredded`/db/upgrade_migrations/20160501151908_upgrade_v0_4_to_v0_5.rb db/migrate
+# Note that for guaranteed best results you will want to run this with the gem checked out with v0.7.0
+cp `bundle show thredded`/db/upgrade_migrations/20160723012349_upgrade_v0_6_to_v0_7.rb db/migrate
 rake db:migrate
 ```
 
-Note that for guaranteed best results you will want to run this with the gem checked out with v0.5.0.
+
+To upgrade the database (in this example from v0.7 to v0.8):
+
+```console
+# Note that for guaranteed best results you will want to run this with the gem checked out with v0.8.0.
+cp `bundle show thredded`/db/upgrade_migrations/20161019150201_upgrade_v0_7_to_v0_8.rb db/migrate
+rake db:migrate
+```
+
+
 
 ### Migrating from Forem
 
@@ -145,30 +157,54 @@ You can also use Thredded with your application (or other) layout by by setting
 
 In this case, you will need to reference your paths/routes carefully and pull in thredded assets (styles and javascript):
 
-#### Referencing your paths so that thredded views can find them
+#### Reference your paths so that Thredded can find them
 
 In your layout you will probably have links to other paths in your app (e.g. navigation links).
-For any url helpers (like `users_path` or `projects_path` or whatever) will need to have `main_app.` prefixed to  them so that they can be found from thredded (`main_app.users_path` will work from either thredded or your app).
+For any url helpers (like `users_path` or `projects_path` or whatever) will need to have `main_app.`
+prefixed to them so that they can be found from thredded (`main_app.users_path` will work from both thredded and your app).
 
 However if you don't want to update your layouts and partials, you can define methods automatically to delegate to the main_app's routes:
 See https://gist.github.com/timdiggins/bf6d09b28828a392198562c93554ad07.
 
-#### Pulling in thredded assets (styles and javascript)
+#### Add Thredded styles
 
 In this case, you will also need to include Thredded styles and JavaScript into the application styles and JavaScript.
 
-Add thredded styles to your `application.scss` (see below for customizing the styles):
+Add thredded styles to your `application.scss`:
 
 ```scss
 @import "thredded";
 ```
 
+Thredded wraps the views in a container element that has a `max-width` and paddings by default.
+If your app layout already has a container element that handles these, you can remove the `max-width` and paddings
+from the Thredded one by adding this Sass snippet after `@import "thredded";`:
+
+```scss
+.thredded--main-container {
+  // The padding and max-width are handled by the app's container.
+  max-width: none;
+  padding: 0;
+  @include thredded-media-tablet-and-up {
+    padding: 0;
+  }
+}
+```
+
+See [below](#styles) for customizing the styles via Sass variables.
+
+#### Add Thredded JavaScripts
+
 Include thredded JavaScripts in your `application.js`:
 
 ```js
 //= require thredded
 ```
 
+Thredded is fully compatible with deferred and async script loading.
+
+##### jQuery version
+
 To use thredded with your application layout, you also need to ensure that your layout and thredded don't load different
 versions of jQuery. By default, Thredded loads jQuery v3 (via `//= require jquery3` from [jquery-rails]),
 but if you want to use jQuery v1 or v2, then you need to create a file at
@@ -274,7 +310,7 @@ any duplicate CSS.
 [select2-rails]: https://github.com/argerim/select2-rails
 [thredded-scss-base]: https://github.com/thredded/thredded/blob/master/app/assets/stylesheets/thredded/_base.scss
 
-### Emails
+### Email and other notifications
 
 Thredded sends several notification emails to the users. You can override in the same way as the views.
 If you use [Rails Email Preview], you can include Thredded emails into the list of previews by adding
@@ -282,6 +318,9 @@ If you use [Rails Email Preview], you can include Thredded emails into the list
 
 [Rails Email Preview]: https://github.com/glebm/rails_email_preview
 
+You can also turn off the email notifier totally, or add other notifiers (e.g. Pushover, possibly Slack) by adjusting the
+ `Thredded.notifiers` configuration in your initializer. See the default initializer for examples.
+
 ## I18n
 
 Thredded is mostly internationalized. It is currently available in English and Brazilian Portuguese. We welcome PRs

data/app/assets/images/thredded/breadcrumb-chevron.svg

@@ -1 +1 @@
-<svg width="7" height="11" viewBox="0 0 7 11" xmlns="http://www.w3.org/2000/svg"><title>breadcrumb-chevron</title><desc>Created with Sketch.</desc><g fill="none" fill-rule="evenodd"><g fill="#B0AEBC"><path d="M1.96.19c-.19-.198-.497-.198-.685 0L.592.91c-.19.197-.19.518 0 .715l3.295 3.405L.564 8.462c-.19.198-.19.518 0 .716l.684.717c.188.197.494.197.684 0l4.35-4.508c.187-.2.187-.52 0-.717L1.958.19"/></g></g></svg>
+<svg viewBox="0 0 7 11" xmlns="http://www.w3.org/2000/svg"><path d="M1.96.19a.47.47 0 0 0-.685 0L.592.91a.52.52 0 0 0 0 .715L3.887 5.03.564 8.462a.52.52 0 0 0 0 .716l.684.717a.47.47 0 0 0 .684 0l4.35-4.508a.528.528 0 0 0 0-.717L1.958.19" fill="#B0AEBC" fill-rule="evenodd"/></svg>

data/app/assets/images/thredded/follow.svg

@@ -1 +1 @@
-<svg width="116" height="121" viewBox="0 0 116 121" xmlns="http://www.w3.org/2000/svg"><path d="M57.071 113.714c0-.714-.357-1.071-1.071-1.071-2.634 0-4.9-.949-6.797-2.846-1.897-1.897-2.846-4.163-2.846-6.797 0-.714-.357-1.071-1.071-1.071-.715 0-1.072.357-1.072 1.071 0 3.259 1.15 6.038 3.449 8.337 2.3 2.3 5.078 3.449 8.337 3.449.714 0 1.071-.357 1.071-1.072zM12.473 94.43h87.054C87.652 81.036 81.714 62.464 81.714 38.714c0-2.277-.535-4.62-1.607-7.031-1.071-2.41-2.611-4.71-4.62-6.897-2.01-2.188-4.721-3.985-8.137-5.39-3.415-1.407-7.198-2.11-11.35-2.11-4.152 0-7.935.703-11.35 2.11-3.416 1.405-6.128 3.202-8.137 5.39-2.009 2.187-3.549 4.486-4.62 6.897-1.072 2.41-1.607 4.754-1.607 7.031 0 23.75-5.938 42.322-17.813 55.715zm99.241 0c0 2.321-.848 4.33-2.544 6.026-1.697 1.697-3.706 2.545-6.027 2.545h-30c0 4.732-1.674 8.772-5.022 12.12-3.349 3.349-7.389 5.023-12.121 5.023s-8.772-1.674-12.12-5.022c-3.349-3.349-5.023-7.389-5.023-12.121h-30c-2.321 0-4.33-.848-6.027-2.545C1.134 98.76.286 96.75.286 94.43a58.82 58.82 0 0 0 6.093-5.893c1.83-2.054 3.728-4.721 5.692-8.003 1.965-3.28 3.628-6.819 4.99-10.613 1.36-3.795 2.477-8.393 3.347-13.795.871-5.402 1.306-11.205 1.306-17.41 0-6.786 2.612-13.092 7.835-18.918 5.223-5.826 12.076-9.364 20.558-10.614a6.67 6.67 0 0 1-.536-2.612c0-1.785.625-3.303 1.875-4.553S54.214.143 56 .143c1.786 0 3.304.625 4.554 1.875 1.25 1.25 1.875 2.768 1.875 4.553a6.67 6.67 0 0 1-.536 2.612c8.482 1.25 15.335 4.788 20.558 10.614 5.223 5.826 7.835 12.132 7.835 18.917 0 6.206.435 12.01 1.306 17.411.87 5.402 1.986 10 3.348 13.795 1.361 3.794 3.024 7.332 4.989 10.613 1.964 3.282 3.861 5.95 5.692 8.003a58.82 58.82 0 0 0 6.093 5.893z" fill-rule="evenodd"/></svg>
+<svg viewBox="0 0 116 121" xmlns="http://www.w3.org/2000/svg"><path d="M57.071 113.714c0-.714-.357-1.071-1.071-1.071-2.634 0-4.9-.949-6.797-2.846-1.897-1.897-2.846-4.163-2.846-6.797 0-.714-.357-1.071-1.071-1.071-.715 0-1.072.357-1.072 1.071 0 3.259 1.15 6.038 3.449 8.337 2.3 2.3 5.078 3.449 8.337 3.449.714 0 1.071-.357 1.071-1.072zM12.473 94.43h87.054C87.652 81.036 81.714 62.464 81.714 38.714c0-2.277-.535-4.62-1.607-7.031-1.071-2.41-2.611-4.71-4.62-6.897-2.01-2.188-4.721-3.985-8.137-5.39-3.415-1.407-7.198-2.11-11.35-2.11-4.152 0-7.935.703-11.35 2.11-3.416 1.405-6.128 3.202-8.137 5.39-2.009 2.187-3.549 4.486-4.62 6.897-1.072 2.41-1.607 4.754-1.607 7.031 0 23.75-5.938 42.322-17.813 55.715zm99.241 0c0 2.321-.848 4.33-2.544 6.026-1.697 1.697-3.706 2.545-6.027 2.545h-30c0 4.732-1.674 8.772-5.022 12.12-3.349 3.349-7.389 5.023-12.121 5.023s-8.772-1.674-12.12-5.022c-3.349-3.349-5.023-7.389-5.023-12.121h-30c-2.321 0-4.33-.848-6.027-2.545C1.134 98.76.286 96.75.286 94.43a58.82 58.82 0 0 0 6.093-5.893c1.83-2.054 3.728-4.721 5.692-8.003 1.965-3.28 3.628-6.819 4.99-10.613 1.36-3.795 2.477-8.393 3.347-13.795.871-5.402 1.306-11.205 1.306-17.41 0-6.786 2.612-13.092 7.835-18.918 5.223-5.826 12.076-9.364 20.558-10.614a6.67 6.67 0 0 1-.536-2.612c0-1.785.625-3.303 1.875-4.553S54.214.143 56 .143c1.786 0 3.304.625 4.554 1.875 1.25 1.25 1.875 2.768 1.875 4.553a6.67 6.67 0 0 1-.536 2.612c8.482 1.25 15.335 4.788 20.558 10.614 5.223 5.826 7.835 12.132 7.835 18.917 0 6.206.435 12.01 1.306 17.411.87 5.402 1.986 10 3.348 13.795 1.361 3.794 3.024 7.332 4.989 10.613 1.964 3.282 3.861 5.95 5.692 8.003a58.82 58.82 0 0 0 6.093 5.893z" fill-rule="evenodd"/></svg>

data/app/assets/images/thredded/moderation.svg

@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M12 6c0-.55-.45-1-1-1H5.82l.66-3.18.02-.23c0-.31-.13-.59-.33-.8L5.38 0 .44 4.94C.17 5.21 0 5.59 0 6v6.5c0 .83.67 1.5 1.5 1.5h6.75c.62 0 1.15-.38 1.38-.91l2.26-5.29c.07-.17.11-.36.11-.55V6zm10.5 4h-6.75c-.62 0-1.15.38-1.38.91l-2.26 5.29c-.07.17-.11.36-.11.55V18c0 .55.45 1 1 1h5.18l-.66 3.18-.02.24c0 .31.13.59.33.8l.79.78 4.94-4.94c.27-.27.44-.65.44-1.06v-6.5c0-.83-.67-1.5-1.5-1.5z"/>
-    <path d="M0 0h24v24H0z" fill="none"/>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M12 6c0-.55-.45-1-1-1H5.82l.66-3.18.02-.23c0-.31-.13-.59-.33-.8L5.38 0 .44 4.94C.17 5.21 0 5.59 0 6v6.5c0 .83.67 1.5 1.5 1.5h6.75c.62 0 1.15-.38 1.38-.91l2.26-5.29c.07-.17.11-.36.11-.55V6zm10.5 4h-6.75c-.62 0-1.15.38-1.38.91l-2.26 5.29c-.07.17-.11.36-.11.55V18c0 .55.45 1 1 1h5.18l-.66 3.18-.02.24c0 .31.13.59.33.8l.79.78 4.94-4.94c.27-.27.44-.65.44-1.06v-6.5c0-.83-.67-1.5-1.5-1.5z"/><path d="M0 0h24v24H0z" fill="none"/></svg>

data/app/assets/images/thredded/private-messages.svg

@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H4V8l8 5 8-5v10zm-8-7L4 6h16l-8 5z"/>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H4V8l8 5 8-5v10zm-8-7L4 6h16l-8 5z"/></svg>

data/app/assets/images/thredded/settings.svg

@@ -1,4 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"/>
-</svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65A.488.488 0 0 0 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"/></svg>

data/app/assets/images/thredded/unfollow.svg

@@ -1 +1 @@
-<svg width="138" height="121" viewBox="0 0 138 121" xmlns="http://www.w3.org/2000/svg"><path d="M69.643 113.714c0-.714-.357-1.071-1.072-1.071-2.634 0-4.9-.949-6.796-2.846-1.898-1.897-2.846-4.163-2.846-6.797 0-.714-.358-1.071-1.072-1.071-.714 0-1.071.357-1.071 1.071 0 3.259 1.15 6.038 3.448 8.337 2.3 2.3 5.078 3.449 8.337 3.449.715 0 1.072-.357 1.072-1.072zm-35.96-31.808l58.728-50.893c-1.875-3.928-4.833-7.198-8.873-9.81-4.04-2.611-9.029-3.917-14.967-3.917-4.151 0-7.935.703-11.35 2.11-3.415 1.405-6.127 3.202-8.136 5.39-2.01 2.187-3.55 4.486-4.62 6.897-1.072 2.41-1.608 4.754-1.608 7.031 0 17.143-3.058 31.54-9.174 43.192zm90.603 12.523c0 2.321-.848 4.33-2.545 6.026-1.696 1.697-3.705 2.545-6.027 2.545h-30c0 4.732-1.674 8.772-5.022 12.12-3.348 3.349-7.388 5.023-12.12 5.023-4.733 0-8.762-1.663-12.088-4.989-3.326-3.326-5.01-7.355-5.055-12.087l9.977-8.638h50.692c-7.41-8.349-12.477-18.594-15.2-30.737l7.432-6.496c2.724 15.893 9.375 28.304 19.956 37.233zm5.759-93.215l5.625 6.429c.357.446.524.97.502 1.574a2.052 2.052 0 0 1-.703 1.506L10.112 119.34c-.447.357-.971.514-1.574.469-.603-.045-1.083-.29-1.44-.737l-5.625-6.428c-.357-.447-.524-.971-.502-1.574.022-.602.257-1.082.703-1.44L14.13 98.85c-.848-1.43-1.272-2.903-1.272-4.42a58.82 58.82 0 0 0 6.094-5.893c1.83-2.054 3.728-4.721 5.692-8.003 1.964-3.28 3.627-6.819 4.989-10.613 1.361-3.795 2.477-8.393 3.348-13.795.87-5.402 1.306-11.205 1.306-17.41 0-6.786 2.611-13.092 7.835-18.918 5.223-5.826 12.075-9.364 20.558-10.614a6.67 6.67 0 0 1-.536-2.612c0-1.785.625-3.303 1.875-4.553S66.786.143 68.57.143c1.786 0 3.304.625 4.554 1.875C74.375 3.268 75 4.786 75 6.57a6.67 6.67 0 0 1-.536 2.612c5.536.804 10.424 2.645 14.665 5.525 4.242 2.88 7.545 6.395 9.911 10.546L127.031.946c.447-.357.971-.513 1.574-.468.603.044 1.082.29 1.44.736z" fill-rule="evenodd"/></svg>
+<svg viewBox="0 0 138 121" xmlns="http://www.w3.org/2000/svg"><path d="M69.643 113.714c0-.714-.357-1.071-1.072-1.071-2.634 0-4.9-.949-6.796-2.846-1.898-1.897-2.846-4.163-2.846-6.797 0-.714-.358-1.071-1.072-1.071-.714 0-1.071.357-1.071 1.071 0 3.259 1.15 6.038 3.448 8.337 2.3 2.3 5.078 3.449 8.337 3.449.715 0 1.072-.357 1.072-1.072zm-35.96-31.808l58.728-50.893c-1.875-3.928-4.833-7.198-8.873-9.81-4.04-2.611-9.029-3.917-14.967-3.917-4.151 0-7.935.703-11.35 2.11-3.415 1.405-6.127 3.202-8.136 5.39-2.01 2.187-3.55 4.486-4.62 6.897-1.072 2.41-1.608 4.754-1.608 7.031 0 17.143-3.058 31.54-9.174 43.192zm90.603 12.523c0 2.321-.848 4.33-2.545 6.026-1.696 1.697-3.705 2.545-6.027 2.545h-30c0 4.732-1.674 8.772-5.022 12.12-3.348 3.349-7.388 5.023-12.12 5.023-4.733 0-8.762-1.663-12.088-4.989-3.326-3.326-5.01-7.355-5.055-12.087l9.977-8.638h50.692c-7.41-8.349-12.477-18.594-15.2-30.737l7.432-6.496c2.724 15.893 9.375 28.304 19.956 37.233zm5.759-93.215l5.625 6.429c.357.446.524.97.502 1.574a2.052 2.052 0 0 1-.703 1.506L10.112 119.34c-.447.357-.971.514-1.574.469-.603-.045-1.083-.29-1.44-.737l-5.625-6.428c-.357-.447-.524-.971-.502-1.574.022-.602.257-1.082.703-1.44L14.13 98.85c-.848-1.43-1.272-2.903-1.272-4.42a58.82 58.82 0 0 0 6.094-5.893c1.83-2.054 3.728-4.721 5.692-8.003 1.964-3.28 3.627-6.819 4.989-10.613 1.361-3.795 2.477-8.393 3.348-13.795.87-5.402 1.306-11.205 1.306-17.41 0-6.786 2.611-13.092 7.835-18.918 5.223-5.826 12.075-9.364 20.558-10.614a6.67 6.67 0 0 1-.536-2.612c0-1.785.625-3.303 1.875-4.553S66.786.143 68.57.143c1.786 0 3.304.625 4.554 1.875C74.375 3.268 75 4.786 75 6.57a6.67 6.67 0 0 1-.536 2.612c5.536.804 10.424 2.645 14.665 5.525 4.242 2.88 7.545 6.395 9.911 10.546L127.031.946c.447-.357.971-.513 1.574-.468.603.044 1.082.29 1.44.736z" fill-rule="evenodd"/></svg>

data/app/assets/javascripts/thredded/components/time_stamps.es6

@@ -1,5 +1,5 @@
 (($) => {
-  const COMPONENT_SELECTOR = '#thredded--container abbr.timeago';
+  const COMPONENT_SELECTOR = '#thredded--container [data-time-ago]';
 
   window.Thredded.onPageLoad(() => {
     const allowFutureWas = jQuery.timeago.settings.allowFuture;

data/app/assets/javascripts/thredded/components/user_preferences_form.es6

@@ -1,63 +1,40 @@
 (($) => {
   const COMPONENT_SELECTOR = '[data-thredded-user-preferences-form]';
-  const FOLLOW_TOPICS_ON_MENTION_SELECTOR = ':checkbox[name="user_preferences_form[follow_topics_on_mention]"]';
-  const MESSAGEBOARD_FOLLOW_TOPICS_ON_MENTION_SELECTOR = '[name="user_preferences_form[messageboard_follow_topics_on_mention]"]';
-  const FOLLOWED_TOPIC_EMAILS_SELECTOR = ':checkbox[name="user_preferences_form[followed_topic_emails]"]';
-  const MESSAGEBOARD_FOLLOWED_TOPIC_EMAILS_SELECTOR = ':checkbox[name="user_preferences_form[messageboard_followed_topic_emails]"]';
-
-  class UserPreferencesForm {
-    constructor(form) {
-      this.$form = $(form);
-      this.$followTopicsOnMention = this.$form.find(FOLLOW_TOPICS_ON_MENTION_SELECTOR);
-      this.$messageboardFollowTopicsOnMention = this.$form.find(MESSAGEBOARD_FOLLOW_TOPICS_ON_MENTION_SELECTOR);
-      this.$followedTopicEmails = this.$form.find(FOLLOWED_TOPIC_EMAILS_SELECTOR);
-      this.$messageboardFollowedTopicEmails = this.$form.find(MESSAGEBOARD_FOLLOWED_TOPIC_EMAILS_SELECTOR);
-
-      this.messageboardFollowTopicsOnMentionCheckedWas = this.$messageboardFollowTopicsOnMention.prop('checked');
-      this.$messageboardFollowTopicsOnMention.on('change', () => {
-        this.rememberMessageboardAutofollowTopicsChecked();
+  const BOUND_MESSAGEBOARD_NAME = 'data-thredded-bound-messageboard-pref';
+
+  class MessageboardPreferenceBinding {
+    constructor($form, genericCheckboxName, messageboardCheckboxName) {
+      this.$genericCheckbox = $form.find(`:checkbox[name="${genericCheckboxName}"]`);
+      this.$messageboardCheckbox = $form.find(`:checkbox[name="${messageboardCheckboxName}"]`);
+      this.$messageboardCheckbox.on('change', () => {
+        this.rememberMessageboardChecked();
       });
-      this.rememberMessageboardAutofollowTopicsChecked();
-
-      this.$followTopicsOnMention.on('change', () => {
-        this.updateMessageboardAutofollowTopics();
-      });
-      this.updateMessageboardAutofollowTopics();
-
-      this.messageboardFollowedTopicEmailsCheckedWas = this.$messageboardFollowedTopicEmails.prop('checked');
-      this.$messageboardFollowedTopicEmails.on('change', () => {
-        this.rememberMessageboardFollowedTopicEmailsChecked();
+      this.rememberMessageboardChecked();
+      this.$genericCheckbox.on('change', () => {
+        this.updateMessageboardCheckbox();
       });
-      this.rememberMessageboardFollowedTopicEmailsChecked();
-
-      this.$followedTopicEmails.on('change', () => {
-        this.updateMessageboardFollowedTopicEmails();
-      });
-      this.updateMessageboardFollowedTopicEmails();
+      this.updateMessageboardCheckbox();
     }
 
-    rememberMessageboardAutofollowTopicsChecked() {
-      this.messageboardFollowTopicsOnMentionCheckedWas =
-        this.$messageboardFollowTopicsOnMention.filter(':checkbox').prop('checked');
+    rememberMessageboardChecked() {
+      this.messageboardCheckedWas = this.$messageboardCheckbox.filter(':checkbox').prop('checked');
     }
 
-    updateMessageboardAutofollowTopics() {
-      const enabled = this.$followTopicsOnMention.prop('checked');
-      this.$messageboardFollowTopicsOnMention
+    updateMessageboardCheckbox() {
+      const enabled = this.$genericCheckbox.prop('checked');
+      this.$messageboardCheckbox
         .prop('disabled', !enabled)
-        .filter(':checkbox').prop('checked', enabled ? this.messageboardFollowTopicsOnMentionCheckedWas : false);
-    }
-
-    rememberMessageboardFollowedTopicEmailsChecked() {
-      this.messageboardFollowedTopicEmailsCheckedWas =
-        this.$messageboardFollowedTopicEmails.filter(':checkbox').prop('checked');
+        .filter(':checkbox').prop('checked', enabled ? this.messageboardCheckedWas : false);
     }
 
-    updateMessageboardFollowedTopicEmails() {
-      const enabled = this.$followedTopicEmails.prop('checked');
-      this.$messageboardFollowedTopicEmails
-        .prop('disabled', !enabled)
-        .filter(':checkbox').prop('checked', enabled ? this.messageboardFollowedTopicEmailsCheckedWas : false);
+  }
+  class UserPreferencesForm {
+    constructor(form) {
+      const $form = $(form);
+      $form.find(`input[${BOUND_MESSAGEBOARD_NAME}]`).each((index, element) => {
+        const $elem = $(element);
+        new MessageboardPreferenceBinding($form, $elem.attr('name'), $elem.attr(BOUND_MESSAGEBOARD_NAME));
+      })
     }
   }
 

data/app/assets/javascripts/thredded/dependencies.js

@@ -1,8 +1,9 @@
 //= require thredded/dependencies/jquery
+// Require jquery.timeago instead of rails-timeago so that we can control the initialization.
+//= require jquery.timeago
 //= require jquery_ujs
 //= require jquery.autosize
 //= require jquery.textcomplete
-//= require rails-timeago
 //= require select2
 
 // We are not currently using any features that require the Babel polyfill

data/app/assets/stylesheets/thredded/base/_grid.scss

@@ -1,17 +1,17 @@
 @mixin thredded-media-mobile {
-  @media screen and (max-width: map-get($thredded-grid-breakpoint-max-widths, mobile)) {
+  @media (max-width: map-get($thredded-grid-breakpoint-max-widths, mobile)) {
     @content;
   }
 }
 
 @mixin thredded-media-tablet-and-down {
-  @media screen and (max-width: map-get($thredded-grid-breakpoint-max-widths, tablet)) {
+  @media (max-width: map-get($thredded-grid-breakpoint-max-widths, tablet)) {
     @content;
   }
 }
 
 @mixin thredded-media-tablet-and-up {
-  @media screen and (min-width: map-get($thredded-grid-breakpoint-max-widths, mobile) + 0.00001rem) {
+  @media (min-width: map-get($thredded-grid-breakpoint-max-widths, mobile) + 0.00001rem) {
     @content;
   }
 }
@@ -25,7 +25,7 @@
 }
 
 @mixin thredded-media-desktop-and-up {
-  @media screen and (min-width: map-get($thredded-grid-breakpoint-max-widths, tablet) + 0.00001rem) {
+  @media (min-width: map-get($thredded-grid-breakpoint-max-widths, tablet) + 0.00001rem) {
     @content;
   }
 }

data/app/assets/stylesheets/thredded/base/_typography.scss

@@ -48,3 +48,21 @@
     margin-bottom: 0;
   }
 }
+
+%thredded--embed-16-by-9 {
+  display: block;
+  position: relative;
+  // 16 by 9
+  padding-bottom: 56.25%;
+  // Account for the video player chrome
+  padding-top: 35px;
+  height: 0;
+  overflow: hidden;
+  > iframe {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
+}

data/app/assets/stylesheets/thredded/components/_base.scss

@@ -19,3 +19,7 @@
 .thredded--table {
   @extend %thredded--table;
 }
+
+.thredded--embed-16-by-9 {
+  @extend %thredded--embed-16-by-9;
+}

data/app/assets/stylesheets/thredded/components/_currently-online.scss

@@ -45,4 +45,8 @@
     height: auto;
     visibility: visible;
   }
+
+  @media print {
+    display: none;
+  }
 }

data/app/assets/stylesheets/thredded/components/_form-list.scss

@@ -13,6 +13,11 @@
   label {
     transition: all 0.15s ease-out 0s;
   }
+
+  label + label {
+    display: inline-block;
+    font-weight: normal;
+  }
 }
 
 .thredded--form-list--admin-options {

data/app/assets/stylesheets/thredded/components/_messageboard.scss

@@ -52,4 +52,7 @@
 
 .thredded--messageboards--actions {
   @extend %thredded--buttons-list;
+  @media print {
+    display: none;
+  }
 }

data/app/assets/stylesheets/thredded/components/_post-form.scss

@@ -6,10 +6,7 @@
   &--wrapper {
     border-top: $thredded-base-border;
     margin-top: $thredded-base-spacing;
-    padding-top: $thredded-large-spacing;
-    @include thredded-media-mobile {
-      padding-top: $thredded-base-spacing;
-    }
+    padding-top: $thredded-base-spacing;
   }
 
   &--title {
@@ -22,3 +19,9 @@
     margin-top: $thredded-small-spacing;
   }
 }
+
+.thredded--post-form--wrapper {
+  @media print {
+    display: none;
+  }
+}

data/app/assets/stylesheets/thredded/components/_post.scss

@@ -63,6 +63,9 @@
 .thredded--post--delete {
   font-size: $thredded-font-size-small;
   @extend %thredded--link;
+  @media print {
+    display: none;
+  }
 }
 
 .thredded--post--delete {

data/app/assets/stylesheets/thredded/components/_topic-delete.scss

@@ -2,4 +2,7 @@
   border-top: $thredded-base-border;
   margin-top: $thredded-base-spacing;
   padding-top: $thredded-large-spacing;
+  @media print {
+    display: none;
+  }
 }

data/app/assets/stylesheets/thredded/components/_topic-header.scss

@@ -18,6 +18,20 @@
   }
 }
 
+.thredded--topic-header--participants {
+  color: $thredded-secondary-text-color;
+
+  &--participant {
+    > a {
+      @extend %thredded--link;
+      font-size: $thredded-font-size-small;
+    }
+    &::before {
+      content: '\2022\00A0'; // • and a non-breaking space
+    }
+  }
+}
+
 .thredded--topic-header--started-by {
   font-size: $thredded-font-size-small;
   color: $thredded-secondary-text-color;
@@ -31,6 +45,9 @@
   @extend %thredded--link;
   font-size: $thredded-font-size-small;
   margin-left: 0.4rem;
+  @media print {
+    display: none;
+  }
 }
 
 .thredded--topic-header--follow-info {
@@ -72,6 +89,9 @@
       cursor: pointer;
       @extend %thredded--link;
     }
+    @media print {
+      display: none;
+    }
   }
 }
 

data/app/assets/stylesheets/thredded/components/_topics.scss

@@ -60,7 +60,6 @@
     color: lighten($thredded-text-color, 20%);
 
     &:hover {
-
       color: $thredded-action-color;
     }
   }
@@ -82,6 +81,12 @@
   }
 }
 
+.thredded--topics--participants--participant {
+  & + &::before {
+    content: '\2022\00A0'; // • and a non-breaking space
+  }
+}
+
 .thredded--topics--started-by {
   display: none;
 
@@ -154,3 +159,10 @@
     @extend %thredded--not-following-icon;
   }
 }
+
+.thredded--new-topic-form,
+.thredded--new-private-topic-form {
+  @media print {
+    display: none;
+  }
+}