replace $ by jQuery

This commit is contained in:
Simon Vieille 2020-09-03 09:49:30 +02:00
parent 3da1830f58
commit a7bcc7da0f
Signed by: deblan
GPG key ID: 03383D15A1D31745
2 changed files with 19 additions and 19 deletions

View file

@ -1,5 +1,5 @@
var pageLoader = $('<div id="side-menu-loader">') var pageLoader = jQuery('<div id="side-menu-loader">')
var pageLoaderBar = $('<div id="side-menu-loader-bar">') var pageLoaderBar = jQuery('<div id="side-menu-loader-bar">')
body.append(pageLoader) body.append(pageLoader)
pageLoader.append(pageLoaderBar) pageLoader.append(pageLoaderBar)

View file

@ -2,16 +2,16 @@ var menuCache = null
var updateTopMenu = function() { var updateTopMenu = function() {
var breakpointMobileWidth = 1024 var breakpointMobileWidth = 1024
var menu = $('#appmenu') var menu = jQuery('#appmenu')
var apps = menu.find('li') var apps = menu.find('li')
var minAppsDesktop = 8 var minAppsDesktop = 8
var usePercentualAppMenuLimit = 0.8 var usePercentualAppMenuLimit = 0.8
var isMobile = $(window).width() < breakpointMobileWidth var isMobile = jQuery(window).width() < breakpointMobileWidth
var lastShownApp = null var lastShownApp = null
var appShown = [] var appShown = []
var moreApps = $('#more-apps') var moreApps = jQuery('#more-apps')
var navigation = $('#navigation') var navigation = jQuery('#navigation')
var navigationApps = $('#apps ul') var navigationApps = jQuery('#apps ul')
var appCount = null var appCount = null
var currentMenuCache = menu.html() + menu.next().html() var currentMenuCache = menu.html() + menu.next().html()
@ -40,17 +40,17 @@ var updateTopMenu = function() {
} }
}) })
var rightHeaderWidth = $('.header-right').outerWidth() var rightHeaderWidth = jQuery('.header-right').outerWidth()
var headerWidth = $('header').outerWidth() var headerWidth = jQuery('header').outerWidth()
var availableWidth = headerWidth - $('#nextcloud').outerWidth() var availableWidth = headerWidth - jQuery('#nextcloud').outerWidth()
- $('#header .side-menu-opener').outerWidth() - jQuery('#header .side-menu-opener').outerWidth()
- (rightHeaderWidth > 230 ? rightHeaderWidth : 230) - (rightHeaderWidth > 230 ? rightHeaderWidth : 230)
if (!isMobile) { if (!isMobile) {
availableWidth = availableWidth * usePercentualAppMenuLimit availableWidth = availableWidth * usePercentualAppMenuLimit
} }
appCount = Math.floor(availableWidth / $('#appmenu li').width()) appCount = Math.floor(availableWidth / jQuery('#appmenu li').width())
if (isMobile && appCount > minAppsDesktop) { if (isMobile && appCount > minAppsDesktop) {
appCount = minAppsDesktop appCount = minAppsDesktop
@ -75,27 +75,27 @@ var updateTopMenu = function() {
var notInHeader = 0 var notInHeader = 0
var name var name
$(appShown).each(function(i, app) { jQuery(appShown).each(function(i, app) {
app = $(app) app = jQuery(app)
name = app.data('id') name = app.data('id')
if (k < appCount && appCount > 0) { if (k < appCount && appCount > 0) {
app.removeClass('hidden') app.removeClass('hidden')
lastShownApp = app lastShownApp = app
$('#apps li[data-id=' + name + '].app-external-site').addClass('in-header') jQuery('#apps li[data-id=' + name + '].app-external-site').addClass('in-header')
} else { } else {
app.addClass('hidden') app.addClass('hidden')
notInHeader++ notInHeader++
$('#apps li[data-id=' + name + '].app-external-site').removeClass('in-header') jQuery('#apps li[data-id=' + name + '].app-external-site').removeClass('in-header')
if (appCount > 0 && app.children('a').hasClass('active')) { if (appCount > 0 && app.children('a').hasClass('active')) {
lastShownApp.addClass('hidden') lastShownApp.addClass('hidden')
app.removeClass('hidden') app.removeClass('hidden')
notInHeader++ notInHeader++
$('#apps li[data-id=' + name + '].app-external-site') jQuery('#apps li[data-id=' + name + '].app-external-site')
.removeClass('in-header') .removeClass('in-header')
.addClass('in-header') .addClass('in-header')
} }
@ -104,8 +104,8 @@ var updateTopMenu = function() {
k++ k++
}) })
$('#apps li.app-external-site').each(function(i, app) { jQuery('#apps li.app-external-site').each(function(i, app) {
app = $(app) app = jQuery(app)
var appId = app.attr('data-id') var appId = app.attr('data-id')
if (app.hasClass('in-header')) { if (app.hasClass('in-header')) {