Move the initCore function to the bundle

core/js/tests/specs/coreSpec.js

@@ -368,13 +368,11 @@ describe('Core base tests', function() {
 	describe('Session heartbeat', function() {
 		var clock,
 			oldConfig,
-			routeStub,
 			counter;
 
 		beforeEach(function() {
 			clock = sinon.useFakeTimers();
 			oldConfig = OC.config;
-			routeStub = sinon.stub(OC, 'generateUrl').returns('/csrftoken');
 			counter = 0;
 
 			fakeServer.autoRespond = true;
@@ -389,7 +387,6 @@ describe('Core base tests', function() {
 			clock.restore();
 			/* jshint camelcase: false */
 			OC.config = oldConfig;
-			routeStub.restore();
 			$(document).off('ajaxError');
 			$(document).off('ajaxComplete');
 		});
@@ -400,7 +397,6 @@ describe('Core base tests', function() {
 				session_lifetime: 300
 			};
 			window.initCore();
-			expect(routeStub.calledWith('/csrftoken')).toEqual(true);
 
 			expect(counter).toEqual(0);
 
@@ -427,7 +423,6 @@ describe('Core base tests', function() {
 				session_lifetime: 300
 			};
 			window.initCore();
-			expect(routeStub.notCalled).toEqual(true);
 
 			expect(counter).toEqual(0);
 

core/src/OC/appconfig.js

@@ -26,7 +26,7 @@ export const appConfig = window.oc_appconfig || {}
  * @namespace
  * @deprecated 16.0.0 Use OCP.AppConfig instead
  */
-const AppConfig = {
+export const AppConfig = {
 	/**
 	 * @deprecated Use OCP.AppConfig.getValue() instead
 	 */
@@ -69,5 +69,3 @@ const AppConfig = {
 	}
 
 };
-
-export default AppConfig;

core/src/components/ContactsMenu.js

@@ -0,0 +1,34 @@
+/*
+ * @copyright 2019 Christoph Wurst <[email protected]>
+ *
+ * @author 2019 Christoph Wurst <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * 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'
+
+import OC from '../OC'
+
+/**
+ * @todo move to contacts menu code https://github.com/orgs/nextcloud/projects/31#card-21213129
+ */
+export const setUp = () => {
+	new OC.ContactsMenu({
+		el: $('#contactsmenu .menu'),
+		trigger: $('#contactsmenu .menutoggle')
+	})
+}

core/src/components/MainMenu.js

@@ -0,0 +1,93 @@
+/*
+ * @copyright 2019 Christoph Wurst <[email protected]>
+ *
+ * @author 2019 Christoph Wurst <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * 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'
+
+import OC from '../OC'
+
+/**
+ * Set up the main menu toggle to react to media query changes.
+ * If the screen is small enough, the main menu becomes a toggle.
+ * If the screen is bigger, the main menu is not a toggle any more.
+ */
+export const setUp = () => {
+	// init the more-apps menu
+	OC.registerMenu($('#more-apps > a'), $('#navigation'))
+
+	// toggle the navigation
+	const $toggle = $('#header .header-appname-container')
+	const $navigation = $('#navigation')
+	const $appmenu = $('#appmenu')
+
+	// init the menu
+	OC.registerMenu($toggle, $navigation)
+	$toggle.data('oldhref', $toggle.attr('href'))
+	$toggle.attr('href', '#')
+	$navigation.hide()
+
+	// show loading feedback on more apps list
+	$navigation.delegate('a', 'click', event => {
+		let $app = $(event.target)
+		if (!$app.is('a')) {
+			$app = $app.closest('a')
+		}
+		if (event.which === 1 && !event.ctrlKey && !event.metaKey) {
+			$app.find('svg').remove()
+			$app.find('div').remove() // prevent odd double-clicks
+			// no need for theming, loader is already inverted on dark mode
+			// but we need it over the primary colour
+			$app.prepend($('<div/>').addClass('icon-loading-small'))
+		} else {
+			// Close navigation when opening app in
+			// a new tab
+			OC.hideMenus(() => false)
+		}
+	})
+
+	$navigation.delegate('a', 'mouseup', event => {
+		if (event.which === 2) {
+			// Close navigation when opening app in
+			// a new tab via middle click
+			OC.hideMenus(() => false)
+		}
+	})
+
+	// show loading feedback on visible apps list
+	$appmenu.delegate('li:not(#more-apps) > a', 'click', event => {
+		let $app = $(event.target)
+		if (!$app.is('a')) {
+			$app = $app.closest('a')
+		}
+		if (event.which === 1 && !event.ctrlKey && !event.metaKey && $app.parent('#more-apps').length === 0) {
+			$app.find('svg').remove()
+			$app.find('div').remove() // prevent odd double-clicks
+			$app.prepend($('<div/>').addClass(
+				OCA.Theming && OCA.Theming.inverted
+					? 'icon-loading-small'
+					: 'icon-loading-small-dark'
+			))
+		} else {
+			// Close navigation when opening app in
+			// a new tab
+			OC.hideMenus(() => false)
+		}
+	})
+}

core/src/components/UserMenu.js

@@ -0,0 +1,53 @@
+/*
+ * @copyright 2019 Christoph Wurst <[email protected]>
+ *
+ * @author 2019 Christoph Wurst <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * 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 OC from '../OC'
+
+import $ from 'jquery'
+
+export const setUp = () => {
+	const $menu = $('#header #settings')
+
+	// show loading feedback
+	$menu.delegate('a', 'click', event => {
+		let $page = $(event.target)
+		if (!$page.is('a')) {
+			$page = $page.closest('a')
+		}
+		if (event.which === 1 && !event.ctrlKey && !event.metaKey) {
+			$page.find('img').remove()
+			$page.find('div').remove() // prevent odd double-clicks
+			$page.prepend($('<div/>').addClass('icon-loading-small'))
+		} else {
+			// Close navigation when opening menu entry in
+			// a new tab
+			OC.hideMenus(() => false)
+		}
+	})
+
+	$menu.delegate('a', 'mouseup', event => {
+		if (event.which === 2) {
+			// Close navigation when opening app in
+			// a new tab via middle click
+			OC.hideMenus(() => false)
+		}
+	})
+}

core/src/globals.js

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import appswebroots from "./OC/appswebroots";
+import {initCore} from './init'
 
 const warnIfNotTesting = function() {
 	if (window.TESTING === undefined) {
@@ -115,6 +115,7 @@ window['md5'] = md5
 window['moment'] = moment
 
 window['OC'] = OC
+setDeprecatedProp('initCore', initCore, 'this is an internal function')
 setDeprecatedProp('oc_appswebroots', OC.appswebroots, 'use OC.appswebroots instead')
 setDeprecatedProp('oc_config', OC.config, 'use OC.config instead')
 setDeprecatedProp('oc_current_user', OC.getCurrentUser().uid, 'use OC.getCurrentUser().uid instead')