Merge remote-tracking branch 'origin/master' into oasis

# Conflicts:
#	public/chunks/admin-account.js
#	public/chunks/admin.js
#	public/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js
#	public/chunks/app-language.js
#	public/chunks/app-settings.js
#	public/chunks/app-setup.js
#	public/chunks/billings-detail.js
#	public/chunks/dashboard.js
#	public/chunks/database.js
#	public/chunks/environment-setup.js
#	public/chunks/files.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js
#	public/chunks/homepage.js
#	public/chunks/installation-disclaimer.js
#	public/chunks/invoices.js
#	public/chunks/page-edit.js
#	public/chunks/pages.js
#	public/chunks/plan-create.js
#	public/chunks/plan-settings.js
#	public/chunks/plan-subscribers.js
#	public/chunks/plan.js
#	public/chunks/plans.js
#	public/chunks/platform.js
#	public/chunks/profile.js
#	public/chunks/profile~chunks/settings-password.js
#	public/chunks/purchase-code.js
#	public/chunks/settings-create-payment-methods.js
#	public/chunks/settings-invoices.js
#	public/chunks/settings-payment-methods.js
#	public/chunks/settings-storage.js
#	public/chunks/settings-subscription.js
#	public/chunks/settings.js
#	public/chunks/shared-files.js
#	public/chunks/shared.js
#	public/chunks/shared/file-browser.js
#	public/chunks/stripe-credentials.js
#	public/chunks/subscription-plans.js
#	public/chunks/subscription-service.js
#	public/chunks/upgrade-billing.js
#	public/chunks/upgrade-plan.js
#	public/chunks/user-create.js
#	public/chunks/user-delete.js
#	public/chunks/user-detail.js
#	public/chunks/user-invoices.js
#	public/chunks/user-storage.js
#	public/chunks/user-subscription.js
#	public/chunks/user.js
#	public/chunks/users.js
#	public/js/main.js
#	public/mix-manifest.json
#	public/vendors~chunks/platform~chunks/shared.js

resources/js/helpers.js

@@ -7,6 +7,28 @@ import axios from 'axios'
 const Helpers = {
     install(Vue) {
 
+        Vue.prototype.$searchFiles = debounce(function (value) {
+
+            if (value !== '' && typeof value !== 'undefined') {
+
+                this.$store.dispatch('getSearchResult', value)
+
+            } else if (typeof value !== 'undefined') {
+
+                if (this.$store.getters.currentFolder) {
+
+                    // Get back after delete query to previously folder
+                    if (this.$isThisLocation('public')) {
+                        this.$store.dispatch('browseShared', [{folder: this.$store.getters.currentFolder, back: true, init: false}])
+                    } else {
+                        this.$store.dispatch('getFolder', [{folder: this.$store.getters.currentFolder, back: true, init: false}])
+                    }
+                }
+
+                this.$store.commit('CHANGE_SEARCHING_STATE', false)
+            }
+        }, 300)
+
         Vue.prototype.$updateText = debounce(function (route, name, value) {
 
             let enableEmptyInput = ['mimetypes_blacklist', 'google_analytics', 'upload_limit', 'description']
@@ -253,24 +275,6 @@ const Helpers = {
             })
         }
 
-        Vue.prototype.$isMinimalScale = function () {
-            let sizeType = store.getters.filesViewWidth
-
-            return sizeType === 'minimal-scale'
-        }
-
-        Vue.prototype.$isCompactScale = function () {
-            let sizeType = store.getters.filesViewWidth
-
-            return sizeType === 'compact-scale'
-        }
-
-        Vue.prototype.$isFullScale = function () {
-            let sizeType = store.getters.filesViewWidth
-
-            return sizeType === 'full-scale'
-        }
-
         Vue.prototype.$isSomethingWrong = function () {
             events.$emit('alert:open', {
                 title: i18n.t('popup_error.title'),
@@ -346,8 +350,7 @@ const Helpers = {
         // Detect windows
         Vue.prototype.$checkOS = function () {
             if (navigator.userAgent.indexOf('Windows') != -1) {
-                let body = document.body
-                body.classList.add('windows')
+                document.body.classList.add('windows')
             }
         }