From a7bcc7da0f4d3dc9cbc1d5f0596f276274e85424 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 3 Sep 2020 09:49:30 +0200 Subject: [PATCH] replace $ by jQuery --- templates/js/_loaderEnabled.js | 4 ++-- templates/js/_topMenuApps.js | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/templates/js/_loaderEnabled.js b/templates/js/_loaderEnabled.js index 6d1a4e8..b391e4b 100644 --- a/templates/js/_loaderEnabled.js +++ b/templates/js/_loaderEnabled.js @@ -1,5 +1,5 @@ -var pageLoader = $('
') -var pageLoaderBar = $('
') +var pageLoader = jQuery('
') +var pageLoaderBar = jQuery('
') body.append(pageLoader) pageLoader.append(pageLoaderBar) diff --git a/templates/js/_topMenuApps.js b/templates/js/_topMenuApps.js index efab920..2c46894 100644 --- a/templates/js/_topMenuApps.js +++ b/templates/js/_topMenuApps.js @@ -2,16 +2,16 @@ var menuCache = null var updateTopMenu = function() { var breakpointMobileWidth = 1024 - var menu = $('#appmenu') + var menu = jQuery('#appmenu') var apps = menu.find('li') var minAppsDesktop = 8 var usePercentualAppMenuLimit = 0.8 - var isMobile = $(window).width() < breakpointMobileWidth + var isMobile = jQuery(window).width() < breakpointMobileWidth var lastShownApp = null var appShown = [] - var moreApps = $('#more-apps') - var navigation = $('#navigation') - var navigationApps = $('#apps ul') + var moreApps = jQuery('#more-apps') + var navigation = jQuery('#navigation') + var navigationApps = jQuery('#apps ul') var appCount = null var currentMenuCache = menu.html() + menu.next().html() @@ -40,17 +40,17 @@ var updateTopMenu = function() { } }) - var rightHeaderWidth = $('.header-right').outerWidth() - var headerWidth = $('header').outerWidth() - var availableWidth = headerWidth - $('#nextcloud').outerWidth() - - $('#header .side-menu-opener').outerWidth() + var rightHeaderWidth = jQuery('.header-right').outerWidth() + var headerWidth = jQuery('header').outerWidth() + var availableWidth = headerWidth - jQuery('#nextcloud').outerWidth() + - jQuery('#header .side-menu-opener').outerWidth() - (rightHeaderWidth > 230 ? rightHeaderWidth : 230) if (!isMobile) { availableWidth = availableWidth * usePercentualAppMenuLimit } - appCount = Math.floor(availableWidth / $('#appmenu li').width()) + appCount = Math.floor(availableWidth / jQuery('#appmenu li').width()) if (isMobile && appCount > minAppsDesktop) { appCount = minAppsDesktop @@ -75,27 +75,27 @@ var updateTopMenu = function() { var notInHeader = 0 var name - $(appShown).each(function(i, app) { - app = $(app) + jQuery(appShown).each(function(i, app) { + app = jQuery(app) name = app.data('id') if (k < appCount && appCount > 0) { app.removeClass('hidden') 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 { app.addClass('hidden') 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')) { lastShownApp.addClass('hidden') app.removeClass('hidden') notInHeader++ - $('#apps li[data-id=' + name + '].app-external-site') + jQuery('#apps li[data-id=' + name + '].app-external-site') .removeClass('in-header') .addClass('in-header') } @@ -104,8 +104,8 @@ var updateTopMenu = function() { k++ }) - $('#apps li.app-external-site').each(function(i, app) { - app = $(app) + jQuery('#apps li.app-external-site').each(function(i, app) { + app = jQuery(app) var appId = app.attr('data-id') if (app.hasClass('in-header')) {