Merge remote-tracking branch 'origin/develop' into experiment-still-emoji

* origin/develop:
  fix warnings
  oops
  backport vue3 changes related to emoji-input
  migrate to v-slot

src/components/account_actions/account_actions.vue

@@ -6,10 +6,7 @@
       :bound-to="{ x: 'container' }"
       remove-padding
     >
-      <div
+      <template v-slot:content>
-        slot="content"
-        class="account-tools-popover"
-      >
         <div class="dropdown-menu">
           <template v-if="relationship.following">
             <button
@@ -59,16 +56,15 @@
             {{ $t('user_card.message') }}
           </button>
         </div>
-      </div>
+      </template>
-      <div
+      <template v-slot:trigger>
-        slot="trigger"
+        <button class="button-unstyled ellipsis-button">
-        class="ellipsis-button"
-      >
           <FAIcon
             class="icon"
             icon="ellipsis-v"
           />
-      </div>
+        </button>
+      </template>
     </Popover>
   </div>
 </template>
@@ -83,7 +79,6 @@
   }
 
   .ellipsis-button {
-    cursor: pointer;
     width: 2.5em;
     margin: -0.5em 0;
     padding: 0.5em 0;

src/components/chat_list/chat_list.vue

@@ -23,10 +23,7 @@
         class="timeline"
       >
         <List :items="sortedChatList">
-          <template
+          <template v-slot:item="{item}">
-            slot="item"
-            slot-scope="{item}"
-          >
             <ChatListItem
               :key="item.id"
               :compact="false"

src/components/chat_message/chat_message.vue

@@ -50,7 +50,7 @@
                 @show="menuOpened = true"
                 @close="menuOpened = false"
               >
-                <div slot="content">
+                <template v-slot:content>
                   <div class="dropdown-menu">
                     <button
                       class="button-default dropdown-item dropdown-item-icon"
@@ -59,26 +59,28 @@
                       <FAIcon icon="times" /> {{ $t("chats.delete") }}
                     </button>
                   </div>
-                </div>
+                </template>
+                <template v-slot:trigger>
                   <button
-                  slot="trigger"
                     class="button-default menu-icon"
                     :title="$t('chats.more')"
                   >
                     <FAIcon icon="ellipsis-h" />
                   </button>
+                </template>
               </Popover>
             </div>
             <StatusContent
               :status="messageForStatusContent"
               :full-content="true"
             >
+              <template v-slot:footer>
                 <span
-                slot="footer"
                   class="created-at"
                 >
                   {{ createdAt }}
                 </span>
+              </template>
             </StatusContent>
           </div>
         </div>

src/components/domain_mute_card/domain_mute_card.vue

@@ -9,7 +9,7 @@
       class="btn button-default"
     >
       {{ $t('domain_mute_card.unmute') }}
-      <template slot="progress">
+      <template v-slot:progress>
         {{ $t('domain_mute_card.unmute_progress') }}
       </template>
     </ProgressButton>
@@ -19,7 +19,7 @@
       class="btn button-default"
     >
       {{ $t('domain_mute_card.mute') }}
-      <template slot="progress">
+      <template v-slot:progress>
         {{ $t('domain_mute_card.mute_progress') }}
       </template>
     </ProgressButton>

src/components/emoji_input/emoji_input.js

@@ -57,6 +57,7 @@ const EmojiInput = {
       required: true,
       type: Function
     },
+    // TODO VUE3: change to modelValue, change 'input' event to 'input'
     value: {
       /**
        * Used for v-model
@@ -143,32 +144,31 @@ const EmojiInput = {
     }
   },
   mounted () {
-    const slots = this.$slots.default
+    const { root } = this.$refs
-    if (!slots || slots.length === 0) return
+    const input = root.querySelector('.emoji-input > input') || root.querySelector('.emoji-input > textarea')
-    const input = slots.find(slot => ['input', 'textarea'].includes(slot.tag))
     if (!input) return
     this.input = input
     this.resize()
-    input.elm.addEventListener('blur', this.onBlur)
+    input.addEventListener('blur', this.onBlur)
-    input.elm.addEventListener('focus', this.onFocus)
+    input.addEventListener('focus', this.onFocus)
-    input.elm.addEventListener('paste', this.onPaste)
+    input.addEventListener('paste', this.onPaste)
-    input.elm.addEventListener('keyup', this.onKeyUp)
+    input.addEventListener('keyup', this.onKeyUp)
-    input.elm.addEventListener('keydown', this.onKeyDown)
+    input.addEventListener('keydown', this.onKeyDown)
-    input.elm.addEventListener('click', this.onClickInput)
+    input.addEventListener('click', this.onClickInput)
-    input.elm.addEventListener('transitionend', this.onTransition)
+    input.addEventListener('transitionend', this.onTransition)
-    input.elm.addEventListener('input', this.onInput)
+    input.addEventListener('input', this.onInput)
   },
   unmounted () {
     const { input } = this
     if (input) {
-      input.elm.removeEventListener('blur', this.onBlur)
+      input.removeEventListener('blur', this.onBlur)
-      input.elm.removeEventListener('focus', this.onFocus)
+      input.removeEventListener('focus', this.onFocus)
-      input.elm.removeEventListener('paste', this.onPaste)
+      input.removeEventListener('paste', this.onPaste)
-      input.elm.removeEventListener('keyup', this.onKeyUp)
+      input.removeEventListener('keyup', this.onKeyUp)
-      input.elm.removeEventListener('keydown', this.onKeyDown)
+      input.removeEventListener('keydown', this.onKeyDown)
-      input.elm.removeEventListener('click', this.onClickInput)
+      input.removeEventListener('click', this.onClickInput)
-      input.elm.removeEventListener('transitionend', this.onTransition)
+      input.removeEventListener('transitionend', this.onTransition)
-      input.elm.removeEventListener('input', this.onInput)
+      input.removeEventListener('input', this.onInput)
     }
   },
   watch: {
@@ -216,7 +216,7 @@ const EmojiInput = {
       }, 0)
     },
     togglePicker () {
-      this.input.elm.focus()
+      this.input.focus()
       this.showPicker = !this.showPicker
       if (this.showPicker) {
         this.scrollIntoView()
@@ -262,13 +262,13 @@ const EmojiInput = {
       this.$emit('input', newValue)
       const position = this.caret + (insertion + spaceAfter + spaceBefore).length
       if (!keepOpen) {
-        this.input.elm.focus()
+        this.input.focus()
       }
 
       this.$nextTick(function () {
         // Re-focus inputbox after clicking suggestion
         // Set selection right after the replacement instead of the very end
-        this.input.elm.setSelectionRange(position, position)
+        this.input.setSelectionRange(position, position)
         this.caret = position
       })
     },
@@ -285,9 +285,9 @@ const EmojiInput = {
 
         this.$nextTick(function () {
           // Re-focus inputbox after clicking suggestion
-          this.input.elm.focus()
+          this.input.focus()
           // Set selection right after the replacement instead of the very end
-          this.input.elm.setSelectionRange(position, position)
+          this.input.setSelectionRange(position, position)
           this.caret = position
         })
         e.preventDefault()
@@ -349,7 +349,7 @@ const EmojiInput = {
       }
 
       this.$nextTick(() => {
-        const { offsetHeight } = this.input.elm
+        const { offsetHeight } = this.input
         const { picker } = this.$refs
         const pickerBottom = picker.$el.getBoundingClientRect().bottom
         if (pickerBottom > window.innerHeight) {
@@ -414,8 +414,8 @@ const EmojiInput = {
 
         // Scroll the input element to the position of the cursor
         this.$nextTick(() => {
-          this.input.elm.blur()
+          this.input.blur()
-          this.input.elm.focus()
+          this.input.focus()
         })
       }
       // Disable suggestions hotkeys if suggestions are hidden
@@ -444,7 +444,7 @@ const EmojiInput = {
       // de-focuses the element (i.e. default browser behavior)
       if (key === 'Escape') {
         if (!this.temporarilyHideSuggestions) {
-          this.input.elm.focus()
+          this.input.focus()
         }
       }
 
@@ -480,7 +480,7 @@ const EmojiInput = {
       if (!panel) return
       const picker = this.$refs.picker.$el
       const panelBody = this.$refs['panel-body']
-      const { offsetHeight, offsetTop } = this.input.elm
+      const { offsetHeight, offsetTop } = this.input
       const offsetBottom = offsetTop + offsetHeight
 
       this.setPlacement(panelBody, panel, offsetBottom)
@@ -494,7 +494,7 @@ const EmojiInput = {
 
       if (this.placement === 'top' || (this.placement === 'auto' && this.overflowsBottom(container))) {
         target.style.top = 'auto'
-        target.style.bottom = this.input.elm.offsetHeight + 'px'
+        target.style.bottom = this.input.offsetHeight + 'px'
       }
     },
     overflowsBottom (el) {

src/components/emoji_input/emoji_input.vue

@@ -3,6 +3,7 @@
     v-click-outside="onClickOutside"
     class="emoji-input"
     :class="{ 'with-picker': !hideEmojiButton }"
+    ref='root'
   >
     <slot />
     <template v-if="enableEmojiPicker">

src/components/extra_buttons/extra_buttons.vue

@@ -7,10 +7,7 @@
     :bound-to="{ x: 'container' }"
     remove-padding
   >
-    <div
+    <template v-slot:content="{close}">
-      slot="content"
-      slot-scope="{close}"
-    >
       <div class="dropdown-menu">
         <button
           v-if="canMute && !status.thread_muted"
@@ -120,16 +117,15 @@
           /><span>{{ $t("user_card.report") }}</span>
         </button>
       </div>
-    </div>
+    </template>
-    <span
+    <template v-slot:trigger>
-      slot="trigger"
+      <button class="button-unstyled popover-trigger">
-      class="popover-trigger"
-    >
         <FAIcon
           class="fa-scale-110 fa-old-padding"
           icon="ellipsis-h"
         />
-    </span>
+      </button>
+    </template>
   </Popover>
 </template>
 

src/components/moderation_tools/moderation_tools.vue

@@ -8,7 +8,7 @@
       @show="setToggled(true)"
       @close="setToggled(false)"
     >
-      <div slot="content">
+      <template v-slot:content>
         <div class="dropdown-menu">
           <span v-if="user.is_local">
             <button
@@ -121,26 +121,27 @@
             </button>
           </span>
         </div>
-      </div>
+      </template>
+      <template v-slot:trigger>
         <button
-        slot="trigger"
           class="btn button-default btn-block moderation-tools-button"
           :class="{ toggled }"
         >
           {{ $t('user_card.admin_menu.moderation') }}
           <FAIcon icon="chevron-down" />
         </button>
+      </template>
     </Popover>
     <portal to="modal">
       <DialogModal
         v-if="showDeleteUserDialog"
         :on-cancel="deleteUserDialog.bind(this, false)"
       >
-        <template slot="header">
+        <template v-slot:header>
           {{ $t('user_card.admin_menu.delete_user') }}
         </template>
         <p>{{ $t('user_card.admin_menu.delete_user_confirmation') }}</p>
-        <template slot="footer">
+        <template v-slot:footer>
           <button
             class="btn button-default"
             @click="deleteUserDialog(false)"

src/components/notification/notification.scss

@@ -2,6 +2,12 @@
 
 // TODO Copypaste from Status, should unify it somehow
 .Notification {
+  &:hover {
+    --_still-image-img-visibility: visible;
+    --_still-image-canvas-visibility: hidden;
+    --_still-image-label-visibility: hidden;
+  }
+
   &.-muted {
     padding: 0.25em 0.6em;
     height: 1.2em;

src/components/notifications/notification_filters.vue

@@ -5,9 +5,7 @@
     placement="bottom"
     :bound-to="{ x: 'container' }"
   >
-    <template
+    <template v-slot:content>
-      v-slot:content
-    >
       <div class="dropdown-menu">
         <button
           class="button-default dropdown-item"
@@ -66,7 +64,9 @@
       </div>
     </template>
     <template v-slot:trigger>
+      <button class="button-unstyled">
         <FAIcon icon="filter" />
+      </button>
     </template>
   </Popover>
 </template>

src/components/popover/popover.js

@@ -54,7 +54,7 @@ const Popover = {
       }
 
       // Popover will be anchored around this element, trigger ref is the container, so
-      // its children are what are inside the slot. Expect only one slot="trigger".
+      // its children are what are inside the slot. Expect only one v-slot:trigger.
       const anchorEl = (this.$refs.trigger && this.$refs.trigger.children[0]) || this.$el
       // SVGs don't have offsetWidth/Height, use fallback
       const anchorWidth = anchorEl.offsetWidth || anchorEl.clientWidth

src/components/react_button/react_button.vue

@@ -8,10 +8,7 @@
     remove-padding
     @show="focusInput"
   >
-    <div
+    <template v-slot:content="{close}">
-      slot="content"
-      slot-scope="{close}"
-    >
       <div class="reaction-picker-filter">
         <input
           v-model="filterWord"
@@ -41,17 +38,18 @@
         </span>
         <div class="reaction-bottom-fader" />
       </div>
-    </div>
+    </template>
-    <span
+    <template v-slot:trigger>
-      slot="trigger"
+      <button
-      class="popover-trigger"
+        class="button-unstyled popover-trigger"
         :title="$t('tool_tip.add_reaction')"
       >
         <FAIcon
           class="fa-scale-110 fa-old-padding"
           :icon="['far', 'smile-beam']"
         />
-    </span>
+      </button>
+    </template>
   </Popover>
 </template>
 

src/components/selectable_list/selectable_list.vue

@@ -24,10 +24,7 @@
       :items="items"
       :get-key="getKey"
     >
-      <template
+      <template v-slot:item="{item}">
-        slot="item"
-        slot-scope="{item}"
-      >
         <div
           class="selectable-list-item-inner"
           :class="{ 'selectable-list-item-selected-inner': isSelected(item) }"
@@ -44,7 +41,7 @@
           />
         </div>
       </template>
-      <template slot="empty">
+      <template v-slot:empty>
         <slot name="empty" />
       </template>
     </List>

src/components/settings_modal/helpers/modified_indicator.vue

@@ -6,18 +6,18 @@
     <Popover
       trigger="hover"
     >
-      <span slot="trigger">
+      <template v-slot:trigger>
         &nbsp;
         <FAIcon
           icon="wrench"
+          :aria-label="$t('settings.setting_changed')"
         />
-      </span>
+      </template>
-      <div
+      <template v-slot:content>
-        slot="content"
+        <div class="modified-tooltip">
-        class="modified-tooltip"
-      >
           {{ $t('settings.setting_changed') }}
         </div>
+      </template>
     </Popover>
   </span>
 </template>

src/components/settings_modal/settings_modal.vue

@@ -62,8 +62,8 @@
           :bound-to="{ x: 'container' }"
           remove-padding
         >
+          <template v-slot:trigger>
             <button
-            slot="trigger"
               class="btn button-default"
               :title="$t('general.close')"
             >
@@ -72,10 +72,8 @@
                 icon="chevron-down"
               />
             </button>
-          <div
+          </template>
-            slot="content"
+          <template v-slot:content="{close}">
-            slot-scope="{close}"
-          >
             <div class="dropdown-menu">
               <button
                 class="button-default dropdown-item dropdown-item-icon"
@@ -108,7 +106,7 @@
                 /><span>{{ $t("settings.file_export_import.restore_settings") }}</span>
               </button>
             </div>
-          </div>
+          </template>
         </Popover>
       </div>
     </div>

src/components/settings_modal/tabs/mutes_and_blocks_tab.vue

@@ -10,20 +10,18 @@
           :query="queryUserIds"
           :placeholder="$t('settings.search_user_to_block')"
         >
+          <template v-slot="row">
             <BlockCard
-            slot-scope="row"
               :user-id="row.item"
             />
+          </template>
         </Autosuggest>
       </div>
       <BlockList
         :refresh="true"
         :get-key="i => i"
       >
-        <template
+        <template v-slot:header="{selected}">
-          slot="header"
-          slot-scope="{selected}"
-        >
           <div class="bulk-actions">
             <ProgressButton
               v-if="selected.length > 0"
@@ -31,7 +29,7 @@
               :click="() => blockUsers(selected)"
             >
               {{ $t('user_card.block') }}
-              <template slot="progress">
+              <template v-slot:progress>
                 {{ $t('user_card.block_progress') }}
               </template>
             </ProgressButton>
@@ -41,19 +39,16 @@
               :click="() => unblockUsers(selected)"
             >
               {{ $t('user_card.unblock') }}
-              <template slot="progress">
+              <template v-slot:progress>
                 {{ $t('user_card.unblock_progress') }}
               </template>
             </ProgressButton>
           </div>
         </template>
-        <template
+        <template v-slot:item="{item}">
-          slot="item"
-          slot-scope="{item}"
-        >
           <BlockCard :user-id="item" />
         </template>
-        <template slot="empty">
+        <template v-slot:empty>
           {{ $t('settings.no_blocks') }}
         </template>
       </BlockList>
@@ -68,20 +63,18 @@
               :query="queryUserIds"
               :placeholder="$t('settings.search_user_to_mute')"
             >
+              <template v-slot="row">
                 <MuteCard
-                slot-scope="row"
                   :user-id="row.item"
                 />
+              </template>
             </Autosuggest>
           </div>
           <MuteList
             :refresh="true"
             :get-key="i => i"
           >
-            <template
+            <template v-slot:header="{selected}">
-              slot="header"
-              slot-scope="{selected}"
-            >
               <div class="bulk-actions">
                 <ProgressButton
                   v-if="selected.length > 0"
@@ -89,7 +82,7 @@
                   :click="() => muteUsers(selected)"
                 >
                   {{ $t('user_card.mute') }}
-                  <template slot="progress">
+                  <template v-slot:progress>
                     {{ $t('user_card.mute_progress') }}
                   </template>
                 </ProgressButton>
@@ -99,19 +92,16 @@
                   :click="() => unmuteUsers(selected)"
                 >
                   {{ $t('user_card.unmute') }}
-                  <template slot="progress">
+                  <template v-slot:progress>
                     {{ $t('user_card.unmute_progress') }}
                   </template>
                 </ProgressButton>
               </div>
             </template>
-            <template
+            <template v-slot:item="{item}">
-              slot="item"
-              slot-scope="{item}"
-            >
               <MuteCard :user-id="item" />
             </template>
-            <template slot="empty">
+            <template v-slot:empty>
               {{ $t('settings.no_mutes') }}
             </template>
           </MuteList>
@@ -124,20 +114,18 @@
               :query="queryKnownDomains"
               :placeholder="$t('settings.type_domains_to_mute')"
             >
+              <template v-slot="row">
                 <DomainMuteCard
-                slot-scope="row"
                   :domain="row.item"
                 />
+              </template>
             </Autosuggest>
           </div>
           <DomainMuteList
             :refresh="true"
             :get-key="i => i"
           >
-            <template
+            <template v-slot:header="{selected}">
-              slot="header"
-              slot-scope="{selected}"
-            >
               <div class="bulk-actions">
                 <ProgressButton
                   v-if="selected.length > 0"
@@ -145,19 +133,16 @@
                   :click="() => unmuteDomains(selected)"
                 >
                   {{ $t('domain_mute_card.unmute') }}
-                  <template slot="progress">
+                  <template v-slot:progress>
                     {{ $t('domain_mute_card.unmute_progress') }}
                   </template>
                 </ProgressButton>
               </div>
             </template>
-            <template
+            <template v-slot:item="{item}">
-              slot="item"
-              slot-scope="{item}"
-            >
               <DomainMuteCard :domain="item" />
             </template>
-            <template slot="empty">
+            <template v-slot:empty>
               {{ $t('settings.no_mutes') }}
             </template>
           </DomainMuteList>

src/components/status_content/status_content.js

@@ -1,4 +1,6 @@
+import Vue from 'vue'
 import Attachment from '../attachment/attachment.vue'
+import StillImage from '../still-image/still-image.vue'
 import Poll from '../poll/poll.vue'
 import Gallery from '../gallery/gallery.vue'
 import LinkPreview from '../link-preview/link-preview.vue'
@@ -40,10 +42,24 @@ const StatusContent = {
       showingTall: this.fullContent || (this.inConversation && this.focused),
       showingLongSubject: false,
       // not as computed because it sets the initial state which will be changed later
-      expandingSubject: !this.$store.getters.mergedConfig.collapseMessageWithSubject
+      expandingSubject: !this.$store.getters.mergedConfig.collapseMessageWithSubject,
+      stillImages: []
     }
   },
+
+  updated () {
+    this.patchEmoji()
+  },
+  mounted () {
+    this.patchEmoji()
+  },
+  beforeDestroy() {
+    this.stillImages.forEach(vm => vm.$destroy())
+  },
   computed: {
+    stopGifs () {
+      return this.$store.getters.mergedConfig.stopGifs
+    },
     localCollapseSubjectDefault () {
       return this.mergedConfig.collapseMessageWithSubject
     },
@@ -167,6 +183,43 @@ const StatusContent = {
     LinkPreview
   },
   methods: {
+    patchEmoji () {
+      [this.$refs.subject, this.$refs.content].forEach(el => {
+        if (!el) return
+        const imgs = el.querySelectorAll('*:not(.still-image) > img')
+
+        imgs.forEach((img, i) => {
+          // extract relevant info from image
+          // TODO do a better job at "cloning" node and splicing it into a span
+          const { src, title, className } = img
+          // Outer placeholder, thing that will contain stillimage
+          const placeholder = document.createElement('span')
+          // Inner placeholder, this will be REPLACED by stillimage
+          const placeholderInner = document.createElement('span')
+          // Use special classname for emoji, just to be safe
+          placeholder.className = className === 'emoji' ? '__pleromafe_emoji' : 'emoji'
+          // Overall it seems to be easier to use a wrapper and add stuff to it
+          // than to add stuff to component (how??)
+          placeholder.title = title
+          // Insert inner into outer
+          placeholder.appendChild(placeholderInner)
+          // put our placeholder before the image
+          img.parentNode.insertBefore(placeholder, img)
+
+          // Render StillImage into placeholder
+          const opts = {
+            el: placeholder,
+            props: { src }
+          }
+          const vm = new Vue({ el: placeholderInner, render: h => h(StillImage, opts)})
+          this.stillImages.push(vm)
+
+          if (img.className === 'emoji') {
+            img.className = img.className + ' __pleromafe_emoji_orig'
+          }
+        })
+      })
+    },
     linkClicked (event) {
       const target = event.target.closest('.status-content a')
       if (target) {

src/components/status_content/status_content.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- eslint-disable vue/no-v-html -->
-  <div class="StatusContent">
+  <div class="StatusContent" :class="{'-stop-gifs': stopGifs}">
     <slot name="header" />
     <div
       v-if="status.summary_html"
@@ -10,6 +10,7 @@
       <div
         class="media-body summary"
         @click.prevent="linkClicked"
+        ref="subject"
         v-html="status.summary_html"
       />
       <button
@@ -45,6 +46,7 @@
         :class="{ 'single-line': singleLine }"
         class="status-content media-body"
         @click.prevent="linkClicked"
+        ref="content"
         v-html="postBodyHtml"
       />
       <button
@@ -140,6 +142,22 @@ $status-margin: 0.75em;
   flex: 1;
   min-width: 0;
 
+  &:hover {
+    --_still-image-img-visibility: visible;
+    --_still-image-canvas-visibility: hidden;
+    --_still-image-label-visibility: hidden;
+  }
+
+  &.-stop-gifs {
+    .__pleromafe_emoji {
+      display: inline-block;
+    }
+
+    .__pleromafe_emoji_orig {
+      display: none;
+    }
+  }
+
   .status-content-wrapper {
     display: flex;
     flex-direction: column;
@@ -192,11 +210,21 @@ $status-margin: 0.75em;
     object-fit: contain;
 
     &.emoji {
-      width: 32px;
+      width: var(--big-emoji-size, 32px);
-      height: 32px;
+      height: var(--big-emoji-size, 32px);
     }
   }
 
+  .__pleromafe_emoji {
+    display: none; // overriden elsewhere (in the beginning of css file)
+    max-width: 100%;
+    max-height: 400px;
+    vertical-align: middle;
+    object-fit: contain;
+    width: var(--big-emoji-size, 32px);
+    height: var(--big-emoji-size, 32px);
+  }
+
   .summary-wrapper {
     margin-bottom: 0.5em;
     border-style: solid;

src/components/status_popover/status_popover.vue

@@ -5,12 +5,10 @@
     :bound-to="{ x: 'container' }"
     @show="enter"
   >
-    <template slot="trigger">
+    <template v-slot:trigger>
       <slot />
     </template>
-    <div
+    <template v-slot:content>
-      slot="content"
-    >
       <Status
         v-if="status"
         :is-preview="true"
@@ -33,7 +31,7 @@
           size="2x"
         />
       </div>
-    </div>
+    </template>
   </Popover>
 </template>
 

src/components/still-image/still-image.js

@@ -1,3 +1,5 @@
+import Vue from 'vue'
+
 const StillImage = {
   props: [
     'src',
@@ -8,8 +10,9 @@ const StillImage = {
     'alt'
   ],
   data () {
+    console.log('test', this.$store === undefined)
     return {
-      stopGifs: this.$store.getters.mergedConfig.stopGifs
+      stopGifs: this.$store === undefined ? true : this.$store.getters.mergedConfig.stopGifs
     }
   },
   computed: {
@@ -36,4 +39,4 @@ const StillImage = {
   }
 }
 
-export default StillImage
+export default Vue.component('still-image', StillImage)

src/components/timeline/timeline_quick_settings.vue

@@ -4,10 +4,8 @@
     class="TimelineQuickSettings"
     :bound-to="{ x: 'container' }"
   >
-    <div
+    <template v-slot:content>
-      slot="content"
+      <div class="dropdown-menu">
-      class="dropdown-menu"
-    >
         <div v-if="loggedIn">
           <button
             class="button-default dropdown-item"
@@ -72,9 +70,12 @@
           <FAIcon icon="wrench" />{{ $t('settings.more_settings') }}
         </button>
       </div>
-    <div slot="trigger">
+    </template>
+    <template v-slot:trigger>
+      <button class="button-unstyled">
         <FAIcon icon="filter" />
-    </div>
+      </button>
+    </template>
   </Popover>
 </template>
 

src/components/timeline_menu/timeline_menu.vue

@@ -9,16 +9,13 @@
     @show="openMenu"
     @close="() => isOpen = false"
   >
-    <div
+    <template v-slot:content>
-      slot="content"
+      <div class="timeline-menu-popover popover-default">
-      class="timeline-menu-popover panel panel-default"
-    >
         <TimelineMenuContent />
       </div>
-    <div
+    </template>
-      slot="trigger"
+    <template v-slot:trigger>
-      class="title timeline-menu-title"
+      <button class="button-unstyled title timeline-menu-title">
-    >
         <span class="timeline-title">{{ timelineName() }}</span>
         <span>
           <FAIcon
@@ -30,7 +27,8 @@
           class="click-blocker"
           @click="blockOpen"
         />
-    </div>
+      </button>
+    </template>
   </Popover>
 </template>
 

src/components/user_card/user_card.vue

@@ -53,17 +53,17 @@
               >
                 {{ user.name }}
               </div>
-              <a
+              <button
                 v-if="isOtherUser && !user.is_local"
                 :href="user.statusnet_profile_url"
                 target="_blank"
-                class="external-link-button"
+                class="button-unstyled external-link-button"
               >
                 <FAIcon
                   class="icon"
                   icon="external-link-alt"
                 />
-              </a>
+              </button>
               <AccountActions
                 v-if="isOtherUser && loggedIn"
                 :user="user"

src/components/user_list_popover/user_list_popover.vue

@@ -4,14 +4,12 @@
     placement="top"
     :offset="{ y: 5 }"
   >
-    <template slot="trigger">
+    <template v-slot:trigger>
       <slot />
     </template>
-    <div
+    <template v-slot:content>
-      slot="content"
+      <div class="user-list-popover">
-      class="user-list-popover"
+        <template v-if="users.length">
-    >
-      <div v-if="users.length">
           <div
             v-for="(user) in usersCapped"
             :key="user.id"
@@ -29,15 +27,16 @@
               <span class="user-list-screen-name">{{ user.screen_name_ui }}</span>
             </div>
           </div>
-      </div>
+        </template>
-      <div v-else>
+        <template v-else>
           <FAIcon
             icon="circle-notch"
             spin
             size="3x"
           />
+        </template>
       </div>
-    </div>
+    </template>
   </Popover>
 </template>
 

src/components/user_profile/user_profile.vue

@@ -60,10 +60,7 @@
           :disabled="!user.friends_count"
         >
           <FriendList :user-id="userId">
-            <template
+            <template v-slot:item="{item}">
-              slot="item"
-              slot-scope="{item}"
-            >
               <FollowCard :user="item" />
             </template>
           </FriendList>
@@ -75,10 +72,7 @@
           :disabled="!user.followers_count"
         >
           <FollowerList :user-id="userId">
-            <template
+            <template v-slot:item="{item}">
-              slot="item"
-              slot-scope="{item}"
-            >
               <FollowCard
                 :user="item"
                 :no-follows-you="isUs"

src/components/user_reporting_modal/user_reporting_modal.vue

@@ -45,10 +45,7 @@
         </div>
         <div class="user-reporting-panel-right">
           <List :items="statuses">
-            <template
+            <template v-slot:item="{item}">
-              slot="item"
-              slot-scope="{item}"
-            >
               <div class="status-fadein user-reporting-panel-sitem">
                 <Status
                   :in-conversation="false"