diff options
author | John Molakvoæ <skjnldsv@protonmail.com> | 2023-01-13 17:32:57 +0100 |
---|---|---|
committer | John Molakvoæ <skjnldsv@protonmail.com> | 2023-04-06 14:49:29 +0200 |
commit | 29a7f7f6efd2a9791fdcfb9f9f7e862bafd8da82 (patch) | |
tree | 720d2c59461777dd8a4a4d57d06738ce55066f22 /core/src | |
parent | 8eb95052945c478a71d910090c7b1105f9256a4e (diff) | |
download | nextcloud-server-29a7f7f6efd2a9791fdcfb9f9f7e862bafd8da82.tar.gz nextcloud-server-29a7f7f6efd2a9791fdcfb9f9f7e862bafd8da82.zip |
feat(files_trashbin): migrate to vue
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Diffstat (limited to 'core/src')
-rw-r--r-- | core/src/OC/apps.js | 135 | ||||
-rw-r--r-- | core/src/OC/index.js | 30 | ||||
-rw-r--r-- | core/src/OC/util-history.js | 2 | ||||
-rw-r--r-- | core/src/main.js | 2 |
4 files changed, 16 insertions, 153 deletions
diff --git a/core/src/OC/apps.js b/core/src/OC/apps.js deleted file mode 100644 index bbda177409e..00000000000 --- a/core/src/OC/apps.js +++ /dev/null @@ -1,135 +0,0 @@ -/** - * @copyright Bernhard Posselt 2014 - * - * @author Christoph Wurst <christoph@winzerhof-wurst.at> - * @author John Molakvoæ <skjnldsv@protonmail.com> - * - * @license AGPL-3.0-or-later - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -import $ from 'jquery' - -let dynamicSlideToggleEnabled = false - -const Apps = { - enableDynamicSlideToggle() { - dynamicSlideToggleEnabled = true - }, -} - -/** - * Shows the #app-sidebar and add .with-app-sidebar to subsequent siblings - * - * @param {object} [$el] sidebar element to show, defaults to $('#app-sidebar') - */ -Apps.showAppSidebar = function($el) { - const $appSidebar = $el || $('#app-sidebar') - $appSidebar.removeClass('disappear').show() - $('#app-content').trigger(new $.Event('appresized')) -} - -/** - * Shows the #app-sidebar and removes .with-app-sidebar from subsequent - * siblings - * - * @param {object} [$el] sidebar element to hide, defaults to $('#app-sidebar') - */ -Apps.hideAppSidebar = function($el) { - const $appSidebar = $el || $('#app-sidebar') - $appSidebar.hide().addClass('disappear') - $('#app-content').trigger(new $.Event('appresized')) -} - -/** - * Provides a way to slide down a target area through a button and slide it - * up if the user clicks somewhere else. Used for the news app settings and - * add new field. - * - * Usage: - * <button data-apps-slide-toggle=".slide-area">slide</button> - * <div class=".slide-area" class="hidden">I'm sliding up</div> - */ -export const registerAppsSlideToggle = () => { - let buttons = $('[data-apps-slide-toggle]') - - if (buttons.length === 0) { - $('#app-navigation').addClass('without-app-settings') - } - - $(document).click(function(event) { - - if (dynamicSlideToggleEnabled) { - buttons = $('[data-apps-slide-toggle]') - } - - buttons.each(function(index, button) { - - const areaSelector = $(button).data('apps-slide-toggle') - const area = $(areaSelector) - - /** - * - */ - function hideArea() { - area.slideUp(OC.menuSpeed * 4, function() { - area.trigger(new $.Event('hide')) - }) - area.removeClass('opened') - $(button).removeClass('opened') - } - - /** - * - */ - function showArea() { - area.slideDown(OC.menuSpeed * 4, function() { - area.trigger(new $.Event('show')) - }) - area.addClass('opened') - $(button).addClass('opened') - const input = $(areaSelector + ' [autofocus]') - if (input.length === 1) { - input.focus() - } - } - - // do nothing if the area is animated - if (!area.is(':animated')) { - - // button toggles the area - if ($(button).is($(event.target).closest('[data-apps-slide-toggle]'))) { - if (area.is(':visible')) { - hideArea() - } else { - showArea() - } - - // all other areas that have not been clicked but are open - // should be slid up - } else { - const closest = $(event.target).closest(areaSelector) - if (area.is(':visible') && closest[0] !== area[0]) { - hideArea() - } - } - } - }) - - }) -} - -export default Apps diff --git a/core/src/OC/index.js b/core/src/OC/index.js index cc70bb550a7..e8f4b199103 100644 --- a/core/src/OC/index.js +++ b/core/src/OC/index.js @@ -30,7 +30,6 @@ import { processAjaxError, registerXHRForErrorProcessing, } from './xhr-error.js' -import Apps from './apps.js' import { AppConfig, appConfig } from './appconfig.js' import { appSettings } from './appsettings.js' import appswebroots from './appswebroots.js' @@ -45,8 +44,8 @@ import { import { build as buildQueryString, parse as parseQueryString, -} from './query-string.js' -import Config from './config.js' +} from './query-string' +import Config from './config' import { coreApps, menuSpeed, @@ -58,30 +57,30 @@ import { PERMISSION_SHARE, PERMISSION_UPDATE, TAG_FAVORITE, -} from './constants.js' -import ContactsMenu from './contactsmenu.js' -import { currentUser, getCurrentUser } from './currentuser.js' -import Dialogs from './dialogs.js' -import EventSource from './eventsource.js' -import { get, set } from './get_set.js' -import { getCapabilities } from './capabilities.js' +} from './constants' +import ContactsMenu from './contactsmenu' +import { currentUser, getCurrentUser } from './currentuser' +import Dialogs from './dialogs' +import EventSource from './eventsource' +import { get, set } from './get_set' +import { getCapabilities } from './capabilities' import { getHost, getHostName, getPort, getProtocol, -} from './host.js' +} from './host' import { getToken as getRequestToken, -} from './requesttoken.js' +} from './requesttoken' import { hideMenus, registerMenu, showMenu, unregisterMenu, -} from './menu.js' -import { isUserAdmin } from './admin.js' -import L10N from './l10n.js' +} from './menu' +import { isUserAdmin } from './admin' +import L10N from './l10n' import { getCanonicalLocale, getLanguage, @@ -141,7 +140,6 @@ export default { addScript, addStyle, - Apps, AppConfig, appConfig, appSettings, diff --git a/core/src/OC/util-history.js b/core/src/OC/util-history.js index d18b8743936..e5f9ff9447b 100644 --- a/core/src/OC/util-history.js +++ b/core/src/OC/util-history.js @@ -165,6 +165,8 @@ export default { }, _onPopState(e) { + debugger + if (this._cancelPop) { this._cancelPop = false return diff --git a/core/src/main.js b/core/src/main.js index f76d4f0b8e1..11a7ece6114 100644 --- a/core/src/main.js +++ b/core/src/main.js @@ -35,11 +35,9 @@ import OC from './OC/index.js' import './globals.js' import './jquery/index.js' import { initCore } from './init.js' -import { registerAppsSlideToggle } from './OC/apps.js' window.addEventListener('DOMContentLoaded', function() { initCore() - registerAppsSlideToggle() // fallback to hashchange when no history support if (window.history.pushState) { |