From f63ab77009d61857249bf087e284e493ae08a30f Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 12 Oct 2017 15:38:10 -0500 Subject: remove commits.js import form main.js (related to !14735) --- app/assets/javascripts/main.js | 1 - 1 file changed, 1 deletion(-) (limited to 'app/assets/javascripts/main.js') diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index dcc0fa63b63..23ecce78bb9 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -40,7 +40,6 @@ import './admin'; import './aside'; import loadAwardsHandler from './awards_handler'; import bp from './breakpoints'; -import './commits'; import './compare'; import './compare_autocomplete'; import './confirm_danger_modal'; -- cgit v1.2.1 From 9f51a70e176d881d93474201c1444a4be1f2e7e0 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 12 Oct 2017 15:47:15 -0500 Subject: convert Compare class into ES module import/export syntax --- app/assets/javascripts/main.js | 1 - 1 file changed, 1 deletion(-) (limited to 'app/assets/javascripts/main.js') diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 23ecce78bb9..ad86b6929d4 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -40,7 +40,6 @@ import './admin'; import './aside'; import loadAwardsHandler from './awards_handler'; import bp from './breakpoints'; -import './compare'; import './compare_autocomplete'; import './confirm_danger_modal'; import Flash, { removeFlashClickListener } from './flash'; -- cgit v1.2.1 From 8c64e8b4b6f34418bb3a41c1561bf1d73a8b19d8 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 12 Oct 2017 15:57:29 -0500 Subject: convert CompareAutocomplete from class definition into simple function call, remove global export --- app/assets/javascripts/main.js | 1 - 1 file changed, 1 deletion(-) (limited to 'app/assets/javascripts/main.js') diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index ad86b6929d4..93d85d6dc5c 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -40,7 +40,6 @@ import './admin'; import './aside'; import loadAwardsHandler from './awards_handler'; import bp from './breakpoints'; -import './compare_autocomplete'; import './confirm_danger_modal'; import Flash, { removeFlashClickListener } from './flash'; import './gl_dropdown'; -- cgit v1.2.1 From e0bbadc2d2c50fce75ef1166d0991a5d04ef5e0a Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Thu, 7 Dec 2017 12:30:53 +0000 Subject: use exported methods instead of gl.utils --- app/assets/javascripts/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/assets/javascripts/main.js') diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index dcc0fa63b63..c08d25144e4 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -29,7 +29,7 @@ import './commit/image_file'; // lib/utils import { handleLocationHash } from './lib/utils/common_utils'; import './lib/utils/datetime_utility'; -import './lib/utils/url_utility'; +import { getLocationHash, visitUrl } from './lib/utils/url_utility'; // behaviors import './behaviors/'; @@ -122,7 +122,7 @@ $(function () { // `hashchange` is not triggered when link target is already in window.location $body.on('click', 'a[href^="#"]', function() { var href = this.getAttribute('href'); - if (href.substr(1) === gl.utils.getLocationHash()) { + if (href.substr(1) === getLocationHash()) { setTimeout(handleLocationHash, 1); } }); @@ -294,7 +294,7 @@ $(function () { const action = `${this.action}${link.search === '' ? '?' : '&'}`; event.preventDefault(); - gl.utils.visitUrl(`${action}${$(this).serialize()}`); + visitUrl(`${action}${$(this).serialize()}`); }); const flashContainer = document.querySelector('.flash-container'); -- cgit v1.2.1