Skip to content

Commit

Permalink
fix: restore AppsSlideToggle feature
Browse files Browse the repository at this point in the history
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
  • Loading branch information
skjnldsv committed Jun 25, 2023
1 parent e5245da commit adff75d
Show file tree
Hide file tree
Showing 9 changed files with 191 additions and 7 deletions.
135 changes: 135 additions & 0 deletions core/src/OC/apps.js
@@ -0,0 +1,135 @@
/**
* @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
3 changes: 2 additions & 1 deletion core/src/OC/index.js
Expand Up @@ -29,6 +29,7 @@ import {
processAjaxError,
registerXHRForErrorProcessing,
} from './xhr-error.js'
import Apps from './apps.js'
import { AppConfig, appConfig } from './appconfig.js'
import appswebroots from './appswebroots.js'
import Backbone from './backbone.js'
Expand Down Expand Up @@ -135,7 +136,7 @@ export default {
* @deprecated 17.0.0
*/
fileIsBlacklisted: file => !!(file.match(Config.blacklist_files_regex)),

Apps,
AppConfig,
appConfig,
appswebroots,
Expand Down
2 changes: 2 additions & 0 deletions core/src/main.js
Expand Up @@ -23,6 +23,7 @@
*
*/

import { registerAppsSlideToggle } from './OC/apps.js'
import $ from 'jquery'
import 'core-js/stable/index.js'
import 'regenerator-runtime/runtime.js'
Expand All @@ -38,6 +39,7 @@ import { initCore } from './init.js'

window.addEventListener('DOMContentLoaded', function() {
initCore()
registerAppsSlideToggle()

// fallback to hashchange when no history support
if (window.history.pushState) {
Expand Down
4 changes: 2 additions & 2 deletions dist/core-login.js

Large diffs are not rendered by default.

23 changes: 23 additions & 0 deletions dist/core-login.js.LICENSE.txt
Expand Up @@ -256,6 +256,29 @@
*
*/

/**
* @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/>.
*
*/

/**
* @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
*
Expand Down
2 changes: 1 addition & 1 deletion dist/core-login.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/core-main.js

Large diffs are not rendered by default.

23 changes: 23 additions & 0 deletions dist/core-main.js.LICENSE.txt
Expand Up @@ -583,6 +583,29 @@
*
*/

/**
* @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/>.
*
*/

/**
* @copyright Copyright (c) 2016 Christoph Wurst <christoph@winzerhof-wurst.at>
*
Expand Down
2 changes: 1 addition & 1 deletion dist/core-main.js.map

Large diffs are not rendered by default.

0 comments on commit adff75d

Please sign in to comment.